From a7ed44ccadfcf1bd54d0197fbc87b6c1b0bcef7b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 10 Feb 2018 10:28:30 +0100
Subject: [PATCH 0001/1085] lib: make use of visible variable in doRename

The `visible` variable was not hooked up previously. It is used to
determine whether the renamed option should be shown in the
documentation.
---
 lib/modules.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/modules.nix b/lib/modules.nix
index 654c4c588de..019f11d11bc 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -664,6 +664,7 @@ rec {
     in
       { config, options, ... }:
       { options = setAttrByPath from (mkOption {
+          inherit visible;
           description = "Alias of <option>${showOption to}</option>.";
           apply = x: use (toOf config);
         });
-- 
GitLab


From 421ac6983090d2f153e1e6e480f050cbbadbe15c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 17 Mar 2018 14:40:31 +0100
Subject: [PATCH 0002/1085] libcommuni: fix darwin build

/cc ZHF #36454
---
 pkgs/development/libraries/libcommuni/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index 6192266bd4a..0788236b601 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -19,12 +19,16 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   dontUseQmakeConfigure = true;
-  configureFlags = "-config release";
+  configureFlags = [ "-config" "release" ];
+
   preConfigure = ''
     sed -i -e 's|/bin/pwd|pwd|g' configure
   '';
 
-  doCheck = true;
+  # The tests fail on darwin because of install_name if they run
+  # before the frameworks are installed.
+  doInstallCheck = true;
+  installCheckTarget = "check";
 
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = "rm -rf lib";
-- 
GitLab


From 99d56c542e4914b3f6dd06deeb14e0495a2abd31 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 17 Mar 2018 14:46:02 +0100
Subject: [PATCH 0003/1085] communi: fix darwin build

/cc ZHF #36454
---
 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 25e5a61f272..917de745d27 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     "
   '';
 
-  postInstall = ''
+  postInstall = stdenv.lib.optionalString stdenv.isLinux ''
     substituteInPlace "$out/share/applications/communi.desktop" \
       --replace "/usr/bin" "$out/bin"
   '';
-- 
GitLab


From 517589f1ffdbc549a812afeee0163d8eb0f3fd0c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Mar 2018 12:06:42 +0800
Subject: [PATCH 0004/1085] sedutil: init at 1.15.1

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

diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/tools/security/sedutil/default.nix
new file mode 100644
index 00000000000..343992a6322
--- /dev/null
+++ b/pkgs/tools/security/sedutil/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "sedutil-${version}";
+  version = "1.15.1";
+
+  src = fetchFromGitHub {
+    owner  = "Drive-Trust-Alliance";
+    repo   = "sedutil";
+    rev    = version;
+    sha256 = "0zg5v27vbrzzl2vqzks91zj48z30qgcshkqkm1g8ycnhi145l0mf";
+  };
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "DTA sedutil Self encrypting drive software";
+    homepage    = https://www.drivetrust.com;
+    license     = licenses.gpl3;
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98001c416fa..bc37c357217 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -625,6 +625,8 @@ with pkgs;
 
   ecdsautils = callPackage ../tools/security/ecdsautils { };
 
+  sedutil = callPackage ../tools/security/sedutil { };
+
   elvish = callPackage ../shells/elvish { };
 
   encryptr = callPackage ../tools/security/encryptr {
-- 
GitLab


From c33d8f3d6dd4fbf5fc943187e75a3bad15e9e3e8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Mar 2018 12:12:56 +0800
Subject: [PATCH 0005/1085] nixos sedutil: module for setting up kernel
 parameters

---
 nixos/modules/module-list.nix      |  1 +
 nixos/modules/programs/sedutil.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 nixos/modules/programs/sedutil.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e7f28c670be..adaab86b3af 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -100,6 +100,7 @@
   ./programs/qt5ct.nix
   ./programs/rootston.nix
   ./programs/screen.nix
+  ./programs/sedutil.nix
   ./programs/slock.nix
   ./programs/shadow.nix
   ./programs/shell.nix
diff --git a/nixos/modules/programs/sedutil.nix b/nixos/modules/programs/sedutil.nix
new file mode 100644
index 00000000000..7efc80f4abb
--- /dev/null
+++ b/nixos/modules/programs/sedutil.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.sedutil;
+
+in {
+  options.programs.sedutil.enable = mkEnableOption "sedutil";
+
+  config = mkIf cfg.enable {
+    boot.kernelParams = [
+      "libata.allow_tpm=1"
+    ];
+
+    environment.systemPackages = with pkgs; [ sedutil ];
+  };
+}
-- 
GitLab


From 8a77a0ae0ef7a430ebc7165bdb42936ee8ea352f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 1 Apr 2018 20:32:33 +0000
Subject: [PATCH 0006/1085] go_1_{9,10}: disable TestWritevError test

---
 pkgs/development/compilers/go/1.10.nix | 2 ++
 pkgs/development/compilers/go/1.9.nix  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index 145f6a17978..d99d82277bc 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -77,6 +77,8 @@ stdenv.mkDerivation rec {
     sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
     # Remove cert tests that conflict with NixOS's cert resolution
     sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
+    # TestWritevError hangs sometimes
+    sed -i '/TestWritevError/areturn' src/net/writev_test.go
 
     sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
     sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index c866212170c..4db67c92738 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -77,6 +77,8 @@ stdenv.mkDerivation rec {
     sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
     # Remove cert tests that conflict with NixOS's cert resolution
     sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
+    # TestWritevError hangs sometimes
+    sed -i '/TestWritevError/areturn' src/net/writev_test.go
 
     sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
     sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
-- 
GitLab


From 9e11e4ba64a209f3bc5009444878a60bc6849762 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 1 Apr 2018 20:39:12 +0000
Subject: [PATCH 0007/1085] go_1_{9,10}: disable TestVariousDeadlines test

---
 pkgs/development/compilers/go/1.10.nix | 2 ++
 pkgs/development/compilers/go/1.9.nix  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index d99d82277bc..b0fdd0c88bf 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -79,6 +79,8 @@ stdenv.mkDerivation rec {
     sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
     # TestWritevError hangs sometimes
     sed -i '/TestWritevError/areturn' src/net/writev_test.go
+    # TestVariousDeadlines fails sometimes
+    sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go
 
     sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
     sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index 4db67c92738..1fa38b99747 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -79,6 +79,8 @@ stdenv.mkDerivation rec {
     sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
     # TestWritevError hangs sometimes
     sed -i '/TestWritevError/areturn' src/net/writev_test.go
+    # TestVariousDeadlines fails sometimes
+    sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go
 
     sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
     sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
-- 
GitLab


From add9f5cf4a7affb20de29cfc74d0c91621f35bd4 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Thu, 5 Apr 2018 23:16:49 +0200
Subject: [PATCH 0008/1085] gmrender-resurrect: init

---
 .../networking/gmrender-resurrect/default.nix | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/networking/gmrender-resurrect/default.nix

diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix
new file mode 100644
index 00000000000..6926f1522c7
--- /dev/null
+++ b/pkgs/tools/networking/gmrender-resurrect/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, makeWrapper
+, gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }:
+
+let version = "4f221e6b85abf85957b547436e982d7a501a1718"; in
+
+stdenv.mkDerivation {
+  name = "gmrender-resurrect-${version}";
+
+  src = fetchFromGitHub {
+    owner = "hzeller";
+    repo = "gmrender-resurrect";
+    rev = "${version}";
+    sha256 = "1dmdhyz27bh74qmvncfd3kw7zqwnd05bhxcfjjav98z5qrxdygj4";
+  };
+
+  preConfigurePhases = "autoconfPhase";
+
+  autoconfPhase = "./autogen.sh";
+
+  buildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav libupnp ];
+  nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
+
+  postInstall = ''
+    for prog in "$out/bin/"*; do
+        wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "${gst-plugins-base}/lib/gstreamer-1.0:${gst-plugins-good}/lib/gstreamer-1.0:${gst-plugins-bad}/lib/gstreamer-1.0:${gst-plugins-ugly}/lib/gstreamer-1.0:${gst-libav}/lib/gstreamer-1.0"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer";
+    homepage = https://github.com/hzeller/gmrender-resurrect;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.koral ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96d3ecee2c7..f18882203bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2513,6 +2513,10 @@ with pkgs;
 
   glxinfo = callPackage ../tools/graphics/glxinfo { };
 
+  gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect {
+    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;
+  };
+
   gmvault = callPackage ../tools/networking/gmvault { };
 
   gnash = callPackage ../misc/gnash { };
-- 
GitLab


From f3657a05d82082e4bf1610c69216f71bbe731253 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 8 Apr 2018 00:18:56 +0100
Subject: [PATCH 0009/1085] minidlna nixos module: add loglevel config

---
 .../modules/services/networking/minidlna.nix  | 43 +++++++++++++------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index 61d063dbfe0..6401631bf62 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -1,23 +1,16 @@
 # Module for MiniDLNA, a simple DLNA server.
-
 { config, lib, pkgs, ... }:
 
 with lib;
 
 let
-
   cfg = config.services.minidlna;
-
   port = 8200;
-
 in
 
 {
-
   ###### interface
-
   options = {
-
     services.minidlna.enable = mkOption {
       type = types.bool;
       default = false;
@@ -43,24 +36,48 @@ in
         '';
     };
 
+    services.minidlna.loglevel = mkOption {
+      type = types.str;
+      default = "warn";
+      example = "general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn";
+      description =
+        ''
+          Defines the type of messages that should be logged, and down to
+          which level of importance they should be considered.
+
+          The possible types are “artwork”, “database”, “general”, “http”,
+          “inotify”, “metadata”, “scanner”, “ssdp” and “tivo”.
+
+          The levels are “off”, “fatal”, “error”, “warn”, “info” and
+          “debug”, listed here in order of decreasing importance.  “off”
+          turns off logging messages entirely, “fatal” logs the most
+          critical messages only, and so on down to “debug” that logs every
+          single messages.
+
+          The types are comma-separated, followed by an equal sign (‘=’),
+          followed by a level that applies to the preceding types. This can
+          be repeated, separating each of these constructs with a comma.
+
+          Defaults to “general,artwork,database,inotify,scanner,metadata,
+          http,ssdp,tivo=warn” which logs every type of message at the
+          “warn” level.
+        '';
+    };
+
     services.minidlna.config = mkOption {
       type = types.lines;
       description = "The contents of MiniDLNA's configuration file.";
     };
-
   };
 
-
   ###### implementation
-
   config = mkIf cfg.enable {
-
     services.minidlna.config =
       ''
         port=${toString port}
         friendly_name=${config.networking.hostName} MiniDLNA
         db_dir=/var/cache/minidlna
-        log_level=warn
+        log_level=${cfg.loglevel}
         inotify=yes
         ${concatMapStrings (dir: ''
           media_dir=${dir}
@@ -98,7 +115,5 @@ in
               " -f ${pkgs.writeText "minidlna.conf" cfg.config}";
           };
       };
-
   };
-
 }
-- 
GitLab


From 759e66f63df4532e96ad1f0dd56b34364dd9da80 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Mon, 9 Apr 2018 11:39:30 -0700
Subject: [PATCH 0010/1085] btrbk: fix SSH filter script

---
 pkgs/tools/backup/btrbk/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index ace54318665..dd10eeb8e5a 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
-, asciidoc-full, makeWrapper }:
+, utillinux, asciidoc-full, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "btrbk-${version}";
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
       --replace "/bin/date" "${coreutils}/bin/date" \
       --replace "/bin/echo" "${coreutils}/bin/echo" \
       --replace '$btrbk' 'btrbk'
+
+    # Fix SSH filter script
+    sed -i '/^export PATH/d' ssh_filter_btrbk.sh
+    substituteInPlace ssh_filter_btrbk.sh --replace logger ${utillinux}/bin/logger
   '';
 
   preFixup = ''
-- 
GitLab


From d031891c6bf151ef31517c1bc633ff21ecee864a Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Mon, 9 Apr 2018 13:57:42 -0700
Subject: [PATCH 0011/1085] btrbk: clean up build inputs

---
 pkgs/tools/backup/btrbk/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix     | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index dd10eeb8e5a..958afa3f6a9 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
-, utillinux, asciidoc-full, makeWrapper }:
+, utillinux, asciidoc, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "btrbk-${version}";
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp";
   };
 
-  buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ];
+  nativeBuildInputs = [ asciidoc makeWrapper ];
+
+  buildInputs = with perlPackages; [ perl DateCalc ];
 
   preInstall = ''
     for f in $(find . -name Makefile); do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c493337c16..1ff50d20958 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -886,7 +886,9 @@ with pkgs;
 
   btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {};
 
-  btrbk = callPackage ../tools/backup/btrbk { };
+  btrbk = callPackage ../tools/backup/btrbk {
+    asciidoc = asciidoc-full;
+  };
 
   buildtorrent = callPackage ../tools/misc/buildtorrent { };
 
-- 
GitLab


From b81aa02800795724fe0a01e7544c49b04a40994a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 17 Apr 2018 12:40:05 +0300
Subject: [PATCH 0012/1085] firewall service: run stop commands in reload

Do cleanup of user-created additional rules.

Of course it'd be much better to just use iptables-{save,restore} for
declarative management, but as it's still not there...
---
 nixos/modules/services/networking/firewall.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 20c0b0acf16..c4bd0e7f9ee 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -242,6 +242,9 @@ let
 
     # Don't allow traffic to leak out until the script has completed
     ip46tables -A INPUT -j nixos-drop
+
+    ${cfg.extraStopCommands}
+
     if ${startScript}; then
       ip46tables -D INPUT -j nixos-drop 2>/dev/null || true
     else
-- 
GitLab


From 85854ab2435629c6cb127773f422e2309bf0eade Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 18 Apr 2018 08:21:43 +0200
Subject: [PATCH 0013/1085] vamp-sdk: 2.5 -> 2.7.1

---
 pkgs/development/libraries/audio/vamp/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix
index 8098ac9f3ef..f8b1006d2eb 100644
--- a/pkgs/development/libraries/audio/vamp/default.nix
+++ b/pkgs/development/libraries/audio/vamp/default.nix
@@ -1,16 +1,19 @@
 # set VAMP_PATH ?
 # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses)
 
-{ stdenv, fetchurl, pkgconfig, libsndfile }:
+{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }:
 
 rec {
 
   vampSDK = stdenv.mkDerivation {
-    name = "vamp-sdk-2.5";
+    name = "vamp-sdk-2.7.1";
+    # version = "2.7.1";
 
-    src = fetchurl {
-      url = http://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz;
-      sha256 = "178kfgq08cmgdzv7g8dwyjp4adwx8q04riimncq4nqkm8ng9ywbv";
+    src = fetchFromGitHub {
+      owner = "c4dm";
+      repo = "vamp-plugin-sdk";
+      rev = "vamp-plugin-sdk-v2.7.1";
+      sha256 = "1ifd6l6b89pg83ss4gld5i72fr0cczjnl2by44z5jnndsg3sklw4";
     };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From dc524390689f62aefcbaf961df9afd3331ca99f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 19 Apr 2018 23:28:46 -0700
Subject: [PATCH 0014/1085] rocksndiamonds: 4.0.1.4 -> 4.1.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/v9jwi4ziz6yaxhvlrfz6zlx07bdrmsmw-rocksndiamonds-4.1.0.0/bin/rocksndiamonds -h’ got 0 exit code
- ran ‘/nix/store/v9jwi4ziz6yaxhvlrfz6zlx07bdrmsmw-rocksndiamonds-4.1.0.0/bin/rocksndiamonds --help’ got 0 exit code
- found 4.1.0.0 with grep in /nix/store/v9jwi4ziz6yaxhvlrfz6zlx07bdrmsmw-rocksndiamonds-4.1.0.0
- directory tree listing: https://gist.github.com/9ff0ad9227dc9e0063f83d558a704fb7
---
 pkgs/games/rocksndiamonds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix
index b84e7dd3af6..09478001fb7 100644
--- a/pkgs/games/rocksndiamonds/default.nix
+++ b/pkgs/games/rocksndiamonds/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${project}-${version}";
   project = "rocksndiamonds";
-  version = "4.0.1.4";
+  version = "4.1.0.0";
 
   src = fetchurl {
     url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz";
-    sha256 = "0rvi4crfh4rfczpsflzcfj6nqrg49mhm163k6ms9gxz97xj2jp3g";
+    sha256 = "0bmszf2hqyh76p3lzmhljcjwlx7jzpirwx9zyzgfvwqcapf5i6af";
   };
 
   desktopItem = makeDesktopItem {
-- 
GitLab


From 6392fb3d6ca585c4b4da6a42a93466ca9d19c1e3 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaum.bouchard@gmail.com>
Date: Sun, 15 Apr 2018 10:49:10 +0200
Subject: [PATCH 0015/1085] pysensors: init at 2017-07-13

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

diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix
new file mode 100644
index 00000000000..c891140827e
--- /dev/null
+++ b/pkgs/development/python-modules/pysensors/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }:
+buildPythonPackage rec {
+  version = "2017-07-13";
+  pname = "pysensors";
+
+  # note that https://pypi.org/project/PySensors/ is a different project
+  src = fetchFromGitHub {
+    owner = "bastienleonard";
+    repo = "pysensors";
+    rev = "ef46fc8eb181ecb8ad09b3d80bc002d23d9e26b3";
+    sha256 = "1xvbxnkz55fk5fpr514263c7s7s9r8hgrw4ybfaj5a0mligmmrfm";
+  };
+
+  buildInputs = [ lm_sensors ];
+
+  # Tests are disable because they fail on `aarch64-linux`, probably
+  # due to sandboxing
+  doCheck = false;
+
+  checkPhase = ''
+    cd tests
+    ${python.interpreter} -m unittest discover
+  '';
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ guibou ];
+    description = "Easy hardware health monitoring in Python for Linux systems";
+    homepage = http://pysensors.readthedocs.org;
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e572eaefb2e..d6a8fb0ffaa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18271,6 +18271,8 @@ EOF
 
   pyspark = callPackage ../development/python-modules/pyspark { };
 
+  pysensors = callPackage ../development/python-modules/pysensors { };
+
   sseclient = callPackage ../development/python-modules/sseclient { };
 
   textacy = callPackage ../development/python-modules/textacy { };
-- 
GitLab


From 884e6a7b9fbea0e776e199ed4c11d36f2f3dedb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Mon, 23 Apr 2018 23:54:04 +0200
Subject: [PATCH 0016/1085] tbs: updated to kernel-4.14

* updated meta data
* fix concurrent names for fetchFromGitHub derivations
---
 pkgs/os-specific/linux/tbs/default.nix | 28 +++++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix
index e4b954d4dbf..db20a7ab821 100644
--- a/pkgs/os-specific/linux/tbs/default.nix
+++ b/pkgs/os-specific/linux/tbs/default.nix
@@ -1,19 +1,24 @@
-{ stdenv, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }:
+{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages, libelf }:
 let
-  media = fetchFromGitHub {
+
+  media = fetchFromGitHub rec {
+    name = repo;
     owner = "tbsdtv";
     repo = "linux_media";
-    rev = "14ebbec91f2cd0423aaf859fc6e6d5d986397cd4";
-    sha256 = "1cmqj3kby8sxfcpvslbxywr95529vjxzbn800fdp35lka1fv962h";
+    rev = "efe31531b77efd3a4c94516504a5823d31cdc776";
+    sha256 = "1533qi3sb91v00289hl5zaj4l35r2sf9fqc6z5ky1vbb7byxgnlr";
   };
-  build = fetchFromGitHub {
+
+  build = fetchFromGitHub rec {
+    name = repo;
     owner = "tbsdtv";
     repo = "media_build";
-    rev = "c340e29a4047e43f7ea7ebf19e1e28c1f2112d05";
-    sha256 = "0hfn1j9qk8lh30z3ywj22qky480nsf8z2iag2bqhrhy4375vjlbl";
+    rev = "a0d62eba4d429e0e9d2c2f910fb203e817cac84b";
+    sha256 = "1329s7w9xlqjqwkpaqsd6b5dmzhm97jw0c7c7zzmmbdkl289i4i4";
   };
+
 in stdenv.mkDerivation {
-  name = "tbs-2017-11-05-${kernel.version}";
+  name = "tbs-2018.04.18-${kernel.version}";
 
   srcs = [ media build ];
   sourceRoot = "${build.name}";
@@ -39,10 +44,13 @@ in stdenv.mkDerivation {
   installFlags = [ "DESTDIR=$(out)" ];
 
   hardeningDisable = [ "pic" "format" ];
-  nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ];
 
-  meta = with stdenv.lib; {
+  nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ]
+  ++ lib.optional (lib.versionAtLeast kernel.version "4.14") [ libelf ];
+
+  meta = with lib; {
     homepage = https://www.tbsdtv.com/;
+    description = "Linux driver for TBSDTV cards";
     license = licenses.gpl2;
     maintainers = with maintainers; [ ck3d ];
     priority = 20;
-- 
GitLab


From 0fad5f7a8445d2848878789f2d1b9b01fc13c18f Mon Sep 17 00:00:00 2001
From: Marcin Falkiewicz <avalatron@gmail.com>
Date: Mon, 23 Apr 2018 16:02:12 +0200
Subject: [PATCH 0017/1085] wine: add Vulkan support

---
 pkgs/misc/emulators/wine/base.nix    | 1 +
 pkgs/misc/emulators/wine/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix      | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index db58c398526..864b8fac96f 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   ++ lib.optional pulseaudioSupport      pkgs.libpulseaudio
   ++ lib.optional xineramaSupport        pkgs.xorg.libXinerama
   ++ lib.optional udevSupport            pkgs.udev
+  ++ lib.optional vulkanSupport          pkgs.vulkan-loader
   ++ lib.optionals gstreamerSupport      (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ])
   ++ lib.optionals gtkSupport    [ pkgs.gtk3 pkgs.glib ]
   ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 91fb0da82d8..ca67ca836ba 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -40,7 +40,9 @@
   pulseaudioSupport ? false,
   udevSupport ? false,
   xineramaSupport ? false,
-  xmlSupport ? false }:
+  xmlSupport ? false,
+  vulkanSupport ? false,
+}:
 
 let wine-build = build: release:
       lib.getAttr build (callPackage ./packages.nix {
@@ -51,7 +53,7 @@ let wine-build = build: release:
                   netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport
                   gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
                   pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
-                  openglSupport gstreamerSupport udevSupport;
+                  openglSupport gstreamerSupport udevSupport vulkanSupport;
         };
       });
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a088d6644b..46bdee7b7ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21074,6 +21074,7 @@ with pkgs;
       fontconfigSupport = true;
       alsaSupport = true;
       openglSupport = true;
+      vulkanSupport = stdenv.isLinux;
       tlsSupport = true;
       cupsSupport = true;
       dbusSupport = true;
-- 
GitLab


From 81c1b9c9fc55d86ee3a7178c30e9744a15bd6da5 Mon Sep 17 00:00:00 2001
From: Frank Doepper <woffs@woffs.de>
Date: Tue, 24 Apr 2018 21:05:03 +0200
Subject: [PATCH 0018/1085] googleearth: remove

it's broken, and even after adjusting the derivation to the currently
available downloads it does not run well for me and it is rather
annoying to adjust the derivation to the moving
google-earth-stable_current source download link
---
 .../applications/misc/googleearth/default.nix | 79 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 81 deletions(-)
 delete mode 100644 pkgs/applications/misc/googleearth/default.nix

diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
deleted file mode 100644
index f8ba66c4197..00000000000
--- a/pkgs/applications/misc/googleearth/default.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv
-, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4
-, zlib, fontconfig, dpkg }:
-
-let
-  arch =
-    if stdenv.system == "x86_64-linux" then "amd64"
-    else if stdenv.system == "i686-linux" then "i386"
-    else throw "Unsupported system ${stdenv.system}";
-  sha256 =
-    if arch == "amd64"
-    then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6"
-    else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2";
-  fullPath = stdenv.lib.makeLibraryPath [
-    glibc
-    glib
-    stdenv.cc.cc
-    libSM
-    libICE
-    libXi
-    libXv
-    libGLU_combined
-    libXrender
-    libXrandr
-    libXfixes
-    libXcursor
-    libXinerama
-    freetype
-    libXext
-    libX11
-    qt4
-    zlib
-    fontconfig
-  ];
-in
-stdenv.mkDerivation rec {
-  version = "7.1.4.1529";
-  name = "googleearth-${version}";
-
-  src = fetchurl {
-    url = "https://dl.google.com/earth/client/current/google-earth-stable_current_${arch}.deb";
-    inherit sha256;
-  };
-
-  phases = "unpackPhase installPhase";
-
-  buildInputs = [ dpkg ];
-
-  unpackPhase = ''
-    dpkg-deb -x ${src} ./
-  '';
-
-  installPhase =''
-    mkdir $out
-    mv usr/* $out/
-    rmdir usr
-    mv * $out/
-    rm $out/bin/google-earth $out/opt/google/earth/free/google-earth
-    ln -s $out/opt/google/earth/free/googleearth $out/bin/google-earth
-
-    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${fullPath}:\$ORIGIN" \
-      $out/opt/google/earth/free/googleearth-bin
-
-    for a in $out/opt/google/earth/free/*.so* ; do
-      patchelf --set-rpath "${fullPath}:\$ORIGIN" $a
-    done
-  '';
-
-  dontPatchELF = true;
-
-  meta = {
-    description = "A world sphere viewer";
-    homepage = http://earth.google.com;
-    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a4ebec0480..90df35e128a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16071,8 +16071,6 @@ with pkgs;
 
   google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; };
 
-  googleearth = callPackage_i686 ../applications/misc/googleearth { };
-
   google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player {
     inherit (gnome2) GConf;
   };
-- 
GitLab


From e199143f11db153c1b844320295f9a1e1be4ac83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Wed, 25 Apr 2018 00:37:25 +0200
Subject: [PATCH 0019/1085] matterbridge module: add configPath option as a
 workaround, waiting for nix encryption

---
 .../services/networking/matterbridge.nix      | 84 ++++++++++++-------
 1 file changed, 53 insertions(+), 31 deletions(-)

diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix
index 5526e2ba23a..e2f47840595 100644
--- a/nixos/modules/services/networking/matterbridge.nix
+++ b/nixos/modules/services/networking/matterbridge.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ options, config, pkgs, lib, ... }:
 
 with lib;
 
@@ -6,7 +6,11 @@ let
 
   cfg = config.services.matterbridge;
 
-  matterbridgeConfToml = pkgs.writeText "matterbridge.toml" (cfg.configFile);
+  matterbridgeConfToml =
+    if cfg.configPath == null then
+      pkgs.writeText "matterbridge.toml" (cfg.configFile)
+    else
+      cfg.configPath;
 
 in
 
@@ -15,17 +19,32 @@ in
     services.matterbridge = {
       enable = mkEnableOption "Matterbridge chat platform bridge";
 
+      configPath = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "/etc/nixos/matterbridge.toml";
+        description = ''
+          The path to the matterbridge configuration file.
+        '';
+      };
+
       configFile = mkOption {
         type = types.str;
         example = ''
-          #WARNING: as this file contains credentials, be sure to set correct file permissions          [irc]
+          # WARNING: as this file contains credentials, do not use this option!
+          # It is kept only for backwards compatibility, and would cause your
+          # credentials to be in the nix-store, thus with the world-readable
+          # permission bits.
+          # Use services.matterbridge.configPath instead.
+
+          [irc]
               [irc.freenode]
               Server="irc.freenode.net:6667"
               Nick="matterbot"
 
           [mattermost]
               [mattermost.work]
-               #do not prefix it wit http:// or https://
+               # Do not prefix it with http:// or https://
                Server="yourmattermostserver.domain"
                Team="yourteam"
                Login="yourlogin"
@@ -44,6 +63,10 @@ in
               channel="off-topic"
         '';
         description = ''
+          WARNING: THIS IS INSECURE, as your password will end up in
+          <filename>/nix/store</filename>, thus publicly readable. Use
+          <literal>services.matterbridge.configPath</literal> instead.
+
           The matterbridge configuration file in the TOML file format.
         '';
       };
@@ -65,32 +88,31 @@ in
     };
   };
 
-  config = mkMerge [
-    (mkIf cfg.enable {
-
-      users.extraUsers = mkIf (cfg.user == "matterbridge") [
-        { name = "matterbridge";
-          group = "matterbridge";
-        } ];
-
-      users.extraGroups = mkIf (cfg.group == "matterbridge") [
-        { name = "matterbridge";
-        } ];
-
-      systemd.services.matterbridge = {
-        description = "Matterbridge chat platform bridge";
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" ];
-
-        serviceConfig = {
-          User = cfg.user;
-          Group = cfg.group;
-          ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}";
-          Restart = "always";
-          RestartSec = "10";
-        };
+  config = mkIf cfg.enable {
+    warnings = optional options.services.matterbridge.configFile.isDefined
+      "The option services.matterbridge.configFile is insecure and should be replaced with services.matterbridge.configPath";
+
+    users.extraUsers = optional (cfg.user == "matterbridge")
+      { name = "matterbridge";
+        group = "matterbridge";
+      };
+
+    users.extraGroups = optional (cfg.group == "matterbridge")
+      { name = "matterbridge";
       };
-    })
-  ];
-}
 
+    systemd.services.matterbridge = {
+      description = "Matterbridge chat platform bridge";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}";
+        Restart = "always";
+        RestartSec = "10";
+      };
+    };
+  };
+}
-- 
GitLab


From 184cb1e8c6ac5b226d29f14c5452e9dbafc2792f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Apr 2018 10:01:40 -0700
Subject: [PATCH 0020/1085] soapysdr+plugins: init at 0.6.1

---
 .../applications/misc/soapyairspy/default.nix | 30 +++++++++++
 .../misc/soapybladerf/default.nix             | 31 ++++++++++++
 .../applications/misc/soapyhackrf/default.nix | 30 +++++++++++
 .../applications/misc/soapyremote/default.nix | 28 +++++++++++
 pkgs/applications/misc/soapysdr/default.nix   | 50 +++++++++++++++++++
 pkgs/applications/misc/soapyuhd/default.nix   | 34 +++++++++++++
 pkgs/top-level/all-packages.nix               | 23 +++++++++
 7 files changed, 226 insertions(+)
 create mode 100644 pkgs/applications/misc/soapyairspy/default.nix
 create mode 100644 pkgs/applications/misc/soapybladerf/default.nix
 create mode 100644 pkgs/applications/misc/soapyhackrf/default.nix
 create mode 100644 pkgs/applications/misc/soapyremote/default.nix
 create mode 100644 pkgs/applications/misc/soapysdr/default.nix
 create mode 100644 pkgs/applications/misc/soapyuhd/default.nix

diff --git a/pkgs/applications/misc/soapyairspy/default.nix b/pkgs/applications/misc/soapyairspy/default.nix
new file mode 100644
index 00000000000..af72c784135
--- /dev/null
+++ b/pkgs/applications/misc/soapyairspy/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake
+, airspy, soapysdr
+} :
+
+let
+  version = "0.1.1";
+
+in stdenv.mkDerivation {
+  name = "soapyairspy-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapyAirspy";
+    rev = "soapy-airspy-${version}";
+    sha256 = "072vc9619s9f22k7639krr1p2418cmhgm44yhzy7x9dzapc43wvk";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ airspy soapysdr ];
+
+  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapyAirspy;
+    description = "SoapySDR plugin for Airspy devices";
+    license = licenses.mit;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/soapybladerf/default.nix b/pkgs/applications/misc/soapybladerf/default.nix
new file mode 100644
index 00000000000..4e1adc32946
--- /dev/null
+++ b/pkgs/applications/misc/soapybladerf/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, libbladeRF, soapysdr
+} :
+
+let
+  version = "0.3.5";
+
+in stdenv.mkDerivation {
+  name = "soapybladerf-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapyBladeRF";
+    rev = "soapy-bladerf-${version}";
+    sha256 = "1n7vy6y8k1smq3l729npxbhxbnrc79gz06dxkibsihz4k8sddkrg";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ libbladeRF soapysdr ];
+
+  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
+
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapyBladeRF;
+    description = "SoapySDR plugin for BladeRF devices";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/soapyhackrf/default.nix b/pkgs/applications/misc/soapyhackrf/default.nix
new file mode 100644
index 00000000000..f5543af9c60
--- /dev/null
+++ b/pkgs/applications/misc/soapyhackrf/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, hackrf, soapysdr
+} :
+
+let
+  version = "0.3.2";
+
+in stdenv.mkDerivation {
+  name = "soapyhackrf-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapyHackRF";
+    rev = "soapy-hackrf-${version}";
+    sha256 = "1sgx2nk8yrzfwisjfs9mw0xwc47bckzi17p42s2pbv7zcxzpb66p";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ hackrf soapysdr ];
+
+  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapyHackRF;
+    description = "SoapySDR plugin for HackRF devices";
+    license = licenses.mit;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/soapyremote/default.nix b/pkgs/applications/misc/soapyremote/default.nix
new file mode 100644
index 00000000000..d10b09f99a8
--- /dev/null
+++ b/pkgs/applications/misc/soapyremote/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake, soapysdr }:
+
+let
+  version = "0.4.3";
+
+in stdenv.mkDerivation {
+  name = "soapyremote-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapyRemote";
+    rev = "d07f43863b1ef79252f8029cfb5947220f21311d";
+    sha256 = "0i101dfqq0aawybv0qyjgsnhk39dc4q6z6ys2gsvwjhpf3d48aw0";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ soapysdr ];
+
+  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapyRemote;
+    description = "SoapySDR plugin for remote access to SDRs";
+    license = licenses.boost;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix
new file mode 100644
index 00000000000..6230f2f6f6a
--- /dev/null
+++ b/pkgs/applications/misc/soapysdr/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, lib, lndir, makeWrapper
+, fetchFromGitHub, cmake
+, libusb, pkgconfig
+, python, swig2, numpy, ncurses
+, extraPackages ? []
+} :
+
+let
+  version = "0.6.1";
+
+in stdenv.mkDerivation {
+  name = "soapysdr-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapySDR";
+    rev = "soapy-sdr-${version}";
+    sha256 = "1azbb2j6dv0b2dd5ks6yqd31j17sdhi9p82czwc8zy2isymax0l9";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ libusb ncurses numpy swig2 python ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DUSE_PYTHON_CONFIG=ON"
+  ];
+
+  postFixup = lib.optionalString (lib.length extraPackages != 0) ''
+    # Join all plugins via symlinking
+    for i in ${toString extraPackages}; do
+      ${lndir}/bin/lndir -silent $i $out
+    done
+
+    # Needed for at least the remote plugin server
+    for file in out/bin/*; do
+        ${makeWrapper}/bin/wrapProgram "$file" \
+            --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages}
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapySDR;
+    description = "Vendor and platform neutral SDR support library";
+    license = licenses.boost;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/applications/misc/soapyuhd/default.nix b/pkgs/applications/misc/soapyuhd/default.nix
new file mode 100644
index 00000000000..4f2a79c97fe
--- /dev/null
+++ b/pkgs/applications/misc/soapyuhd/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, uhd, boost, soapysdr
+} :
+
+let
+  version = "0.3.4";
+
+in stdenv.mkDerivation {
+  name = "soapyuhd-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapyUHD";
+    rev = "soapy-uhd-${version}";
+    sha256 = "1da7cjcvfdqhgznm7x14s1h7lwz5lan1b48akw445ah1vxwvh4hl";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ uhd boost soapysdr ];
+
+  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
+
+  postPatch = ''
+    sed -i "s:DESTINATION .*uhd/modules:DESTINATION $out/lib/uhd/modules:" CMakeLists.txt
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapyAirspy;
+    description = "SoapySDR plugin for UHD devices";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5e8b16e017..b9399883823 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11464,6 +11464,29 @@ with pkgs;
 
   snappy = callPackage ../development/libraries/snappy { };
 
+  soapyairspy = callPackage ../applications/misc/soapyairspy { };
+
+  soapybladerf = callPackage ../applications/misc/soapybladerf { };
+
+  soapyhackrf = callPackage ../applications/misc/soapyhackrf { };
+
+  soapysdr = callPackage ../applications/misc/soapysdr { inherit (python3Packages) python numpy; };
+
+  soapyremote = callPackage ../applications/misc/soapyremote { };
+
+  soapysdr-with-plugins = callPackage ../applications/misc/soapysdr {
+    inherit (python3Packages) python numpy;
+    extraPackages = [
+      soapyairspy
+      soapybladerf
+      soapyhackrf
+      soapyremote
+      soapyuhd
+    ];
+  };
+
+  soapyuhd = callPackage ../applications/misc/soapyuhd { };
+
   socket_wrapper = callPackage ../development/libraries/socket_wrapper { };
 
   sofia_sip = callPackage ../development/libraries/sofia-sip { };
-- 
GitLab


From e0d33717282a3fba85840c01ae8ac485832fed93 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Apr 2018 11:54:41 -0700
Subject: [PATCH 0021/1085] limesuite: init at 18.04.1

---
 pkgs/applications/misc/limesuite/default.nix | 55 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  3 ++
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/applications/misc/limesuite/default.nix

diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix
new file mode 100644
index 00000000000..e166c7a6b51
--- /dev/null
+++ b/pkgs/applications/misc/limesuite/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchFromGitHub, cmake
+, sqlite, wxGTK30, libusb1, soapysdr
+, mesa_glu, libX11, gnuplot, fltk
+} :
+
+let
+  version = "18.04.1";
+
+in stdenv.mkDerivation {
+  name = "limesuite-${version}";
+
+  src = fetchFromGitHub {
+    owner = "myriadrf";
+    repo = "LimeSuite";
+    rev = "v${version}";
+    sha256 = "1aaqnwif1j045hvj011k5dyqxgxx72h33r4al74h5f8al81zvzj9";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    libusb1
+    sqlite
+    wxGTK30
+    fltk
+    gnuplot
+    libusb1
+    soapysdr
+    mesa_glu
+    libX11
+  ];
+
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
+
+  postInstall = ''
+    mkdir -p $out/lib/udev/rules.d
+    cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d
+
+    mkdir -p $out/share/limesuite
+    cp bin/Release/lms7suite_mcu/* $out/share/limesuite
+
+    cp bin/dualRXTX $out/bin
+    cp bin/basicRX $out/bin
+    cp bin/singleRX $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Driver and GUI for LMS7002M-based SDR platforms";
+    homepage = https://github.com/myriadrf/LimeSuite;
+    license = licenses.apache2;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9399883823..1b6135c4dbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3513,6 +3513,8 @@ with pkgs;
 
   libwebsockets = callPackage ../development/libraries/libwebsockets { };
 
+  limesuite = callPackage ../applications/misc/limesuite { };
+
   limesurvey = callPackage ../servers/limesurvey { };
 
   linuxquota = callPackage ../tools/misc/linuxquota { };
@@ -11477,6 +11479,7 @@ with pkgs;
   soapysdr-with-plugins = callPackage ../applications/misc/soapysdr {
     inherit (python3Packages) python numpy;
     extraPackages = [
+      limesuite
       soapyairspy
       soapybladerf
       soapyhackrf
-- 
GitLab


From 7ba275410139c664354557f152ff8739631f498e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Apr 2018 11:58:50 -0700
Subject: [PATCH 0022/1085] welle-io: add soapysdr support

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

diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix
index d705de1a8cd..b3a9a3f3b86 100644
--- a/pkgs/applications/misc/welle-io/default.nix
+++ b/pkgs/applications/misc/welle-io/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig
 , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2
-, faad2, rtl-sdr, libusb, fftwSinglePrec }:
+, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }:
 let
 
   version = "1.0-rc2";
@@ -28,10 +28,11 @@ in stdenv.mkDerivation {
     qtquickcontrols
     qtquickcontrols2
     rtl-sdr
+    soapysdr-with-plugins
   ];
 
   cmakeFlags = [
-    "-DRTLSDR=true"
+    "-DRTLSDR=true" "-DSOAPYSDR=true"
   ];
 
   enableParallelBuilding = true;
-- 
GitLab


From 683b91ea1083b39958939f487f31e4aaabfa4996 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Apr 2018 12:59:23 -0700
Subject: [PATCH 0023/1085] limesuite: fix license

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

diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix
index e166c7a6b51..fb1ef8fb669 100644
--- a/pkgs/applications/misc/limesuite/default.nix
+++ b/pkgs/applications/misc/limesuite/default.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Driver and GUI for LMS7002M-based SDR platforms";
     homepage = https://github.com/myriadrf/LimeSuite;
-    license = licenses.apache2;
+    license = licenses.asl20;
     maintainers = with maintainers; [ markuskowa ];
     platforms = platforms.linux;
   };
-- 
GitLab


From 42297b0e1ce0198fa87b3b1d31c2057707ad4611 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Apr 2018 14:44:03 -0700
Subject: [PATCH 0024/1085] limesuite: removed unnecessary cmakeFlag

---
 pkgs/applications/misc/limesuite/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix
index fb1ef8fb669..4599fab0c6d 100644
--- a/pkgs/applications/misc/limesuite/default.nix
+++ b/pkgs/applications/misc/limesuite/default.nix
@@ -30,8 +30,6 @@ in stdenv.mkDerivation {
     libX11
   ];
 
-  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
-
   postInstall = ''
     mkdir -p $out/lib/udev/rules.d
     cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d
-- 
GitLab


From 4de774a63bef6d97246641212d8c38cc34ff6665 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 26 Apr 2018 06:09:05 +0200
Subject: [PATCH 0025/1085] nixos/dhparams: Add a VM test

We're going to make changes to the dhparams module so we really want to
make sure we don't break it, so having a NixOS VM test is to make sure
we don't blow things up and can iterate on it.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Ekleog
---
 nixos/release.nix        |   1 +
 nixos/tests/dhparams.nix | 105 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 nixos/tests/dhparams.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 2f779280e6b..9d8a62f9995 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -269,6 +269,7 @@ in rec {
   tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
   tests.couchdb = callTest tests/couchdb.nix {};
   tests.deluge = callTest tests/deluge.nix {};
+  tests.dhparams = callTest tests/dhparams.nix {};
   tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {};
   tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {};
   tests.docker-tools-overlay = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools-overlay.nix {};
diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix
new file mode 100644
index 00000000000..36079b99097
--- /dev/null
+++ b/nixos/tests/dhparams.nix
@@ -0,0 +1,105 @@
+let
+  common = { pkgs, ... }: {
+    security.dhparams.enable = true;
+    environment.systemPackages = [ pkgs.openssl ];
+  };
+
+in import ./make-test.nix {
+  name = "dhparams";
+
+  nodes.generation1 = { pkgs, config, ... }: {
+    imports = [ common ];
+    security.dhparams.params.foo = 16;
+    security.dhparams.params.bar = 17;
+
+    systemd.services.foo = {
+      description = "Check systemd Ordering";
+      wantedBy = [ "multi-user.target" ];
+      unitConfig = {
+        # This is to make sure that the dhparams generation of foo occurs
+        # before this service so we need this service to start as early as
+        # possible to provoke a race condition.
+        DefaultDependencies = false;
+
+        # We check later whether the service has been started or not.
+        ConditionPathExists = "${config.security.dhparams.path}/foo.pem";
+      };
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
+      # The reason we only provide an ExecStop here is to ensure that we don't
+      # accidentally trigger an error because a file system is not yet ready
+      # during very early startup (we might not even have the Nix store
+      # available, for example if future changes in NixOS use systemd mount
+      # units to do early file system initialisation).
+      serviceConfig.ExecStop = "${pkgs.coreutils}/bin/true";
+    };
+  };
+
+  nodes.generation2 = {
+    imports = [ common ];
+    security.dhparams.params.foo = 18;
+  };
+
+  nodes.generation3 = common;
+
+  testScript = { nodes, ... }: let
+    getParamPath = gen: name: let
+      node = "generation${toString gen}";
+      inherit (nodes.${node}.config.security.dhparams) path;
+    in "${path}/${name}.pem";
+
+    assertParamBits = gen: name: bits: let
+      path = getParamPath gen name;
+    in ''
+      $machine->nest('check bit size of ${path}', sub {
+        my $out = $machine->succeed('openssl dhparam -in ${path} -text');
+        $out =~ /^\s*DH Parameters:\s+\((\d+)\s+bit\)\s*$/m;
+        die "bit size should be ${toString bits} but it is $1 instead."
+          if $1 != ${toString bits};
+      });
+    '';
+
+    switchToGeneration = gen: let
+      node = "generation${toString gen}";
+      inherit (nodes.${node}.config.system.build) toplevel;
+      switchCmd = "${toplevel}/bin/switch-to-configuration test";
+    in ''
+      $machine->nest('switch to generation ${toString gen}', sub {
+        $machine->succeed('${switchCmd}');
+        $main::machine = ''$${node};
+      });
+    '';
+
+  in ''
+    my $machine = $generation1;
+
+    $machine->waitForUnit('multi-user.target');
+
+    subtest "verify startup order", sub {
+      $machine->succeed('systemctl is-active foo.service');
+    };
+
+    subtest "check bit sizes of dhparam files", sub {
+      ${assertParamBits 1 "foo" 16}
+      ${assertParamBits 1 "bar" 17}
+    };
+
+    ${switchToGeneration 2}
+
+    subtest "check whether bit size has changed", sub {
+      ${assertParamBits 2 "foo" 18}
+    };
+
+    subtest "ensure that dhparams file for 'bar' was deleted", sub {
+      $machine->fail('test -e ${getParamPath 1 "bar"}');
+    };
+
+    ${switchToGeneration 3}
+
+    subtest "ensure that 'security.dhparams.path' has been deleted", sub {
+      $machine->fail(
+        'test -e ${nodes.generation3.config.security.dhparams.path}'
+      );
+    };
+  '';
+}
-- 
GitLab


From 761266bd18cf1117a11d2fd6168259f7fe867122 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 26 Apr 2018 06:19:48 +0200
Subject: [PATCH 0026/1085] nixos/dhparams: Turn params into a submodule

We're going to implement an option which allows us to turn off stateful
handling of Diffie-Hellman parameter files by putting them into the Nix
store.

However, modules now might need a way to reference these files, so we
add a now path option to every param specified, which carries a
read-only value of the path where to find the corresponding DH params
file.

I've also improved the description of security.dhparams.params a bit so
that it uses <warning/> and <note/>.

The NixOS VM test also reflects this change and checks whether the old
way to specify the bit size still works.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Ekleog
---
 nixos/modules/security/dhparams.nix | 64 +++++++++++++++++++++--------
 nixos/tests/dhparams.nix            | 16 +++++---
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index 55c75713101..7c9fe986e57 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -1,10 +1,38 @@
 { config, lib, pkgs, ... }:
 
 with lib;
+
 let
   cfg = config.security.dhparams;
-in
-{
+
+  paramsSubmodule = { name, config, ... }: {
+    options.bits = mkOption {
+      type = types.addCheck types.int (b: b >= 16) // {
+        name = "bits";
+        description = "integer of at least 16 bits";
+      };
+      default = 4096;
+      description = ''
+        The bit size for the prime that is used during a Diffie-Hellman
+        key exchange.
+      '';
+    };
+
+    options.path = mkOption {
+      type = types.path;
+      readOnly = true;
+      description = ''
+        The resulting path of the generated Diffie-Hellman parameters
+        file for other services to reference. This could be either a
+        store path or a file inside the directory specified by
+        <option>security.dhparams.path</option>.
+      '';
+    };
+
+    config.path = "${cfg.path}/${name}.pem";
+  };
+
+in {
   options = {
     security.dhparams = {
       params = mkOption {
@@ -14,21 +42,23 @@ in
 
             The value is the size (in bits) of the DH params to generate. The
             generated DH params path can be found in
-            <filename><replaceable>security.dhparams.path</replaceable>/<replaceable>name</replaceable>.pem</filename>.
+            <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>.
 
-            Note: The name of the DH params is taken as being the name of the
-            service it serves: the params will be generated before the said
-            service is started.
+            <note><para>The name of the DH params is taken as being the name of
+            the service it serves and the params will be generated before the
+            said service is started.</para></note>
 
-            Warning: If you are removing all dhparams from this list, you have
-            to leave security.dhparams.enable for at least one activation in
-            order to have them be cleaned up. This also means if you rollback to
-            a version without any dhparams the existing ones won't be cleaned
-            up.
+            <warning><para>If you are removing all dhparams from this list, you
+            have to leave <option>security.dhparams.enable</option> for at
+            least one activation in order to have them be cleaned up. This also
+            means if you rollback to a version without any dhparams the
+            existing ones won't be cleaned up.</para></warning>
           '';
-        type = with types; attrsOf int;
+        type = with types; let
+          coerce = bits: { inherit bits; };
+        in attrsOf (coercedTo types.int coerce (submodule paramsSubmodule));
         default = {};
-        example = { nginx = 3072; };
+        example = literalExample "{ nginx.bits = 3072; }";
       };
 
       path = mkOption {
@@ -71,10 +101,10 @@ in
               if [ ! -f "$file" ]; then
                 continue
               fi
-          '' + concatStrings (mapAttrsToList (name: value:
+          '' + concatStrings (mapAttrsToList (name: { bits, ... }:
           ''
               if [ "$file" == "${cfg.path}/${name}.pem" ] && \
-                  ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then
+                  ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then
                 continue
               fi
           ''
@@ -89,7 +119,7 @@ in
           '';
       };
     } //
-      mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" {
+      mapAttrs' (name: { bits, ... }: nameValuePair "dhparams-gen-${name}" {
         description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet";
         after = [ "dhparams-init.service" ];
         before = [ "${name}.service" ];
@@ -99,7 +129,7 @@ in
           ''
             mkdir -p ${cfg.path}
             if [ ! -f ${cfg.path}/${name}.pem ]; then
-              ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value}
+              ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString bits}
             fi
           '';
       }) cfg.params;
diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix
index 36079b99097..ead5f2efce7 100644
--- a/nixos/tests/dhparams.nix
+++ b/nixos/tests/dhparams.nix
@@ -9,8 +9,13 @@ in import ./make-test.nix {
 
   nodes.generation1 = { pkgs, config, ... }: {
     imports = [ common ];
-    security.dhparams.params.foo = 16;
-    security.dhparams.params.bar = 17;
+    security.dhparams.params = {
+      # Use low values here because we don't want the test to run for ages.
+      foo.bits = 16;
+      # Also use the old format to make sure the type is coerced in the right
+      # way.
+      bar = 17;
+    };
 
     systemd.services.foo = {
       description = "Check systemd Ordering";
@@ -22,7 +27,7 @@ in import ./make-test.nix {
         DefaultDependencies = false;
 
         # We check later whether the service has been started or not.
-        ConditionPathExists = "${config.security.dhparams.path}/foo.pem";
+        ConditionPathExists = config.security.dhparams.params.foo.path;
       };
       serviceConfig.Type = "oneshot";
       serviceConfig.RemainAfterExit = true;
@@ -37,7 +42,7 @@ in import ./make-test.nix {
 
   nodes.generation2 = {
     imports = [ common ];
-    security.dhparams.params.foo = 18;
+    security.dhparams.params.foo.bits = 18;
   };
 
   nodes.generation3 = common;
@@ -45,8 +50,7 @@ in import ./make-test.nix {
   testScript = { nodes, ... }: let
     getParamPath = gen: name: let
       node = "generation${toString gen}";
-      inherit (nodes.${node}.config.security.dhparams) path;
-    in "${path}/${name}.pem";
+    in nodes.${node}.config.security.dhparams.params.${name}.path;
 
     assertParamBits = gen: name: bits: let
       path = getParamPath gen name;
-- 
GitLab


From 3e11ff6e0d9fb21a962408407f24b465b30fe96f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 26 Apr 2018 06:38:02 +0200
Subject: [PATCH 0027/1085] nixos/dhparams: Introduce a 'stateful' option

This option allows us to turn off stateful generation of Diffie-Hellman
parameters, which in some way is still stateful as the generated DH
params file is non-deterministic.

However what we can avoid with this is to have an increased surface for
failures during system startup, because generation of the parameters is
done during build-time.

Another advantage of this is that we no longer need to take care of
cleaning up the files that are no longer used and in my humble opinion I
would have preferred that #11505 (which puts the dhparams in the Nix
store) would have been merged instead of #22634 (which we have now).

Luckily we can still change that and this change gives the user the
option to put the dhparams into the Nix store.

Beside of the more obvious advantages pointed out here, this also
effects test runtime if more services are starting to use this (for
example see #39507 and #39288), because generating DH params could take
a long time depending on the bit size which adds up to test runtime.

If we generate the DH params in a separate derivation, subsequent test
runs won't need to wait for DH params generation during bootup.

Of course, tests could still mock this by force-disabling the service
and adding a service or activation script that places pre-generated DH
params in /var/lib/dhparams but this would make tests less readable and
the workaround would have to be made for each test affected.

Note that the 'stateful' option is still true by default so that we are
backwards-compatible with existing systems.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Ekleog, @abbradar, @fpletz
---
 nixos/modules/security/dhparams.nix | 39 +++++++++++++++++++++++------
 nixos/tests/dhparams.nix            | 21 ++++++++++++++++
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index 7c9fe986e57..64b296eea5b 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -29,7 +29,11 @@ let
       '';
     };
 
-    config.path = "${cfg.path}/${name}.pem";
+    config.path = let
+      generated = pkgs.runCommand "dhparams-${name}.pem" {
+        nativeBuildInputs = [ pkgs.openssl ];
+      } "openssl dhparam -out \"$out\" ${toString config.bits}";
+    in if cfg.stateful then "${cfg.path}/${name}.pem" else generated;
   };
 
 in {
@@ -52,7 +56,9 @@ in {
             have to leave <option>security.dhparams.enable</option> for at
             least one activation in order to have them be cleaned up. This also
             means if you rollback to a version without any dhparams the
-            existing ones won't be cleaned up.</para></warning>
+            existing ones won't be cleaned up. Of course this only applies if
+            <option>security.dhparams.stateful</option> is
+            <literal>true</literal>.</para></warning>
           '';
         type = with types; let
           coerce = bits: { inherit bits; };
@@ -61,12 +67,29 @@ in {
         example = literalExample "{ nginx.bits = 3072; }";
       };
 
+      stateful = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether generation of Diffie-Hellman parameters should be stateful or
+          not. If this is enabled, PEM-encoded files for Diffie-Hellman
+          parameters are placed in the directory specified by
+          <option>security.dhparams.path</option>. Otherwise the files are
+          created within the Nix store.
+
+          <note><para>If this is <literal>false</literal> the resulting store
+          path will be non-deterministic and will be rebuilt every time the
+          <package>openssl</package> package changes.</para></note>
+        '';
+      };
+
       path = mkOption {
-        description =
-          ''
-            Path to the directory in which Diffie-Hellman parameters will be
-            stored.
-          '';
+        description = ''
+          Path to the directory in which Diffie-Hellman parameters will be
+          stored. This only is relevant if
+          <option>security.dhparams.stateful</option> is
+          <literal>true</literal>.
+        '';
         type = types.str;
         default = "/var/lib/dhparams";
       };
@@ -82,7 +105,7 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf (cfg.enable && cfg.stateful) {
     systemd.services = {
       dhparams-init = {
         description = "Cleanup old Diffie-Hellman parameters";
diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix
index ead5f2efce7..da75391e4ce 100644
--- a/nixos/tests/dhparams.nix
+++ b/nixos/tests/dhparams.nix
@@ -47,6 +47,13 @@ in import ./make-test.nix {
 
   nodes.generation3 = common;
 
+  nodes.generation4 = {
+    imports = [ common ];
+    security.dhparams.stateful = false;
+    security.dhparams.params.foo2.bits = 18;
+    security.dhparams.params.bar2.bits = 19;
+  };
+
   testScript = { nodes, ... }: let
     getParamPath = gen: name: let
       node = "generation${toString gen}";
@@ -105,5 +112,19 @@ in import ./make-test.nix {
         'test -e ${nodes.generation3.config.security.dhparams.path}'
       );
     };
+
+    ${switchToGeneration 4}
+
+    subtest "check bit sizes dhparam files", sub {
+      ${assertParamBits 4 "foo2" 18}
+      ${assertParamBits 4 "bar2" 19}
+    };
+
+    subtest "check whether dhparam files are in the Nix store", sub {
+      $machine->succeed(
+        'expr match ${getParamPath 4 "foo2"} ${builtins.storeDir}',
+        'expr match ${getParamPath 4 "bar2"} ${builtins.storeDir}',
+      );
+    };
   '';
 }
-- 
GitLab


From ce8777386786f5a38fb0bc8728515a66c82c3d04 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 26 Apr 2018 07:11:54 +0200
Subject: [PATCH 0028/1085] nixos/dhparams: Clean up module expression

First of all let's start with a clean up the multiline string
indentation for descriptions, because having two indentation levels
after description is a waste of screen estate.

A quick survey in the form of the following also reveals that the
majority of multiline strings in nixpkgs is starting the two beginning
quotes in the same line:

$ find -name '*.nix' -exec sed -n -e '/=$/ { n; /'\'\''/p }' {} + | wc -l
817
$ find -name '*.nix' -exec grep "= *'' *\$" {} + | wc -l
14818

The next point is to get the type, default and example attributes on top
of the description because that's the way it's rendered in the manual.

Most services have their enable option close to the beginning of the
file, so let's move it to the top.

Also, I found the script attribute for dhparams-init.service a bit hard
to read as it was using string concatenation to split a "for" loop.

Now for the more substantial clean ups rather than just code style:

  * Remove the "with lib;" at the beginning of the module, because it
    makes it easier to do a quick check with "nix-instantiate --parse".
  * Use ConditionPathExists instead of test -e for checking whether we
    need to generate the dhparams file. This avoids spawning a shell if
    the file exists already and it's probably more common that it will
    exist, except for the initial creation of course.
  * When cleaning up old dhparams file, use RemainAfterExit so that the
    unit won't be triggered again whenever we stop and start a service
    depending on it.
  * Capitalize systemd unit descriptions to be more in par with most
    other unit descriptions (also see 0c5e837b66f58265ce2b66a33d0f47a3).
  * Use "=" instead of "==" for conditionals using []. It's just a very
    small nitpick though and it will only fail for POSIX shells. Bash on
    the other side accepts it anyway.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Ekleog
---
 nixos/modules/security/dhparams.nix | 154 ++++++++++++++--------------
 1 file changed, 75 insertions(+), 79 deletions(-)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index 64b296eea5b..481d4c5db51 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -1,8 +1,7 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) mkOption types;
   cfg = config.security.dhparams;
 
   paramsSubmodule = { name, config, ... }: {
@@ -39,32 +38,39 @@ let
 in {
   options = {
     security.dhparams = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to generate new DH params and clean up old DH params.
+        '';
+      };
+
       params = mkOption {
-        description =
-          ''
-            Diffie-Hellman parameters to generate.
-
-            The value is the size (in bits) of the DH params to generate. The
-            generated DH params path can be found in
-            <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>.
-
-            <note><para>The name of the DH params is taken as being the name of
-            the service it serves and the params will be generated before the
-            said service is started.</para></note>
-
-            <warning><para>If you are removing all dhparams from this list, you
-            have to leave <option>security.dhparams.enable</option> for at
-            least one activation in order to have them be cleaned up. This also
-            means if you rollback to a version without any dhparams the
-            existing ones won't be cleaned up. Of course this only applies if
-            <option>security.dhparams.stateful</option> is
-            <literal>true</literal>.</para></warning>
-          '';
         type = with types; let
           coerce = bits: { inherit bits; };
-        in attrsOf (coercedTo types.int coerce (submodule paramsSubmodule));
+        in attrsOf (coercedTo int coerce (submodule paramsSubmodule));
         default = {};
-        example = literalExample "{ nginx.bits = 3072; }";
+        example = lib.literalExample "{ nginx.bits = 3072; }";
+        description = ''
+          Diffie-Hellman parameters to generate.
+
+          The value is the size (in bits) of the DH params to generate. The
+          generated DH params path can be found in
+          <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>.
+
+          <note><para>The name of the DH params is taken as being the name of
+          the service it serves and the params will be generated before the
+          said service is started.</para></note>
+
+          <warning><para>If you are removing all dhparams from this list, you
+          have to leave <option>security.dhparams.enable</option> for at
+          least one activation in order to have them be cleaned up. This also
+          means if you rollback to a version without any dhparams the
+          existing ones won't be cleaned up. Of course this only applies if
+          <option>security.dhparams.stateful</option> is
+          <literal>true</literal>.</para></warning>
+        '';
       };
 
       stateful = mkOption {
@@ -84,77 +90,67 @@ in {
       };
 
       path = mkOption {
+        type = types.str;
+        default = "/var/lib/dhparams";
         description = ''
           Path to the directory in which Diffie-Hellman parameters will be
           stored. This only is relevant if
           <option>security.dhparams.stateful</option> is
           <literal>true</literal>.
         '';
-        type = types.str;
-        default = "/var/lib/dhparams";
-      };
-
-      enable = mkOption {
-        description =
-          ''
-            Whether to generate new DH params and clean up old DH params.
-          '';
-        default = false;
-        type = types.bool;
       };
     };
   };
 
-  config = mkIf (cfg.enable && cfg.stateful) {
+  config = lib.mkIf (cfg.enable && cfg.stateful) {
     systemd.services = {
       dhparams-init = {
-        description = "Cleanup old Diffie-Hellman parameters";
-        wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set
+        description = "Clean Up Old Diffie-Hellman Parameters";
+
+        # Clean up even when no DH params is set
+        wantedBy = [ "multi-user.target" ];
+
+        serviceConfig.RemainAfterExit = true;
         serviceConfig.Type = "oneshot";
-        script =
-          # Create directory
-          ''
-            if [ ! -d ${cfg.path} ]; then
-              mkdir -p ${cfg.path}
-            fi
-          '' +
+
+        script = ''
+          if [ ! -d ${cfg.path} ]; then
+            mkdir -p ${cfg.path}
+          fi
+
           # Remove old dhparams
-          ''
-            for file in ${cfg.path}/*; do
-              if [ ! -f "$file" ]; then
-                continue
-              fi
-          '' + concatStrings (mapAttrsToList (name: { bits, ... }:
-          ''
-              if [ "$file" == "${cfg.path}/${name}.pem" ] && \
-                  ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then
+          for file in ${cfg.path}/*; do
+            if [ ! -f "$file" ]; then
+              continue
+            fi
+            ${lib.concatStrings (lib.mapAttrsToList (name: { bits, path, ... }: ''
+              if [ "$file" = ${lib.escapeShellArg path} ] && \
+                 ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text \
+                 | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then
                 continue
               fi
-          ''
-          ) cfg.params) +
-          ''
-              rm $file
-            done
-
-            # TODO: Ideally this would be removing the *former* cfg.path, though this
-            # does not seem really important as changes to it are quite unlikely
-            rmdir --ignore-fail-on-non-empty ${cfg.path}
-          '';
+            '') cfg.params)}
+            rm $file
+          done
+
+          # TODO: Ideally this would be removing the *former* cfg.path, though
+          # this does not seem really important as changes to it are quite
+          # unlikely
+          rmdir --ignore-fail-on-non-empty ${cfg.path}
+        '';
       };
-    } //
-      mapAttrs' (name: { bits, ... }: nameValuePair "dhparams-gen-${name}" {
-        description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet";
-        after = [ "dhparams-init.service" ];
-        before = [ "${name}.service" ];
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig.Type = "oneshot";
-        script =
-          ''
-            mkdir -p ${cfg.path}
-            if [ ! -f ${cfg.path}/${name}.pem ]; then
-              ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString bits}
-            fi
-          '';
-      }) cfg.params;
+    } // lib.mapAttrs' (name: { bits, path, ... }: lib.nameValuePair "dhparams-gen-${name}" {
+      description = "Generate Diffie-Hellman Parameters for ${name}";
+      after = [ "dhparams-init.service" ];
+      before = [ "${name}.service" ];
+      wantedBy = [ "multi-user.target" ];
+      unitConfig.ConditionPathExists = "!${path}";
+      serviceConfig.Type = "oneshot";
+      script = ''
+        mkdir -p ${lib.escapeShellArg cfg.path}
+        ${pkgs.openssl}/bin/openssl dhparam -out ${lib.escapeShellArg path} \
+          ${toString bits}
+      '';
+    }) cfg.params;
   };
 }
-- 
GitLab


From c35dc53e5652e85a7692ef1f0176f80c7ebc406a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 26 Apr 2018 01:17:40 -0700
Subject: [PATCH 0029/1085] welle-io: remove aarch64 from platform flags

---
 pkgs/applications/misc/welle-io/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix
index b3a9a3f3b86..143ec518ac5 100644
--- a/pkgs/applications/misc/welle-io/default.nix
+++ b/pkgs/applications/misc/welle-io/default.nix
@@ -42,7 +42,6 @@ in stdenv.mkDerivation {
     homepage = http://www.welle.io/;
     maintainers = with maintainers; [ ck3d ];
     license = licenses.gpl2;
-    platforms = with platforms; linux ++ darwin;
+    platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin;
   };
-
 }
-- 
GitLab


From a050133e9f75010fc2fba37c4acfe98c264f6e4c Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 26 Apr 2018 19:39:03 +0900
Subject: [PATCH 0030/1085] linux-mptcp: enable advanced schedulers

---
 pkgs/os-specific/linux/kernel/linux-mptcp.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index c4bade2abed..d486bd1d6d2 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -33,8 +33,7 @@ buildLinux (rec {
     DEFAULT_MPTCP_PM default
 
     # MPTCP scheduler selection.
-    # Disabled as the only non-default is the useless round-robin.
-    MPTCP_SCHED_ADVANCED n
+    MPTCP_SCHED_ADVANCED y
     DEFAULT_MPTCP_SCHED default
 
     # Smarter TCP congestion controllers
-- 
GitLab


From 0d32d9318b00cae2f1956f5e0baaf75d13454606 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <giulio.eulisse@cern.ch>
Date: Thu, 26 Apr 2018 09:58:36 +0200
Subject: [PATCH 0031/1085] Add myself to the maintainers list

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0f05c363a65..c2d94898ab1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2001,6 +2001,11 @@
     github = "kristoff3r";
     name = "Kristoffer Søholm";
   };
+  ktf = {
+    email = "giulio.eulisse@cern.ch";
+    github = "ktf";
+    name = "Giuluo Eulisse";
+ };
   ktosiek = {
     email = "tomasz.kontusz@gmail.com";
     github = "ktosiek";
-- 
GitLab


From 882ed257d639dbea50dfaf8221808a9ddb6ffb71 Mon Sep 17 00:00:00 2001
From: Bernard Fortz <bernard.fortz@gmail.com>
Date: Thu, 26 Apr 2018 19:08:50 +0200
Subject: [PATCH 0032/1085] owncloud-client: 2.3.4 -> 2.4.1

---
 .../networking/owncloud-client/default.nix           |  6 +++---
 .../networking/owncloud-client/find-sql.patch        | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/networking/owncloud-client/find-sql.patch

diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 94e3b7d0ba6..17c5cc86fa6 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "owncloud-client-${version}";
-  version = "2.3.4";
+  version = "2.4.1";
 
   src = fetchurl {
     url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
-    sha256 = "1fpi1mlp2b8sx2993b4mava5c6qw794dmlayih430299z1l9wh49";
+    sha256 = "4462ae581c281123dc62f3604f1aa54c8f4a60cd8157b982e2d76faac0f7aa23";
   };
 
-  patches = [ ../nextcloud-client/find-sql.patch ];
+  patches = [ ./find-sql.patch ];
 
   nativeBuildInputs = [ pkgconfig cmake ];
   buildInputs = [ qtbase qtwebkit qtkeychain sqlite ];
diff --git a/pkgs/applications/networking/owncloud-client/find-sql.patch b/pkgs/applications/networking/owncloud-client/find-sql.patch
new file mode 100644
index 00000000000..44dea6414e9
--- /dev/null
+++ b/pkgs/applications/networking/owncloud-client/find-sql.patch
@@ -0,0 +1,12 @@
+*** a/cmake/modules/QtVersionAbstraction.cmake
+--- b/cmake/modules/QtVersionAbstraction.cmake
+***************
+*** 8,13 ****
+--- 8,14 ----
+  find_package(Qt5Core REQUIRED)
+  find_package(Qt5Network REQUIRED)
+  find_package(Qt5Xml REQUIRED)
++ find_package(Qt5Sql REQUIRED)
+  find_package(Qt5Concurrent REQUIRED)
+  if(UNIT_TESTING)
+      find_package(Qt5Test REQUIRED)
-- 
GitLab


From ca0604190e4428e1cdf9bb369fbbf73e1679e007 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 18 Apr 2018 11:29:54 +0900
Subject: [PATCH 0033/1085] qemu-guest-agent: init module

Allow out of band communication between qemu VMs and the host.
Useful to retrieve IPs of VMs from the host (for instance when libvirt can't analyze
DHCP requests because VMs are configured with static addresses or when
there is connectivity default).
---
 nixos/modules/module-list.nix                 |  1 +
 .../virtualisation/qemu-guest-agent.nix       | 36 +++++++++++++++++++
 nixos/modules/virtualisation/qemu-vm.nix      | 11 ++++++
 3 files changed, 48 insertions(+)
 create mode 100644 nixos/modules/virtualisation/qemu-guest-agent.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8ef76b9d81e..8a81a5fff8d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -777,6 +777,7 @@
   ./virtualisation/hyperv-guest.nix
   ./virtualisation/openvswitch.nix
   ./virtualisation/parallels-guest.nix
+  ./virtualisation/qemu-guest-agent.nix
   ./virtualisation/rkt.nix
   ./virtualisation/virtualbox-guest.nix
   ./virtualisation/virtualbox-host.nix
diff --git a/nixos/modules/virtualisation/qemu-guest-agent.nix b/nixos/modules/virtualisation/qemu-guest-agent.nix
new file mode 100644
index 00000000000..e0d2b3dc509
--- /dev/null
+++ b/nixos/modules/virtualisation/qemu-guest-agent.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.qemuGuest;
+in {
+
+  options.services.qemuGuest = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the qemu guest agent.";
+      };
+  };
+
+  config = mkIf cfg.enable (
+      mkMerge [
+    {
+
+      services.udev.extraRules = ''
+        SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", TAG+="systemd" ENV{SYSTEMD_WANTS}="qemu-guest-agent.service"
+      '';
+
+      systemd.services.qemu-guest-agent = {
+        description = "Run the QEMU Guest Agent";
+        serviceConfig = {
+          ExecStart = "${pkgs.kvm.ga}/bin/qemu-ga";
+          Restart = "always";
+          RestartSec = 0;
+        };
+      };
+    }
+  ]
+  );
+}
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 2b78276fcde..57e25d808dc 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -343,6 +343,15 @@ in
             (<literal>virtio</literal> or <literal>scsi</literal>).
           '';
         };
+
+      guestAgent.enable =
+        mkOption {
+          default = true;
+          type = types.bool;
+          description = ''
+            Enable the Qemu guest agent.
+          '';
+        };
     };
 
     virtualisation.useBootLoader =
@@ -494,6 +503,8 @@ in
     # Don't run ntpd in the guest.  It should get the correct time from KVM.
     services.timesyncd.enable = false;
 
+    services.qemuGuest.enable = cfg.qemu.guestAgent.enable;
+
     system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; }
       ''
         mkdir -p $out/bin
-- 
GitLab


From 837e8c342c2eb3e83873134374854280c873932d Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 27 Apr 2018 18:52:46 -0400
Subject: [PATCH 0034/1085] conglomerate: init at 2017-09-10

---
 .../science/biology/conglomerate/default.nix  | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/science/biology/conglomerate/default.nix

diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix
new file mode 100644
index 00000000000..8e24eacca2b
--- /dev/null
+++ b/pkgs/applications/science/biology/conglomerate/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, cmake, coreutils, perl, bicpl, libminc, zlib, minc_tools,
+  makeWrapper, GetoptTabular, MNI-Perllib }:
+
+stdenv.mkDerivation rec {
+  pname = "conglomerate";
+  name  = "${pname}-2017-09-10";
+
+  src = fetchFromGitHub {
+    owner  = "BIC-MNI";
+    repo   = pname;
+    rev    = "7343238bc6215942c7ecc885a224f24433a291b0";
+    sha256 = "1mlqgmy3jc13bv7d01rjwldxq0p4ayqic85xcl222hhifi3w2prr";
+  };
+
+  nativeBuildInputs = [ cmake makeWrapper ];
+  buildInputs = [ libminc zlib bicpl ];
+  propagatedBuildInputs = [ coreutils minc_tools perl GetoptTabular MNI-Perllib ];
+
+  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBICPL_DIR=${bicpl}/lib/" ];
+
+  checkPhase = "ctest --output-on-failure";  # still some weird test failures though
+
+  postFixup = ''
+    for p in $out/bin/*; do
+      wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}";
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/BIC-MNI/conglomerate;
+    description = "More command-line utilities for working with MINC files";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+    license   = licenses.free;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10053f926da..d98e2aec1d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19740,6 +19740,10 @@ with pkgs;
 
   bcftools = callPackage ../applications/science/biology/bcftools { };
 
+  conglomerate = callPackage ../applications/science/biology/conglomerate {
+    inherit (perlPackages) GetoptTabular MNI-Perllib;
+  };
+
   dcm2niix = callPackage ../applications/science/biology/dcm2niix { };
 
   diamond = callPackage ../applications/science/biology/diamond { };
-- 
GitLab


From 6134887bef5357ccda4d81aef78182217df4c3ed Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 27 Apr 2018 15:52:00 +0200
Subject: [PATCH 0035/1085] mpir: Build with C++ support

This is needed by Alkimia which I'm going to package soon as part of
KMyMoney.

I enabled this by default, because it doesn't increase the closure size
a whole lot (only around 150 KiB):

$ nix-store -q --size /nix/store/...old...-mpir-3.0.0
1223248
$ nix-store -q --size /nix/store/...new...-mpir-3.0.0
1377136

Introducing an option for enabling/disabling this is not worth it,
because it doesn't conflict with anything and the size increase is the
only drawback and we can still make it configurable if we want someday.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @7c6f434c
---
 pkgs/development/libraries/mpir/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index cbcf83f1d32..b9b25e7f43b 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj";
   };
 
+  configureFlags = [ "--enable-cxx" ];
+
   meta = {
     inherit version;
     description = ''A highly optimised library for bignum arithmetic forked from GMP'';
-- 
GitLab


From 5370b8267c94bf5762683746f537c002f0ea3ac6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 28 Apr 2018 01:21:25 +0200
Subject: [PATCH 0036/1085] kdewebkit: Add package expression

This is one of the requirements of KMyMoney and packaging is quite
straightforward with no unexpected traps.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel
---
 pkgs/development/libraries/kde-frameworks/default.nix |  1 +
 .../libraries/kde-frameworks/kdewebkit.nix            | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kdewebkit.nix

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index f54139836b1..d780fc30a4c 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -155,6 +155,7 @@ let
       kded = callPackage ./kded.nix {};
       kdesignerplugin = callPackage ./kdesignerplugin.nix {};
       kdesu = callPackage ./kdesu.nix {};
+      kdewebkit = callPackage ./kdewebkit.nix {};
       kemoticons = callPackage ./kemoticons.nix {};
       kglobalaccel = callPackage ./kglobalaccel.nix {};
       kiconthemes = callPackage ./kiconthemes {};
diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
new file mode 100644
index 00000000000..b7dcfb7fe64
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
@@ -0,0 +1,11 @@
+{ mkDerivation, extra-cmake-modules
+, kconfig, kcoreaddons, kio, kparts, qtwebkit
+}:
+
+mkDerivation {
+  name = "kdewebkit";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kcoreaddons kio kparts ];
+  propagatedBuildInputs = [ qtwebkit ];
+  outputs = [ "out" "dev" ];
+}
-- 
GitLab


From d2b8d8bddc40734b14e9b04039a1ae5415a60b4d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 28 Apr 2018 01:32:32 +0200
Subject: [PATCH 0037/1085] alkimia: init at 7.0.1

This is used by KMyMoney and also the reason why I needed to add C++
support to MPIR in the parent commit.

The reason why I didn't add myself as a maintainer is because I'm not
personally using KMyMoney and thus Alkimia.

Signed-off-by: aszlig <aszlig@nix.build>
---
 .../development/libraries/alkimia/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/alkimia/default.nix

diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix
new file mode 100644
index 00000000000..495c5118e74
--- /dev/null
+++ b/pkgs/development/libraries/alkimia/default.nix
@@ -0,0 +1,24 @@
+{ mkDerivation, fetchurl, lib
+, extra-cmake-modules, doxygen, graphviz, qtbase, mpir
+}:
+
+mkDerivation rec {
+  name = "alkimia-${version}";
+  version = "7.0.1";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/alkimia/${version}/src/${name}.tar.xz";
+    sha256 = "1fri76465058fgsyrmdrc3hj1javz4g10mfzqp5rsj7qncjr1i22";
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ];
+
+  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ mpir ];
+
+  meta = {
+    description = "Library used by KDE finance applications";
+    license = lib.licenses.lgpl21Plus;
+    platforms = qtbase.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3795cce452a..213bdcc784e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11181,6 +11181,8 @@ with pkgs;
 
     accounts-qt = callPackage ../development/libraries/accounts-qt { };
 
+    alkimia = callPackage ../development/libraries/alkimia { };
+
     fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
 
     qgpgme = callPackage ../development/libraries/gpgme { };
-- 
GitLab


From 93042b7376139fca94e1223a7a5803399806ef61 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 28 Apr 2018 02:21:22 +0200
Subject: [PATCH 0038/1085] kmymoney: init at 5.0.1

I tried to use -DENABLE_SQLCIPHER and also passed the right directories
to the Qt 5 source of the QSQLiteDriver but CMake then failed to run
qt4_automoc, by which I'd imply that SQLCipher is not maintained
anymore (after all KMyMoney using qgpgme as well, which doesn't require
sources).

Another odd thing is that CMake reports that the weboob plugin is
disabled, but after inspecting it turns out that the reporting is just
wrong. This is already fixed upstream but not yet released in
KDE/kmymoney@8b086cf921879770971e9331f005339bfacdc84c.

In addition of running the upstream test suite I have manually tested a
few things in a VM by using the following Nix expression:

  (import <nixpkgs/nixos> {
    configuration = { pkgs, ... }: {
      environment.systemPackages = with pkgs; [
        kmymoney aqbanking gwenhywfar libchipcard python2Packages.weboob
        kgpg
      ];
      users.users.test.isNormalUser = true;
      virtualisation.diskSize = 4096;
      virtualisation.memorySize = 2048;
      services.xserver = {
        enable = true;
        inherit ((import <nixpkgs/nixos> {}).config.services.xserver) layout;
        displayManager.sddm.enable = true;
        displayManager.sddm.autoLogin.enable = true;
        displayManager.sddm.autoLogin.user = "test";
        desktopManager.default = "plasma5";
        desktopManager.plasma5.enable = true;
      };
    };
  }).vm

The things I have tested in particular are:

  * Basic startup
  * Completing the wizard
  * Add some test transactions
  * GPG encryption
  * Generation of charts and reports
  * Rough check whether OFX integration lists supported financial
    institutions.
  * Small check of AqBanking implementation, whether accounts and users
    can be configured, but didn't test actual connectivity with a
    financial institution.
  * Check of Weboob integration with a test PayPal backend, however also
    just with a dummy account and without actually connecting to PayPal.

One of the upstream tests "reports-chart-test" seems to fail even though
generating charts and reports are working when testing manually. It also
seems that this is the case on other distributions, for example Gentoo
has disabled that test as well:

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5169cec68fa6fd67841

Note that I didn't add myself as a maintainer because I'm not personally
using KMyMoney but just packaged it for someone else. I hope this is
useful for other people, so that maybe someday[TM] there will be a
proper maintainer.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel
---
 pkgs/applications/office/kmymoney/default.nix | 70 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/applications/office/kmymoney/default.nix

diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
new file mode 100644
index 00000000000..212aaa5fa2c
--- /dev/null
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -0,0 +1,70 @@
+{ stdenv, lib, fetchurl, doxygen, extra-cmake-modules, graphviz, kdoctools
+
+, akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive
+, kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement
+, kitemmodels, libical, libofx, qgpgme
+
+# Needed for running tests:
+, qtbase, xvfb_run
+
+# For weboob, which only supports Python 2.x:
+, python2Packages
+}:
+
+stdenv.mkDerivation rec {
+  name = "kmymoney-${version}";
+  version = "5.0.1";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz";
+    sha256 = "1c9apnvc07y17pzy4vygry1dai5ass2z7j354lrcppa85b18yvnx";
+  };
+
+  # Hidden dependency that wasn't included in CMakeLists.txt:
+  NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5";
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    doxygen extra-cmake-modules graphviz kdoctools python2Packages.wrapPython
+  ];
+
+  buildInputs = [
+    akonadi alkimia aqbanking gmp gwenhywfar kactivities karchive kcmutils
+    kcontacts kdewebkit kdiagram kholidays kidentitymanagement kitemmodels
+    libical libofx qgpgme
+
+    # Put it into buildInputs so that CMake can find it, even though we patch
+    # it into the interface later.
+    python2Packages.weboob
+  ];
+
+  weboobPythonPath = [ python2Packages.weboob ];
+
+  postInstall = ''
+    buildPythonPath "$weboobPythonPath"
+    patchPythonScript "$out/share/kmymoney/weboob/kmymoneyweboob.py"
+
+    # Within the embedded Python interpreter, sys.argv is unavailable, so let's
+    # assign it to a dummy value so that the assignment of sys.argv[0] injected
+    # by patchPythonScript doesn't fail:
+    sed -i -e '1i import sys; sys.argv = [""]' \
+      "$out/share/kmymoney/weboob/kmymoneyweboob.py"
+  '';
+
+  doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+  installCheckPhase = let
+    pluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}";
+  in lib.optionalString doInstallCheck ''
+    QT_PLUGIN_PATH=${lib.escapeShellArg pluginPath} CTEST_OUTPUT_ON_FAILURE=1 \
+      ${xvfb_run}/bin/xvfb-run -s '-screen 0 1024x768x24' make test \
+      ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now.
+  '';
+
+  meta = {
+    description = "Personal finance manager for KDE";
+    homepage = https://kmymoney.org/;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 213bdcc784e..329c6fb8105 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16476,6 +16476,11 @@ with pkgs;
 
   kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
 
+  kmymoney = libsForQt5.callPackage ../applications/office/kmymoney {
+    inherit (kdeApplications) kidentitymanagement;
+    inherit (kdeFrameworks) kdewebkit;
+  };
+
   kodestudio = callPackage ../applications/editors/kodestudio { };
 
   konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { };
-- 
GitLab


From 9e883426417b5f249a45a3cdb9fdbbd6625f8e08 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 28 Apr 2018 13:53:07 +0200
Subject: [PATCH 0039/1085] alkimia: Add meta.longDescription

@7c6f434c wrote in [1]:

   Maybe copy-paste the upstream "Alkimia is the infrastructure for
   common storage and business logic that will be used by all financial
   applications in KDE. The target is to share financial related
   information over application bounderies." as longDescription for
   Alkimia? The current description makes me want to look up the
   homepage to find out what it actually is (then I do, and despair).

[1]: https://github.com/NixOS/nixpkgs/pull/39647#issuecomment-385169261

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/development/libraries/alkimia/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix
index 495c5118e74..6f4fd09015e 100644
--- a/pkgs/development/libraries/alkimia/default.nix
+++ b/pkgs/development/libraries/alkimia/default.nix
@@ -18,6 +18,13 @@ mkDerivation rec {
 
   meta = {
     description = "Library used by KDE finance applications";
+    longDescription = ''
+      Alkimia is the infrastructure for common storage and business
+      logic that will be used by all financial applications in KDE.
+
+      The target is to share financial related information over
+      application bounderies.
+    '';
     license = lib.licenses.lgpl21Plus;
     platforms = qtbase.meta.platforms;
   };
-- 
GitLab


From eaf0592498070e3184316c9c63c3dd1c5264cd95 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 2 Feb 2018 07:51:23 +0000
Subject: [PATCH 0040/1085] ocamlPackages.ocsigen_server: 2.8 -> 2.9

---
 .../ocaml-modules/ocsigen-server/default.nix  | 33 ++++++++++++++-----
 pkgs/top-level/ocaml-packages.nix             |  2 +-
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 081f9edbecf..efbb1230497 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, ocaml, findlib, which, react, ssl,
-lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
+{ stdenv, fetchurl, ocaml, findlib, which, react, ssl
+, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
 libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
-, camlzip, pgocaml
+, camlzip, pgocaml, lwt2, lwt_react, lwt_ssl
 }:
 
 let mkpath = p: n:
@@ -9,17 +9,32 @@ let mkpath = p: n:
   "${p}/lib/ocaml/${v}/site-lib/${n}";
 in
 
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.03" then {
+    version = "2.9";
+    sha256 = "0na3qa4h89f2wv31li63nfpg4151d0g8fply0bq59j3bhpyc85nd";
+    buildInputs = [ lwt_react lwt_ssl ];
+    ldpath = "";
+  } else {
+    version = "2.8";
+    sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
+    buildInputs = [ lwt2 ];
+    ldpath = "${mkpath lwt2 "lwt"}";
+  }
+; in
+
 stdenv.mkDerivation {
-  name = "ocsigenserver-2.8";
+  name = "ocsigenserver-${param.version}";
 
   src = fetchurl {
-    url = https://github.com/ocsigen/ocsigenserver/archive/2.8.tar.gz;
-    sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
+    url = "https://github.com/ocsigen/ocsigenserver/archive/${param.version}.tar.gz";
+    inherit (param) sha256;
   };
 
-  buildInputs = [ocaml which findlib react ssl lwt
+  buildInputs = [ocaml which findlib react ssl
   ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
-  ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ];
+  ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]
+  ++ (param.buildInputs or []);
 
   configureFlags = "--root $(out) --prefix /";
 
@@ -31,7 +46,7 @@ stdenv.mkDerivation {
   ''
   rm -rf $out/var/run
   wrapProgram $out/bin/ocsigenserver \
-    --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
+    --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${param.ldpath}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
   '';
 
   dontPatchShebangs = true;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 741a58ce588..22efb8a8a35 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -504,7 +504,7 @@ let
 
     ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { };
 
-    ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { lwt = lwt2; };
+    ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
 
     ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { };
 
-- 
GitLab


From 8994fff8bb06b86c42aff28b8ef6f9cc77cb81af Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 31 Mar 2018 05:41:24 +0000
Subject: [PATCH 0041/1085] ocamlPackages.eliom: 6.2.0 -> 6.3.0

---
 .../ocaml-modules/eliom/default.nix           | 40 ++++++++++++-------
 pkgs/top-level/ocaml-packages.nix             |  5 +--
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 42afec7e439..da9383c4e95 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,35 +1,47 @@
-{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
-  js_of_ocaml, react, lwt, calendar, cryptokit, tyxml,
-  ipaddr, ocamlnet, ssl, ocaml_pcre, ocaml_optcomp,
-  reactivedata, opam, ppx_tools, ppx_deriving, findlib
-, ocamlbuild
+{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4,
+  js_of_ocaml, lwt_react, cryptokit,
+  ipaddr, ocamlnet, lwt_ssl, ocaml_pcre,
+  opam, ppx_tools, ppx_deriving, findlib
+, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
+, js_of_ocaml-lwt
+, js_of_ocaml-tyxml
 }:
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.02";
+assert stdenv.lib.versionAtLeast ocaml.version "4.03";
 
 stdenv.mkDerivation rec
 {
   pname = "eliom";
-  version = "6.2.0";
+  version = "6.3.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
-    sha256 = "01c4l982ld6d1ndhb6f15ldb2li7mv0bs279d5gs99mpiwsapadx";
+    sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v";
   };
 
   patches = [ ./camlp4.patch ];
 
-  buildInputs = [ ocaml which findlib ocamlbuild ocaml_optcomp opam ppx_tools ];
+  buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opam ppx_tools
+    ocsigen_deriving
+  ];
 
-  propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
-                            ocsigen_deriving js_of_ocaml
-                            calendar cryptokit ocamlnet react ssl ocaml_pcre ];
+  propagatedBuildInputs = [
+    camlp4
+    cryptokit
+    ipaddr
+    js_of_ocaml-lwt
+    js_of_ocaml-ppx
+    js_of_ocaml-tyxml
+    lwt_react
+    lwt_ssl
+    ocamlnet ocaml_pcre
+    ocsigen_server
+    ppx_deriving
+  ];
 
   installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
 
-  createFindlibDestdir = true;
-
   setupHook = [ ./setup-hook.sh ];
 
   meta = {
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 22efb8a8a35..92f772bb25e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -217,10 +217,7 @@ let
 
     easy-format = callPackage ../development/ocaml-modules/easy-format { };
 
-    eliom = callPackage ../development/ocaml-modules/eliom {
-      lwt = lwt2;
-      js_of_ocaml = js_of_ocaml_2;
-    };
+    eliom = callPackage ../development/ocaml-modules/eliom { };
 
     enumerate = callPackage ../development/ocaml-modules/enumerate { };
 
-- 
GitLab


From 9a170f5bdfbf87d6e31ab070528d78b4ea7d405b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 1 Apr 2018 06:54:23 +0000
Subject: [PATCH 0042/1085] ocamlPackages.ocsigen-toolkit: 1.0.0 -> 1.1.0

---
 .../ocaml-modules/ocsigen-toolkit/default.nix        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
index 00416c92bb9..556c343241c 100644
--- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, buildOcaml, ocaml, eliom, opam }:
+{ stdenv, fetchurl, buildOcaml, ocaml, opam
+, calendar, eliom, js_of_ocaml-ppx_deriving_json
+}:
 
 buildOcaml rec
 {
  name = "ocsigen-toolkit";
- version = "1.0.0";
+ version = "1.1.0";
 
- propagatedBuildInputs = [ eliom ];
+ propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ];
  buildInputs = [ opam ];
 
- createFindlibDestdir = true;
-
  installPhase =
   ''
     export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
@@ -18,7 +18,7 @@ buildOcaml rec
   '';
 
   src = fetchurl {
-    sha256 = "0wm4fnss7vlkd03ybgfrk63kpip6m6p6kdqjn3f64n11256mwzj2";
+    sha256 = "1i5806gaqqllgsgjz3lf9fwlffqg3vfl49msmhy7xvq2sncbxp8a";
     url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz";
   };
 
-- 
GitLab


From 7d7afdde4a9b5e9853ac4e0ff8477debdfc302b4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 1 Apr 2018 07:00:07 +0000
Subject: [PATCH 0043/1085] ocamlPackages.ocsigen-start: 1.0.0 -> 1.1.0

---
 .../ocaml-modules/ocsigen-start/default.nix          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index 13794602af4..ba7e3e93c98 100644
--- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ojquery, magick, ocsigen_deriving, ocsigen_server }:
+{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
+, js_of_ocaml-camlp4
+}:
 
 buildOcaml rec
 {
   name = "ocsigen-start";
-  version = "1.0.0";
+  version = "1.1.0";
 
-  buildInputs = [ eliom ];
-  propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ojquery ocsigen_deriving ocsigen_server magick ];
+  buildInputs = [ eliom js_of_ocaml-camlp4 ];
+  propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server ];
 
   patches = [ ./templates-dir.patch ];
 
@@ -16,7 +18,7 @@ buildOcaml rec
   
   src = fetchurl {
     url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz";
-    sha256 = "0npc2iq39ixci6ly0fssklv07zqi5cfa1adad4hm8dbzjawkqqll";
+    sha256 = "09cw6qzcld0m1qm66mbjg9gw8l6dynpw3fzhm3kfx5ldh0afgvjq";
   };
 
   createFindlibDestdir = true;
-- 
GitLab


From cd0aee5cbceba576b61d932601702b8740ed3b8c Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 28 Apr 2018 23:07:10 -0400
Subject: [PATCH 0044/1085] buildbot: 1.1.0 -> 1.1.1

---
 .../tools/build-managers/buildbot/default.nix          |  4 ++--
 .../tools/build-managers/buildbot/plugins.nix          | 10 +++++-----
 .../tools/build-managers/buildbot/worker.nix           |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 98adaf1c1aa..bc2cd978f67 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -14,11 +14,11 @@ let
   package = pythonPackages.buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "buildbot";
-    version = "1.1.0";
+    version = "1.1.1";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1rhmlcvw0dsr4f37sb3xmb9xcn76lsrsw2g1z611g339nmxzi0sc";
+      sha256 = "1vcmanx3ma3cfyiddjcmsnx6qmxd3m5blqax04rcsiq2zq4dmzir";
     };
 
     buildInputs = with pythonPackages; [
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index 35c8ed8c71c..c8a12c19264 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -11,7 +11,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version format;
-      sha256 = "0nmrq50c5ib185rpb8ai1mm7gjq2mjvxik1kqrjfa62i1ia9ikyj";
+      sha256 = "01v9w8iy9q6fwrmz6db7fanjixax7whn74k67bj0czrbjjkpfzvb";
     };
 
     meta = with stdenv.lib; {
@@ -29,7 +29,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1laz7l7cbbz0czb6skxw314bd2qk2f63qw3n2rs7m7v11gd9cdll";
+      sha256 = "1cwxkzpgwzk9b361rj980bbnmhzzsr46pgf94zqpg3na8xm6hpwj";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -49,7 +49,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0mmri8c4n1zwxc1dx2a11yllrmnwqqxjvvil9224lbs98mpchppi";
+      sha256 = "0ival58f50128315d0nck63pzya2zm7q6hvgmxfbjl0my8il9p2l";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -69,7 +69,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0nwlw2m3qfifia6gy3d4lrnycra50k98ax071p2zjqknanh563vr";
+      sha256 = "0jiwfb699nqbmpcm88y187ig4ha6p7d4v98mjwa9blhm54dk8kh1";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -89,7 +89,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1zml9bd910zwcby4vr3lmzap2grinha2w5zgb2cmixmz7hfrqswp";
+      sha256 = "00mfn24gbwr2p3n7nsijzv949l7hiksiafhma18nnh40r8f4l5f2";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index 59d3c93bb87..b1cfb6aeaf2 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -3,11 +3,11 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0hpiawf0dq8phsvihlcx9bpl70n7s3rhcgbgma36bark6sgr4y8y";
+    sha256 = "02xfzlcy3cnvc3cmpl9gs6209a3qm71yz5pahbws9jcyhv6fbrrm";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
-- 
GitLab


From 7d68eadf373f9962b0e6c9f9299563c543245396 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 29 Apr 2018 13:30:09 -0400
Subject: [PATCH 0045/1085] nixos/acme: Fix broken post-stop script

Previously the script would contain an empty `if` block (which is invalid
syntax) if both `data.activationDelay == null` and `data.postRun == ""`. Fix
this by adding a no-op `true`.
---
 nixos/modules/security/acme.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index e430c2ddb90..9e5d636241e 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -257,7 +257,7 @@ in
 
                     if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then
                       ${if data.activationDelay != null then ''
-                      
+
                       ${data.preDelay}
 
                       if [ -d '${lpath}' ]; then
@@ -266,6 +266,10 @@ in
                         systemctl --wait start acme-setlive-${cert}.service
                       fi
                       '' else data.postRun}
+
+                      # noop ensuring that the "if" block is non-empty even if
+                      # activationDelay == null and postRun == ""
+                      true
                     fi
                   '';
 
@@ -294,7 +298,7 @@ in
                         chown '${data.user}:${data.group}' '${cpath}'
                       fi
                   '';
-                  script = 
+                  script =
                     ''
                       workdir="$(mktemp -d)"
 
-- 
GitLab


From 42d11feae80f86b450ce64eef75a6f21dc807aab Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <couchemar@yandex.ru>
Date: Wed, 7 Mar 2018 17:19:37 +0300
Subject: [PATCH 0046/1085] pythonPackages.isort: 4.2.5 -> 4.3.4

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

diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix
new file mode 100644
index 00000000000..5a7e50d4332
--- /dev/null
+++ b/pkgs/development/python-modules/isort/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27, futures, mock, pytest }:
+
+buildPythonPackage rec {
+  pname = "isort";
+  version = "4.3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1y0yfv56cqyh9wyg7kxxv9y5wmfgcq18n7a49mp7xmzka2bhxi5r";
+  };
+
+  propagatedBuildInputs = lib.optional isPy27 futures;
+
+  checkInputs = [ mock pytest ];
+
+  checkPhase = ''
+    py.test test_isort.py -k "not test_long_line_comments \
+                          and not test_import_case_produces_inconsistent_results_issue_472 \
+                          and not test_no_extra_lines_issue_557"
+  '';
+
+  meta = with lib; {
+    description = "A Python utility / library to sort Python imports";
+    homepage = https://github.com/timothycrosley/isort;
+    license = licenses.mit;
+    maintainers = with maintainers; [ couchemar nand0p ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f24d6ff955b..997da36a1eb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6802,24 +6802,7 @@ in {
 
   iso8601 = callPackage ../development/python-modules/iso8601 { };
 
-  isort = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "isort";
-    version = "4.2.5";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/${pname}/${name}.tar.gz";
-      sha256 = "0p7a6xaq7zxxq5vr5gizshnsbk2afm70apg97xwfdxiwyi201cjn";
-    };
-    buildInputs = with self; [ mock pytest ];
-    # No tests distributed
-    doCheck = false;
-    meta = {
-      description = "A Python utility / library to sort Python imports";
-      homepage = https://github.com/timothycrosley/isort;
-      license = licenses.mit;
-      maintainers = with maintainers; [ couchemar nand0p ];
-    };
-  };
+  isort = callPackage ../development/python-modules/isort {};
 
   jabberbot = callPackage ../development/python-modules/jabberbot {};
 
-- 
GitLab


From caed1877ebf7a84f16ac1eb6af641af155e47b5b Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 11 Apr 2018 20:51:39 +0200
Subject: [PATCH 0047/1085] cryptsetup-generator: add postFixup

This makes cryptsetup-generator link correctly
to the shared systemd library.
---
 .../linux/systemd/cryptsetup-generator.nix            | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
index f69269347e3..5c6efb44013 100644
--- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
+++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
@@ -13,6 +13,17 @@ stdenv.lib.overrideDerivation systemd (p: {
     ninja systemd-cryptsetup systemd-cryptsetup-generator
   '';
 
+  # As ninja install is not used here, the rpath needs to be manually fixed.
+  # Otherwise the resulting binary doesn't properly link against systemd-shared.so
+  postFixup = ''
+    sharedLib=libsystemd-shared-${p.version}.so
+    for prog in `find $out -type f -executable`; do
+      (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && (
+        patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog
+      ) || true
+    done
+  '';
+
   installPhase = ''
     mkdir -p $out/lib/systemd/
     cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup
-- 
GitLab


From 87b51a1e670e1f973c48d1f8d896b2098e8769ca Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Sun, 29 Apr 2018 22:22:19 +0200
Subject: [PATCH 0048/1085] wine-{Unstable,Staging}: 3.5 -> 3.7

---
 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 f86e34a5d54..817241fbe0f 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "3.5";
+    version = "3.7";
     url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
-    sha256 = "0hr1syfhnpvcm84gmms1i26k68hakcgw4m6dvckmbbvw7ca0c8pl";
+    sha256 = "1drbzk3y0m14lkq3vzwwkvain5shykgcbmyzh6gcb5r4sxh3givn";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-compholio/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "0kcwg7w79zbsg29b9ma9mapzhj9dg7z0vccy4a35fx04044xj0zn";
+    sha256 = "0kam73jqhah7bzji5csxxhhfdp6byhzpcph6xnzjqz2aic5xk7xi";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";
-- 
GitLab


From b3d5ca8359d3fac0f21ccece79c202557a9433b5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 30 Apr 2018 05:53:38 +0200
Subject: [PATCH 0049/1085] nixos/dhparams: Set default bit size to 2048

@Ekleog writes in https://github.com/NixOS/nixpkgs/pull/39526:

> I think a default of 4096 is maybe too much? See certbot/certbot#4973;
> Let's Encrypt supposedly know what they are doing and use a
> pre-generated 2048-bit DH params (and using the same DH params as
> others is quite bad, even compared to lower bit size, if I correctly
> remember the attacks available -- because it increases by as much the
> value of breaking the group).

> Basically I don't have anything personal against 4096, but fear it may
> re-start the arms race: people like having "more security" than their
> distributions, and having NixOS already having more security than is
> actually useful (I personally don't know whether a real-size quantum
> computer will come before or after our being able to break 2048-bit
> keys, let alone 3072-bit ones -- see wikipedia for some numbers).

> So basically, I'd have set it to 3072 in order to both decrease build
> time and avoid having people setting it to 8192 and complaining about
> how slow things are, but that's just my opinion. :)

While he suggests is 3072 I'm using 2048 now, because it's the default
of "openssl dhparam". If users want to have a higher value, they can
still change it.

Signed-off-by: aszlig <aszlig@nix.build>
---
 nixos/modules/security/dhparams.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index 481d4c5db51..beac125fc6e 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -10,7 +10,7 @@ let
         name = "bits";
         description = "integer of at least 16 bits";
       };
-      default = 4096;
+      default = 2048;
       description = ''
         The bit size for the prime that is used during a Diffie-Hellman
         key exchange.
-- 
GitLab


From 480da10f30b5855aee3433365c5b3065437c9074 Mon Sep 17 00:00:00 2001
From: Stefan Wiehler <sephalon@farce.de>
Date: Mon, 24 Oct 2016 23:54:18 +0200
Subject: [PATCH 0050/1085] open-ecard: init at 1.2.4

---
 pkgs/tools/security/open-ecard/default.nix | 64 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/tools/security/open-ecard/default.nix

diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix
new file mode 100644
index 00000000000..a0af51186ed
--- /dev/null
+++ b/pkgs/tools/security/open-ecard/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, jre, pcsclite, makeDesktopItem, makeWrapper }:
+
+let
+  version = "1.2.4";
+
+  srcs = {
+    richclient = fetchurl {
+      url = "https://jnlp.openecard.org/richclient-${version}-20171212-0958.jar";
+      sha256 = "1ckhyhszp4zhfb5mn67lz603b55z814jh0sz0q5hriqzx017j7nr";
+    };
+    cifs = fetchurl {
+      url = "https://jnlp.openecard.org/cifs-${version}-20171212-0958.jar";
+      sha256 = "0rc862lx3y6sw87r1v5xjmqqpysyr1x6yqhycqmcdrwz0j3wykrr";
+    };
+    logo = fetchurl {
+      url = https://raw.githubusercontent.com/ecsec/open-ecard/1.2.3/gui/graphics/src/main/ext/oec_logo_bg-transparent.svg;
+      sha256 = "0rpmyv10vjx2yfpm03mqliygcww8af2wnrnrppmsazdplksaxkhs";
+    };
+  };
+in stdenv.mkDerivation rec {
+  appName = "open-ecard";
+  name = "${appName}-${version}";
+
+  src = srcs.richclient;
+
+  phases = "installPhase";
+
+  buildInputs = [ makeWrapper ];
+
+  desktopItem = makeDesktopItem {
+    name = appName;
+    desktopName = "Open eCard App";
+    genericName = "eCard App";
+    comment = "Client side implementation of the eCard-API-Framework";
+    icon = "oec_logo_bg-transparent.svg";
+    exec = appName;
+    categories = "Utility;Security;";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/java
+    cp ${srcs.richclient} $out/share/java/richclient-${version}.jar
+    cp ${srcs.cifs} $out/share/java/cifs-${version}.jar
+
+    mkdir -p $out/share/applications $out/share/pixmaps
+    cp $desktopItem/share/applications/* $out/share/applications
+    cp ${srcs.logo} $out/share/pixmaps/oec_logo_bg-transparent.svg
+
+    mkdir -p $out/bin
+    makeWrapper ${jre}/bin/java $out/bin/${appName} \
+      --add-flags "-cp $out/share/java/cifs-${version}.jar" \
+      --add-flags "-jar $out/share/java/richclient-${version}.jar" \
+      --suffix LD_LIBRARY_PATH ':' ${pcsclite}/lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Client side implementation of the eCard-API-Framework (BSI
+      TR-03112) and related international standards, such as ISO/IEC 24727";
+    homepage = https://www.openecard.org/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ sephalon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 719a5c66db7..3317e254834 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4076,6 +4076,8 @@ with pkgs;
 
   opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { };
 
+  open-ecard = callPackage ../tools/security/open-ecard { };
+
   openjade = callPackage ../tools/text/sgml/openjade { };
 
   openmvg = callPackage ../applications/science/misc/openmvg { };
-- 
GitLab


From 8446ba26a8f098c98d06b24acce7588eac63eb1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Mon, 30 Apr 2018 16:55:27 +0200
Subject: [PATCH 0051/1085] added lost entry in all-packages.nix

---
 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 cac46ff0f4c..7f035ad89b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13508,6 +13508,8 @@ with pkgs;
 
     broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
 
+    tbs = callPackage ../os-specific/linux/tbs { };
+
     nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
 
     nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { };
-- 
GitLab


From 3520fef779dbdfc145214294673c47aeac4ddeab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 08:43:52 -0700
Subject: [PATCH 0052/1085] x42-plugins: 20170428 -> 20180320
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fat1 -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fat1 --help’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fil4 -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fil4 --help’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-meter -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-meter --help’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-mixtri -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-mixtri --help’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-scope -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-scope --help’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-stepseq -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-stepseq --help’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-tuna -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-tuna --help’ got 0 exit code
- directory tree listing: https://gist.github.com/b5bff61b6a034a2f1ebe040e1e3155d0
---
 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 4c4f958ec49..6bf45f451a5 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -3,12 +3,12 @@
 , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
 
 stdenv.mkDerivation rec {
-  version = "20170428";
+  version = "20180320";
   name = "x42-plugins-${version}";
 
   src = fetchurl {
     url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz";
-    sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg";
+    sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From ecc7f83e75b48ee04c4c7cac1386e370921060f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 11:07:54 -0700
Subject: [PATCH 0053/1085] spidermonkey_52: 52.6.0 -> 52.7.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 -h’ got 0 exit code
- ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 --help’ got 0 exit code
- ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 -v’ and found version 52.7.4
- ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 --version’ and found version 52.7.4
- ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52-config --version’ and found version 52.7.4
- found 52.7.4 with grep in /nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4
- directory tree listing: https://gist.github.com/7e5182415a0a1bce8071576312c08a3a
---
 pkgs/development/interpreters/spidermonkey/52.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index 4992ea04f11..35dcff95029 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
 
 let
-  version = "52.6.0";
+  version = "52.7.4";
 in stdenv.mkDerivation rec {
   name = "spidermonkey-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
-    sha256 = "0hhyd4ni4jja7jd687dm0csi1jcjxahf918zbjzr8njz655djz2q";
+    sha256 = "0dn3hbc95qhvcgzbibhy17xwn5m0340f64bq5byvx22c2rf40xwz";
   };
 
   buildInputs = [ readline icu zlib nspr ];
-- 
GitLab


From 4e5cecabcfcb2fcb70c8f992e7686fb2ced65a45 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 11:41:45 -0700
Subject: [PATCH 0054/1085] pqiv: 2.10.3 -> 2.10.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv -h’ got 0 exit code
- ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv --help’ got 0 exit code
- ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv help’ got 0 exit code
- found 2.10.4 with grep in /nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4
- directory tree listing: https://gist.github.com/4743505ebdeb4ef63b3c2637f5d6879d
---
 pkgs/applications/graphics/pqiv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix
index 757ce52e9c4..e4f565b3b05 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation (rec {
   name = "pqiv-${version}";
-  version = "2.10.3";
+  version = "2.10.4";
 
   src = fetchFromGitHub {
     owner = "phillipberndt";
     repo = "pqiv";
     rev = version;
-    sha256 = "16nhnv0dcp242jf1099pjr5dwnc65i40cnb3dvx1avdhidcmsx01";
+    sha256 = "04fawc3sd625y1bbgfgwmak56pq28sm58dwn5db4h183iy3awdl9";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 4ea3841d7f9fbed0aaee83bde0227b09384e50fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 11:43:21 -0700
Subject: [PATCH 0055/1085] picard-tools: 2.18.2 -> 2.18.3

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.18.3 with grep in /nix/store/q67hqz7716nf3c4f8rjmlpf2dqbb06rz-picard-tools-2.18.3
- directory tree listing: https://gist.github.com/6b71ce718f18ef6a48c05457cd0e583b
---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 7af1669dc45..ed90ed5aa04 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.18.2";
+  version = "2.18.3";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0w3b2jz4n9irslsg85r4x9dc3y4ziykn8fs4iqqiq4sfdcz259fz";
+    sha256 = "0w4v30vnyr549hd9lhj1sm69whssabqvhfrbavxfjbl2k9fw83qf";
   };
 
   buildInputs = [ jre makeWrapper ];
-- 
GitLab


From decaeb1bfa9c21c1317973fcdd24b50f2eb223b2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Apr 2018 13:59:11 -0500
Subject: [PATCH 0056/1085] nano: 2.9.4 -> 2.9.6

---
 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 9ff1c44dceb..f5598b3365b 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.9.4";
+  version = "2.9.6";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "0nm3zy4azr5rkxjq7jfybbj3cnddmvxc49rxyqm9cp2zfdp75y9c";
+    sha256 = "1inl8ljkc711969ncwy7irf0464psasikg1g42l0g4sfpdz50wx3";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
-- 
GitLab


From 3e37981ae3601aa29e72d307c6d51d550af207d2 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Mon, 30 Apr 2018 22:22:18 +0200
Subject: [PATCH 0057/1085] i3lock-color: 2.10.1-1-c -> 2.11-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 edaa88bde23..66a6af2fbb0 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.10.1-1-c";
+  version = "2.11-c";
   name = "i3lock-color-${version}";
 
   src = fetchFromGitHub {
     owner = "PandorasFox";
     repo = "i3lock-color";
-    rev = "01476c56333cccae80cdd3f125b0b9f3a0fe2cb3";
-    sha256 = "06ca8496fkdkvh4ycg0b7kd3r1bjdqdwfimb51v4nj1lm87pdkdf";
+    rev = version;
+    sha256 = "1myq9fazkwd776agrnj27bm5nwskvss9v9a5qb77n037dv8d0rdw";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From 4f715a5690d28cf74068de823cbb793194a0b2ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 13:48:48 -0700
Subject: [PATCH 0058/1085] palemoon: 27.8.3 -> 27.9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon -h’ got 0 exit code
- ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon --help’ got 0 exit code
- ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon -V’ and found version 27.9.0
- ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon -v’ and found version 27.9.0
- ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon --version’ and found version 27.9.0
- found 27.9.0 with grep in /nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0
- directory tree listing: https://gist.github.com/d3039819d96bec3615450de44abbffc4
---
 pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 0c0ef501e99..aa77f084734 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   name = "palemoon-${version}";
-  version = "27.8.3";
+  version = "27.9.0";
 
   src = fetchFromGitHub {
     name   = "palemoon-src";
     owner  = "MoonchildProductions";
     repo   = "Pale-Moon";
     rev    = version + "_Release";
-    sha256 = "1v3wliq8k5yq17ms214fhwka8x4l3sq8kja59dx4pbvczzb1zyzh";
+    sha256 = "181g1hy4k9xr6nlrw8jamp541gr5znny4mmpwwaa1lzq5v1w1sw6";
   };
 
   desktopItem = makeDesktopItem {
-- 
GitLab


From 49e4a597cb2eed29cf8abe6852dc142119cb5d7b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 14:17:03 -0700
Subject: [PATCH 0059/1085] mopidy-iris: 3.17.1 -> 3.17.5

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.17.5 with grep in /nix/store/ih97pncwmlk71wa9cv49aa9hx7mxc156-Mopidy-Iris-3.17.5
- directory tree listing: https://gist.github.com/0f0187f3e9d60193ebddabe0b082e78f
---
 pkgs/applications/audio/mopidy/iris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index f3a9b73aabe..cfd2a4173da 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.17.1";
+  version = "3.17.5";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "02k1br077v9c5x6nn0391vh28pvn1zjbkjv8h508vy7k6ch2xjyq";
+    sha256 = "011bccvjy1rdrc43576hgfb7md404ziqmkam6na2z6v9km1b9gwr";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 2034ef073fe0490a7dbabbde81a4c39f91850064 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 15:00:53 -0700
Subject: [PATCH 0060/1085] jackett: 0.8.886 -> 0.8.929
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/5zfami4c97mdgiw2kga88hbr050gz9nl-jackett-0.8.929/bin/Jackett -h’ got 0 exit code
- ran ‘/nix/store/5zfami4c97mdgiw2kga88hbr050gz9nl-jackett-0.8.929/bin/Jackett help’ got 0 exit code
- found 0.8.929 with grep in /nix/store/5zfami4c97mdgiw2kga88hbr050gz9nl-jackett-0.8.929
- directory tree listing: https://gist.github.com/abeee550859eff26afc80fcec3b0ec15
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index f2d38111d5d..8324af8b3d0 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.886";
+  version = "0.8.929";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "18agnavhch29pi1w6vp374cs6bz2j7bf55mh4ym0cs038h5xkdvv";
+    sha256 = "1dq69734f6x8iw1jpvln5lq7bykpwky6iiwz8iwwamwg8143f20p";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From bf49200102a19a34bc619bfa7643cf9037dea4e2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 15:37:14 -0700
Subject: [PATCH 0061/1085] kotlin: 1.2.40 -> 1.2.41
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/5byxycv5j3gvwvr87qpv08a7347fxv9q-kotlin-1.2.41/bin/kotlin -h’ got 0 exit code
- ran ‘/nix/store/5byxycv5j3gvwvr87qpv08a7347fxv9q-kotlin-1.2.41/bin/.kotlin-wrapped -h’ got 0 exit code
- found 1.2.41 with grep in /nix/store/5byxycv5j3gvwvr87qpv08a7347fxv9q-kotlin-1.2.41
- directory tree listing: https://gist.github.com/927e0c1e045ca7c165603ae8b1961beb
---
 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 d5ce240b4a5..e589611505f 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.2.40";
+  version = "1.2.41";
 in stdenv.mkDerivation rec {
   inherit version;
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "0n4na0ddnjgc573szk5bpd34v5gib71pah62xq7vwdf34q8mg61l";
+    sha256 = "0p16xl2qhm7913abd06vvmsx956ny51jjfr6knkmrnk8y9r2g1xg";
   };
 
   propagatedBuildInputs = [ jre ] ;
-- 
GitLab


From d86866cd678178ead6039ee7a131f2a6c49402bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 16:09:11 -0700
Subject: [PATCH 0062/1085] gitAndTools.gitRemoteGcrypt: 1.0.3 -> 1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

This update was made based on information from https://repology.org/metapackage/git-remote-gcrypt/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt -h’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt --help’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt help’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped --help’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped help’ got 0 exit code
- found 1.1 with grep in /nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1
- directory tree listing: https://gist.github.com/f375e7b41aa0075f2c539d2c32748c12
---
 .../git-and-tools/git-remote-gcrypt/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index 5e41db0e03f..adfdb9a541c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "git-remote-gcrypt-${version}";
-  version = "1.0.3";
+  version = "1.1";
   rev = version;
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "spwhitton";
     repo = "git-remote-gcrypt";
-    sha256 = "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1";
+    sha256 = "0mhz5mqnr35rk7j4wyhp7hzmqgv8r554n9qlm4iw565bz7acvq24";
   };
 
   outputs = [ "out" "man" ];
-- 
GitLab


From 1e295ccaf75cceff8b4949cf785a9b8e253f452f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 16:16:51 -0700
Subject: [PATCH 0063/1085] graphicsmagick: 1.3.28 -> 1.3.29
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/gm help’ got 0 exit code
- ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagick++-config --version’ and found version 1.3.29
- ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagick-config --version’ and found version 1.3.29
- ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagickWand-config --version’ and found version 1.3.29
- found 1.3.29 with grep in /nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29
- directory tree listing: https://gist.github.com/014b06393c82c79d1f5dfeea620b71f3
---
 pkgs/applications/graphics/graphicsmagick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index f086a8f5ba6..4258d91b42a 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -2,14 +2,14 @@
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
 
-let version = "1.3.28"; in
+let version = "1.3.29"; in
 
 stdenv.mkDerivation {
   name = "graphicsmagick-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
-    sha256 = "0jlrrimrajcmwp7llivyj14qnzb1mpqd8vw95dl6zbx5m2lnhall";
+    sha256 = "1m0cc6kpky06lpcipj7rfwc2jbw2igr0jk97zqmw3j1ld5mg93g1";
   };
 
   patches = [
-- 
GitLab


From 369a7e598539887cd5065b39ed38434620dab0a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 16:58:59 -0700
Subject: [PATCH 0064/1085] folly: 2018.04.16.00 -> 2018.04.23.00

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2018.04.23.00 with grep in /nix/store/gdpqjqzr8vyisbqsklghaj7lzbbld8a7-folly-2018.04.23.00
- directory tree listing: https://gist.github.com/07bd48be1a92119ed9366c9d83b6a9d1
---
 pkgs/development/libraries/folly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index d3ba4b88909..17c6f75a59d 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2018.04.16.00";
+  version = "2018.04.23.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "10wivnszpqcbg2hbvfal94lcjw20pjz0d8p0m4qa7i4v4z90q37p";
+    sha256 = "0wfp4pxi71bi3bz3h5jxsvdd5wa8q6wqdgsx0jvyvaiiy7v884sv";
   };
 
   nativeBuildInputs = [ autoreconfHook python pkgconfig ];
-- 
GitLab


From 71594fa9a28a6bf128d5b4041fd6d805aa8d9a32 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 17:41:01 -0700
Subject: [PATCH 0065/1085] acpica-tools: 20180313 -> 20180427
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpibin help’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpidump -h’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpidump --help’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpiexec -h’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpiexec --help’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpihelp help’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpinames -h’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpinames --help’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpixtract -h’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpixtract --help’ got 0 exit code
- directory tree listing: https://gist.github.com/3a2dd151709bad304f81a4c4c7d3715e
---
 pkgs/tools/system/acpica-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
index a8fb57b2fba..f26142260fe 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "acpica-tools-${version}";
-  version = "20180313";
+  version = "20180427";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm";
+    sha256 = "05hczn82dpn7irh8zy9m17hm8r3ngwrbmk69zsldr4k1w3cv40df";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";
-- 
GitLab


From f66a510db8ce6f4012db368052a4154bf42b9b22 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 17:48:52 -0700
Subject: [PATCH 0066/1085] cni-plugins: 0.7.0 -> 0.7.1

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.7.1 with grep in /nix/store/ddh9jrgh4df6s6kj6ywc6clnprfggp75-cni-plugins-0.7.1
- directory tree listing: https://gist.github.com/2260aa864704a4bc411b23f3147315e9
---
 pkgs/applications/networking/cluster/cni/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index 9f6b6fcb7e1..8a006edda6a 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cni-plugins-${version}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = "plugins";
     rev = "v${version}";
-    sha256 = "0m885v76azs7lrk6m6n53rwh0xadwvdcr90h0l3bxpdv87sj2mnf";
+    sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2";
   };
 
   buildInputs = [ go ];
-- 
GitLab


From 24761ef5d4a48be1ddd409db7604b8718fc9de56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 23:08:21 -0700
Subject: [PATCH 0067/1085] atlas: 3.10.2 -> 3.10.3

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.10.3 with grep in /nix/store/bgqampvgm3zdncg3206n7qnvyvl0jipj-atlas-3.10.3
- directory tree listing: https://gist.github.com/a7dd287df10b13796423e3c2df0850eb
---
 pkgs/development/libraries/science/math/atlas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 8cca5565bf6..8b740bdb6f6 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -47,7 +47,7 @@ let
   inherit (stdenv.lib) optional optionalString;
   # Don't upgrade until https://github.com/math-atlas/math-atlas/issues/44
   # is resolved.
-  version = "3.10.2";
+  version = "3.10.3";
 in
 
 stdenv.mkDerivation {
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2";
-    sha256 = "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars";
+    sha256 = "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216";
   };
 
   buildInputs = [ gfortran ];
-- 
GitLab


From d13572817e30bddff97979c93aebc27a7cacb2ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 23:32:00 -0700
Subject: [PATCH 0068/1085] adapta-gtk-theme: 3.93.0.258 -> 3.93.1.1

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

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/5796929fde76fddc1465d9cfbc2ace7b
---
 pkgs/misc/themes/adapta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index c0c67eeb6ab..f524c7d9579 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.93.0.258";
+  version = "3.93.1.1";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "114rryaqr97f7qlwxn3fdspzigxx1jgpsbhypdn265511rsh30hx";
+    sha256 = "00k67qpq62swz7p6dk4g8ak31h97lxyddpyr6xii1jpbygwkk9zc";
   };
 
   preferLocalBuild = true;
-- 
GitLab


From 4c66aa8938ca286cc9e801284d6f531e548f0eaa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 1 May 2018 21:57:17 +0800
Subject: [PATCH 0069/1085] bluez: add tools to output that we were building
 anyway

---
 pkgs/os-specific/linux/bluez/default.nix | 35 ++++++++++++++++--------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index d4595d73d94..bd890068f6d 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -12,24 +12,28 @@ stdenv.mkDerivation rec {
     sha256 = "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k";
   };
 
-  pythonPath = with pythonPackages;
-    [ dbus-python pygobject2 pygobject3 recursivePthLoader ];
+  pythonPath = with pythonPackages; [
+    dbus-python pygobject2 pygobject3 recursivePthLoader
+  ];
 
   buildInputs = [
-    pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython
+    dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython
     readline udev libical
   ];
 
+  nativeBuildInputs = [ pkgconfig ];
+
   outputs = [ "out" "dev" "test" ];
 
   patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ];
 
-  preConfigure = ''
-      substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm
-      substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci "
-    '';
+  postConfigure = ''
+    substituteInPlace tools/hid2hci.rules \
+      --replace /sbin/udevadm ${systemd}/bin/udevadm \
+      --replace "hid2hci " "$out/lib/udev/hid2hci "
+  '';
 
-  configureFlags = [
+  configureFlags = (with stdenv.lib; [
     "--localstatedir=/var"
     "--enable-library"
     "--enable-cups"
@@ -40,8 +44,8 @@ stdenv.mkDerivation rec {
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--with-systemduserunitdir=$(out)/etc/systemd/user"
     "--with-udevdir=$(out)/lib/udev"
-    ] ++ stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]
-    ++ stdenv.lib.optional enableMidi [ "--enable-midi" ];
+    ] ++ optional enableWiimote [ "--enable-wiimote" ]
+      ++ optional enableMidi    [ "--enable-midi" ]);
 
   # Work around `make install' trying to create /var/lib/bluetooth.
   installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
@@ -73,14 +77,21 @@ stdenv.mkDerivation rec {
     # Add extra configuration
     mkdir $out/etc/bluetooth
     ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf
+
+    # Add missing tools, ref https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/bluez
+    for files in `find tools/ -type f -perm -755`; do
+      filename=$(basename $files)
+      install -Dm755 tools/$filename $out/bin/$filename
+    done
   '';
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.bluez.org/;
-    repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;
     description = "Bluetooth support for Linux";
+    homepage = http://www.bluez.org/;
+    license = with licenses; [ gpl2 lgpl21 ];
     platforms = platforms.linux;
+    repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;
   };
 }
-- 
GitLab


From cb9f4f1ae3c98b3628457877365b5751b3865c78 Mon Sep 17 00:00:00 2001
From: Issam Maghni <concatime@users.noreply.github.com>
Date: Sun, 29 Apr 2018 20:34:26 -0400
Subject: [PATCH 0070/1085] pythonPackages.neovim: 0.2.4 -> 0.2.6, gem-neovim &
 gem-msgpack

---
 .../editors/neovim/ruby_provider/Gemfile.lock             | 4 ++--
 pkgs/applications/editors/neovim/ruby_provider/gemset.nix | 8 ++++----
 pkgs/development/python-modules/neovim/default.nix        | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
index 87b011c4f8b..a95ced76371 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
+++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
@@ -1,9 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    msgpack (1.2.2)
+    msgpack (1.2.4)
     multi_json (1.13.1)
-    neovim (0.6.2)
+    neovim (0.7.0)
       msgpack (~> 1.0)
       multi_json (~> 1.0)
 
diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
index aefecbf5ba8..af887161ea6 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
+++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
@@ -2,10 +2,10 @@
   msgpack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ai0sfdv9jnr333fsvkn7a8vqvn0iwiw83yj603a3i68ds1x6di1";
+      sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.2.4";
   };
   multi_json = {
     source = {
@@ -19,9 +19,9 @@
     dependencies = ["msgpack" "multi_json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15r3j9bwlpm1ry7cp6059xb0irvsvvlmw53i28z6sf2khwfj5j53";
+      sha256 = "0b487dzz41im8cwzvfjqgf8kkrp6mpkvcbzhazrmqqw8gxyvfbq4";
       type = "gem";
     };
-    version = "0.6.2";
+    version = "0.7.0";
   };
 }
diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/neovim/default.nix
index 646a8e7bb11..6d96732cbb0 100644
--- a/pkgs/development/python-modules/neovim/default.nix
+++ b/pkgs/development/python-modules/neovim/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "neovim";
-  version = "0.2.4";
+  version = "0.2.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0accfgyvihs08bwapgakx6w93p4vbrq2448n2z6gw88m2hja9jm3";
+    sha256 = "0xlj54w9bnmq4vidk6r08hwa6az7drahi08w1qf4j9q45rs8mrbc";
   };
 
   checkInputs = [ nose ];
-- 
GitLab


From 9b99738c84dfc5a66ec4e9aee1a30afc580a3cb8 Mon Sep 17 00:00:00 2001
From: goibhniu <cillian.deroiste@gmail.com>
Date: Wed, 2 May 2018 15:03:39 +0200
Subject: [PATCH 0071/1085] tbs: override the kernel dvb-core.ko and
 videodev.ko

Otherwise the kernel versions of dvb-core.ko and videodev.ko get
loaded instead of the versions from this package.
---
 pkgs/os-specific/linux/tbs/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix
index db20a7ab821..291666c0b45 100644
--- a/pkgs/os-specific/linux/tbs/default.nix
+++ b/pkgs/os-specific/linux/tbs/default.nix
@@ -43,16 +43,21 @@ in stdenv.mkDerivation {
   buildFlags = [ "VER=${kernel.modDirVersion}" ];
   installFlags = [ "DESTDIR=$(out)" ];
 
-  hardeningDisable = [ "pic" "format" ];
+  hardeningDisable = [ "all" ];
 
   nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ]
-  ++ lib.optional (lib.versionAtLeast kernel.version "4.14") [ libelf ];
+  ++ kernel.moduleBuildDependencies;
+
+   postInstall = ''
+    xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/media/dvb-core/dvb-core.ko
+    xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/media/v4l2-core/videodev.ko
+  '';
 
   meta = with lib; {
     homepage = https://www.tbsdtv.com/;
     description = "Linux driver for TBSDTV cards";
     license = licenses.gpl2;
     maintainers = with maintainers; [ ck3d ];
-    priority = 20;
+    priority = -1;
   };
 }
-- 
GitLab


From 6846c45eed8fa48e5df175a1253cdd167e446834 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 2 May 2018 17:29:18 +0300
Subject: [PATCH 0072/1085] cjdns: 20.1 -> 20.2

---
 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 817da08c05e..60fd42962fb 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }:
 
-let version = "20.1"; in
+let version = "20.2"; in
 stdenv.mkDerivation {
   name = "cjdns-"+version;
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     owner = "cjdelisle";
     repo = "cjdns";
     rev = "cjdns-v${version}";
-    sha256 = "033q8av46y0q8vxyqvb4yjh1lz6a17mmk8lhdpwdcqnsws8xjjsw";
+    sha256 = "13zhcfwx8c3vdcf6ifivrgf8q7mgx00vnxcspdz88zk7dh65c6jn";
   };
 
   buildInputs = [ which python27 nodejs ] ++
-- 
GitLab


From 659363fb401a9916f8aa92f297f96c0584432dc7 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Wed, 2 May 2018 18:32:50 +0200
Subject: [PATCH 0073/1085] gcc8: init at 8.1.0

---
 pkgs/development/compilers/gcc/8/default.nix  | 525 ++++++++++++++++++
 .../compilers/gcc/8/riscv-no-relax.patch      | 109 ++++
 .../gcc/8/riscv-pthread-reentrant.patch       |  13 +
 3 files changed, 647 insertions(+)
 create mode 100644 pkgs/development/compilers/gcc/8/default.nix
 create mode 100644 pkgs/development/compilers/gcc/8/riscv-no-relax.patch
 create mode 100644 pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
new file mode 100644
index 00000000000..d5e15287db0
--- /dev/null
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -0,0 +1,525 @@
+{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+, langC ? true, langCC ? true, langFortran ? false
+, langObjC ? targetPlatform.isDarwin
+, langObjCpp ? targetPlatform.isDarwin
+, langJava ? 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
+, enableMultilib ? false
+, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
+, name ? "gcc"
+, libcCross ? null
+, crossStageStatic ? false
+, libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
+, stripped ? true
+, gnused ? null
+, 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
+                       && zlib != null && boehmgc != null
+                       && perl != null;  # for `--enable-java-home'
+
+# LTO needs libelf and zlib.
+assert libelf != null -> zlib != null;
+
+# Make sure we get GNU sed.
+assert hostPlatform.isDarwin -> gnused != null;
+
+# The go frontend is written in c++
+assert langGo -> langCC;
+
+with stdenv.lib;
+with builtins;
+
+let version = "8.1.0";
+
+    # Whether building a cross-compiler for GNU/Hurd.
+    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
+
+    enableParallelBuilding = true;
+
+    patches =
+      [ # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html
+        /* ./riscv-pthread-reentrant.patch */ # TODO: is this needed?
+        # https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html
+        /* ./riscv-no-relax.patch */
+      ]
+      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
+      ++ optional noSysDirs ../no-sys-dirs.patch
+      /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
+        url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
+        sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs";
+      }) */
+      ++ 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 = targetPlatform.platform.gcc.arch or null;
+        gccCpu = targetPlatform.platform.gcc.cpu or null;
+        gccAbi = targetPlatform.platform.gcc.abi or null;
+        gccFpu = targetPlatform.platform.gcc.fpu or null;
+        gccFloat = targetPlatform.platform.gcc.float or null;
+        gccMode = targetPlatform.platform.gcc.mode or null;
+      in
+        optional (gccArch != null) "--with-arch=${gccArch}" ++
+        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
+        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
+        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
+        optional (gccFloat != null) "--with-float=${gccFloat}" ++
+        optional (gccMode != null) "--with-mode=${gccMode}";
+
+    /* Cross-gcc settings (build == host != target) */
+    crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
+    crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
+    crossConfigureFlags =
+      # Ensure that -print-prog-name is able to find the correct programs.
+      [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
+        "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.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
+        # maybe only needed on musl, PATH_MAX
+        # https://github.com/richfelker/musl-cross-make/blob/0867cdf300618d1e3e87a0a939fa4427207ad9d7/litecross/Makefile#L62
+        "--disable-libmpx"
+      ] else [
+        (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
+         else                "--with-headers=${getDev libcCross}/include")
+        "--enable-__cxa_atexit"
+        "--enable-long-long"
+      ] ++
+        (if crossMingw then [
+          "--enable-threads=win32"
+          "--enable-sjlj-exceptions"
+          "--enable-hash-synchronization"
+          "--enable-libssp"
+          "--disable-nls"
+          "--with-dwarf2"
+          # To keep ABI compatibility with upstream mingw-w64
+          "--enable-fully-dynamic-string"
+        ] else
+          optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
+            # 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"
+            # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
+            "--disable-libmpx"
+          ] ++ [
+          "--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 targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+
+    bootstrap = targetPlatform == hostPlatform;
+
+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.xz";
+    /* sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43"; */
+    sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x";
+  };
+
+  inherit patches;
+
+  outputs = [ "out" "lib" "man" "info" ];
+  setOutputFlags = false;
+  NIX_NO_SELF_RPATH = true;
+
+  libc_dev = stdenv.cc.libc_dev;
+
+  hardeningDisable = [ "format" ];
+
+  # This should kill all the stdinc frameworks that gcc and friends like to
+  # insert into default search paths.
+  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+    substituteInPlace gcc/config/darwin-c.c \
+      --replace 'if (stdinc)' 'if (0)'
+
+    substituteInPlace libgcc/config/t-slibgcc-darwin \
+      --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)"
+
+    substituteInPlace libgfortran/configure \
+      --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
+  '';
+
+  postPatch = ''
+    configureScripts=$(find . -name configure)
+    for configureScript in $configureScripts; do
+      patchShebangs $configureScript
+    done
+  '' + (
+    if (hostPlatform.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 targetPlatform != hostPlatform || 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', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..."
+           for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
+           do
+             grep -q _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' \
+                 -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
+           done
+        ''
+        + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+        ''
+            sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
+        ''
+        )
+    else "");
+
+  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
+  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
+  inherit noSysDirs staticCompiler langJava
+    libcCross crossMingw;
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ texinfo which gettext ]
+    ++ (optional (perl != null) perl)
+    ++ (optional javaAwtGtk pkgconfig);
+
+  # For building runtime libs
+  depsBuildTarget =
+    if hostPlatform == buildPlatform then [
+      targetPackages.stdenv.cc.bintools # newly-built gcc will be used
+    ] else assert targetPlatform == hostPlatform; [ # build != host == target
+      stdenv.cc
+    ];
+
+  buildInputs = [
+    gmp mpfr libmpc libelf
+    targetPackages.stdenv.cc.bintools # For linking code at run-time
+  ] ++ (optional (isl != null) isl)
+    ++ (optional (zlib != null) zlib)
+    ++ (optionals langJava [ boehmgc zip unzip ])
+    ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
+    ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
+
+    # 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 hostPlatform.isDarwin gnused)
+    ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
+    ;
+
+  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
+
+  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"
+    export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
+  '';
+
+  dontDisableStatic = true;
+
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
+  configureFlags =
+    # Basic dependencies
+    [
+      "--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}"
+    ] ++
+    optional (libelf != null) "--with-libelf=${libelf}" ++
+    optional (!(crossMingw && crossStageStatic))
+      "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+
+    # Basic configuration
+    [
+      "--enable-lto"
+      "--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 langGo       "go"
+          ++ optional langObjC     "objc"
+          ++ optional langObjCpp   "obj-c++"
+          ++ optionals crossDarwin [ "objc" "obj-c++" ]
+          )
+        )
+      }"
+    ] ++
+
+    (if enableMultilib
+      then ["--enable-multilib" "--disable-libquadmath"]
+      else ["--disable-multilib"]) ++
+    optional (!enableShared) "--disable-shared" ++
+    (if enablePlugin
+      then ["--enable-plugin"]
+      else ["--disable-plugin"]) ++
+
+    # Optional features
+    optional (isl != null) "--with-isl=${isl}" ++
+
+    # Java options
+    optionals langJava [
+      "--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"
+    ] ++
+    optional javaAwtGtk "--enable-java-awt=gtk" ++
+    optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
+
+
+    platformFlags ++
+    optional (targetPlatform != hostPlatform) crossConfigureFlags ++
+    optional (!bootstrap) "--disable-bootstrap" ++
+
+    # Platform-specific flags
+    optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
+    optionals hostPlatform.isSunOS [
+      "--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"
+    ]
+    ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+  ;
+
+  targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
+
+  buildFlags =
+    optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+
+  installTargets =
+    if stripped
+    then "install-strip"
+    else "install";
+
+  /* For cross-built gcc (build != host == target) */
+  crossAttrs = {
+    dontStrip = true;
+    buildFlags = "";
+  };
+
+  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
+
+  # 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.
+  #
+  # Cross-compiling, we need gcc not to read ./specs in order to build the g++
+  # compiler (after the specs for the cross-gcc are created). Having
+  # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks.
+
+  CPATH = optionals (targetPlatform == hostPlatform) (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 = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([]
+    ++ optional (zlib != null) zlib
+    ++ optional langJava boehmgc
+    ++ optionals javaAwtGtk xlibs
+    ++ optionals javaAwtGtk [ gmp mpfr ]
+    ++ optional (libpthread != null) libpthread)
+  );
+
+  EXTRA_TARGET_FLAGS = optionals
+    (targetPlatform != hostPlatform && libcCross != null)
+    ([
+      "-idirafter ${getDev libcCross}/include"
+    ] ++ optionals (! crossStageStatic) [
+      "-B${libcCross.out}/lib"
+    ]);
+
+  EXTRA_TARGET_LDFLAGS = optionals
+    (targetPlatform != hostPlatform && libcCross != null)
+    ([
+      "-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}"
+    ]);
+
+  passthru =
+    { inherit langC langCC langObjC langObjCpp langFortran 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; [ ];
+
+    platforms =
+      stdenv.lib.platforms.linux ++
+      stdenv.lib.platforms.freebsd ++
+      stdenv.lib.platforms.darwin;
+  };
+}
+
+// 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 targetPlatform != hostPlatform)
+// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; }
+
+// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
+)
diff --git a/pkgs/development/compilers/gcc/8/riscv-no-relax.patch b/pkgs/development/compilers/gcc/8/riscv-no-relax.patch
new file mode 100644
index 00000000000..93d9cd1d60f
--- /dev/null
+++ b/pkgs/development/compilers/gcc/8/riscv-no-relax.patch
@@ -0,0 +1,109 @@
+commit e7c570f37384d824cb9725f237920e9691e57269
+gpg: Signature made Tue 06 Mar 2018 04:52:46 PM PST
+gpg:                using RSA key 00CE76D1834960DFCE886DF8EF4CA1502CCBAB41
+gpg:                issuer "palmer@dabbelt.com"
+gpg: Good signature from "Palmer Dabbelt <palmer@dabbelt.com>" [ultimate]
+gpg:                 aka "Palmer Dabbelt <palmer@sifive.com>" [ultimate]
+Author: Palmer Dabbelt <palmer@sifive.com>
+Date:   Thu Mar 1 12:01:06 2018 -0800
+
+    RISC-V: Add and document the "-mno-relax" option
+
+    RISC-V relies on aggressive linker relaxation to get good code size.  As
+    a result no text symbol addresses can be known until link time, which
+    means that alignment must be handled during the link.  This alignment
+    pass is essentially just another linker relaxation, so this has the
+    unfortunate side effect that linker relaxation is required for
+    correctness on many RISC-V targets.
+
+    The RISC-V assembler has supported an ".option norelax" for a long time
+    because there are situations in which linker relaxation is a bad idea --
+    the canonical example is when trying to materialize the initial value of
+    the global pointer into a register, which would otherwise be relaxed to
+    a NOP.  We've been relying on users who want to disable relaxation for
+    an entire link to pass "-Wl,--no-relax", but that still relies on the
+    linker relaxing R_RISCV_ALIGN to handle alignment despite it not being
+    strictly necessary.
+
+    This patch adds a GCC option, "-mno-relax", that disable linker
+    relaxation by adding ".option norelax" to the top of every generated
+    assembly file.  The assembler is smart enough to handle alignment at
+    assemble time for files that have never emitted a relaxable relocation,
+    so this is sufficient to really disable all relaxations in the linker,
+    which results in significantly faster link times for large objects.
+
+    This also has the side effect of allowing toolchains that don't support
+    linker relaxation (LLVM and the Linux module loader) to function
+    correctly.  Toolchains that don't support linker relaxation should
+    default to "-mno-relax" and error when presented with any R_RISCV_ALIGN
+    relocation as those need to be handled for correctness.
+
+    gcc/ChangeLog
+
+    2018-03-01  Palmer Dabbelt  <palmer@sifive.com>
+
+            * config/riscv/riscv.opt (mrelax): New option.
+            * config/riscv/riscv.c (riscv_file_start): Emit ".option
+            "norelax" when riscv_mrelax is disabled.
+            * doc/invoke.texi (RISC-V): Document "-mrelax" and "-mno-relax".
+
+diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
+index c38f6c394d54..3e81874de232 100644
+--- a/gcc/config/riscv/riscv.c
++++ b/gcc/config/riscv/riscv.c
+@@ -3979,6 +3979,11 @@ riscv_file_start (void)
+
+   /* Instruct GAS to generate position-[in]dependent code.  */
+   fprintf (asm_out_file, "\t.option %spic\n", (flag_pic ? "" : "no"));
++
++  /* If the user specifies "-mno-relax" on the command line then disable linker
++     relaxation in the assembler.  */
++  if (! riscv_mrelax)
++    fprintf (asm_out_file, "\t.option norelax\n");
+ }
+
+ /* Implement TARGET_ASM_OUTPUT_MI_THUNK.  Generate rtl rather than asm text
+diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt
+index 581a26bb5c1e..b37ac75d9bb4 100644
+--- a/gcc/config/riscv/riscv.opt
++++ b/gcc/config/riscv/riscv.opt
+@@ -106,6 +106,11 @@ mexplicit-relocs
+ Target Report Mask(EXPLICIT_RELOCS)
+ Use %reloc() operators, rather than assembly macros, to load addresses.
+
++mrelax
++Target Bool Var(riscv_mrelax) Init(1)
++Take advantage of linker relaxations to reduce the number of instructions
++required to materialize symbol addresses.
++
+ Mask(64BIT)
+
+ Mask(MUL)
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index 8d366c626bae..deb48af2ecad 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -1042,7 +1042,8 @@ See RS/6000 and PowerPC Options.
+ -msave-restore  -mno-save-restore @gol
+ -mstrict-align -mno-strict-align @gol
+ -mcmodel=medlow -mcmodel=medany @gol
+--mexplicit-relocs  -mno-explicit-relocs @gol}
++-mexplicit-relocs  -mno-explicit-relocs @gol
++-mrelax -mno-relax @gol}
+
+ @emph{RL78 Options}
+ @gccoptlist{-msim  -mmul=none  -mmul=g13  -mmul=g14  -mallregs @gol
+@@ -23102,6 +23103,12 @@ Use or do not use assembler relocation operators when dealing with symbolic
+ addresses.  The alternative is to use assembler macros instead, which may
+ limit optimization.
+
++@item -mrelax
++@itemx -mno-relax
++Take advantage of linker relaxations to reduce the number of instructions
++required to materialize symbol addresses. The default is to take advantage of
++linker relaxations.
++
+ @end table
+
+ @node RL78 Options
+
diff --git a/pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch b/pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch
new file mode 100644
index 00000000000..c7527ffb2b1
--- /dev/null
+++ b/pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch
@@ -0,0 +1,13 @@
+Index: gcc/config/riscv/linux.h
+===================================================================
+--- a/gcc/config/riscv/linux.h	(revision 257620)
++++ b/gcc/config/riscv/linux.h	(revision 257621)
+@@ -47,6 +47,8 @@
+ 
+ #define ICACHE_FLUSH_FUNC "__riscv_flush_icache"
+ 
++#define CPP_SPEC "%{pthread:-D_REENTRANT}"
++
+ #define LINK_SPEC "\
+ -melf" XLEN_SPEC "lriscv \
+ %{shared} \
-- 
GitLab


From 736dab4a681d9ff5e18ab4e47ed0c85303819b52 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Wed, 2 May 2018 18:43:06 +0200
Subject: [PATCH 0074/1085] gcc8: register to all-packages

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a405a6785fe..e994da03909 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6243,6 +6243,17 @@ with pkgs;
     isl = if !stdenv.isDarwin then isl_0_17 else null;
   }));
 
+  gcc8 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/8 {
+    inherit noSysDirs;
+
+    # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
+    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+
+    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 728eb27618990cb558a88f5779eb91a25b3e1a3f Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Wed, 2 May 2018 18:52:50 +0200
Subject: [PATCH 0075/1085] gcc8: added myself as maintainer

---
 pkgs/development/compilers/gcc/8/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index d5e15287db0..ea7b98efcc8 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -504,7 +504,7 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ ];
+    maintainers = with stdenv.lib.maintainers; [ synthetica ];
 
     platforms =
       stdenv.lib.platforms.linux ++
-- 
GitLab


From d0708a30c4fa2ea612148fdf5bfe9618b8040eb6 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Wed, 2 May 2018 20:51:01 +0200
Subject: [PATCH 0076/1085] gcc8: removed merged patches

Log:
```
patching sources
applying patch /nix/store/6m27y27zvzsjn1ir4y8mm9nc9xnh2sgx-riscv-no-relax.patch
patching file gcc/config/riscv/riscv.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file gcc/config/riscv/riscv.c.rej
patching file gcc/config/riscv/riscv.opt
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file gcc/config/riscv/riscv.opt.rej
patching file gcc/doc/invoke.texi
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
```
---
 pkgs/development/compilers/gcc/8/default.nix  |   7 +-
 .../compilers/gcc/8/riscv-no-relax.patch      | 109 ------------------
 .../gcc/8/riscv-pthread-reentrant.patch       |  13 ---
 3 files changed, 1 insertion(+), 128 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/8/riscv-no-relax.patch
 delete mode 100644 pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index ea7b98efcc8..9294985d99c 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -57,12 +57,7 @@ let version = "8.1.0";
     enableParallelBuilding = true;
 
     patches =
-      [ # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html
-        /* ./riscv-pthread-reentrant.patch */ # TODO: is this needed?
-        # https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html
-        /* ./riscv-no-relax.patch */
-      ]
-      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
+         optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
         url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
diff --git a/pkgs/development/compilers/gcc/8/riscv-no-relax.patch b/pkgs/development/compilers/gcc/8/riscv-no-relax.patch
deleted file mode 100644
index 93d9cd1d60f..00000000000
--- a/pkgs/development/compilers/gcc/8/riscv-no-relax.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-commit e7c570f37384d824cb9725f237920e9691e57269
-gpg: Signature made Tue 06 Mar 2018 04:52:46 PM PST
-gpg:                using RSA key 00CE76D1834960DFCE886DF8EF4CA1502CCBAB41
-gpg:                issuer "palmer@dabbelt.com"
-gpg: Good signature from "Palmer Dabbelt <palmer@dabbelt.com>" [ultimate]
-gpg:                 aka "Palmer Dabbelt <palmer@sifive.com>" [ultimate]
-Author: Palmer Dabbelt <palmer@sifive.com>
-Date:   Thu Mar 1 12:01:06 2018 -0800
-
-    RISC-V: Add and document the "-mno-relax" option
-
-    RISC-V relies on aggressive linker relaxation to get good code size.  As
-    a result no text symbol addresses can be known until link time, which
-    means that alignment must be handled during the link.  This alignment
-    pass is essentially just another linker relaxation, so this has the
-    unfortunate side effect that linker relaxation is required for
-    correctness on many RISC-V targets.
-
-    The RISC-V assembler has supported an ".option norelax" for a long time
-    because there are situations in which linker relaxation is a bad idea --
-    the canonical example is when trying to materialize the initial value of
-    the global pointer into a register, which would otherwise be relaxed to
-    a NOP.  We've been relying on users who want to disable relaxation for
-    an entire link to pass "-Wl,--no-relax", but that still relies on the
-    linker relaxing R_RISCV_ALIGN to handle alignment despite it not being
-    strictly necessary.
-
-    This patch adds a GCC option, "-mno-relax", that disable linker
-    relaxation by adding ".option norelax" to the top of every generated
-    assembly file.  The assembler is smart enough to handle alignment at
-    assemble time for files that have never emitted a relaxable relocation,
-    so this is sufficient to really disable all relaxations in the linker,
-    which results in significantly faster link times for large objects.
-
-    This also has the side effect of allowing toolchains that don't support
-    linker relaxation (LLVM and the Linux module loader) to function
-    correctly.  Toolchains that don't support linker relaxation should
-    default to "-mno-relax" and error when presented with any R_RISCV_ALIGN
-    relocation as those need to be handled for correctness.
-
-    gcc/ChangeLog
-
-    2018-03-01  Palmer Dabbelt  <palmer@sifive.com>
-
-            * config/riscv/riscv.opt (mrelax): New option.
-            * config/riscv/riscv.c (riscv_file_start): Emit ".option
-            "norelax" when riscv_mrelax is disabled.
-            * doc/invoke.texi (RISC-V): Document "-mrelax" and "-mno-relax".
-
-diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
-index c38f6c394d54..3e81874de232 100644
---- a/gcc/config/riscv/riscv.c
-+++ b/gcc/config/riscv/riscv.c
-@@ -3979,6 +3979,11 @@ riscv_file_start (void)
-
-   /* Instruct GAS to generate position-[in]dependent code.  */
-   fprintf (asm_out_file, "\t.option %spic\n", (flag_pic ? "" : "no"));
-+
-+  /* If the user specifies "-mno-relax" on the command line then disable linker
-+     relaxation in the assembler.  */
-+  if (! riscv_mrelax)
-+    fprintf (asm_out_file, "\t.option norelax\n");
- }
-
- /* Implement TARGET_ASM_OUTPUT_MI_THUNK.  Generate rtl rather than asm text
-diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt
-index 581a26bb5c1e..b37ac75d9bb4 100644
---- a/gcc/config/riscv/riscv.opt
-+++ b/gcc/config/riscv/riscv.opt
-@@ -106,6 +106,11 @@ mexplicit-relocs
- Target Report Mask(EXPLICIT_RELOCS)
- Use %reloc() operators, rather than assembly macros, to load addresses.
-
-+mrelax
-+Target Bool Var(riscv_mrelax) Init(1)
-+Take advantage of linker relaxations to reduce the number of instructions
-+required to materialize symbol addresses.
-+
- Mask(64BIT)
-
- Mask(MUL)
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 8d366c626bae..deb48af2ecad 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -1042,7 +1042,8 @@ See RS/6000 and PowerPC Options.
- -msave-restore  -mno-save-restore @gol
- -mstrict-align -mno-strict-align @gol
- -mcmodel=medlow -mcmodel=medany @gol
---mexplicit-relocs  -mno-explicit-relocs @gol}
-+-mexplicit-relocs  -mno-explicit-relocs @gol
-+-mrelax -mno-relax @gol}
-
- @emph{RL78 Options}
- @gccoptlist{-msim  -mmul=none  -mmul=g13  -mmul=g14  -mallregs @gol
-@@ -23102,6 +23103,12 @@ Use or do not use assembler relocation operators when dealing with symbolic
- addresses.  The alternative is to use assembler macros instead, which may
- limit optimization.
-
-+@item -mrelax
-+@itemx -mno-relax
-+Take advantage of linker relaxations to reduce the number of instructions
-+required to materialize symbol addresses. The default is to take advantage of
-+linker relaxations.
-+
- @end table
-
- @node RL78 Options
-
diff --git a/pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch b/pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch
deleted file mode 100644
index c7527ffb2b1..00000000000
--- a/pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc/config/riscv/linux.h
-===================================================================
---- a/gcc/config/riscv/linux.h	(revision 257620)
-+++ b/gcc/config/riscv/linux.h	(revision 257621)
-@@ -47,6 +47,8 @@
- 
- #define ICACHE_FLUSH_FUNC "__riscv_flush_icache"
- 
-+#define CPP_SPEC "%{pthread:-D_REENTRANT}"
-+
- #define LINK_SPEC "\
- -melf" XLEN_SPEC "lriscv \
- %{shared} \
-- 
GitLab


From c7a6b3665896a5bf62c39e35a73988058f0c026f Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Wed, 2 May 2018 20:53:13 +0200
Subject: [PATCH 0077/1085] gcc8: removed commented gcc7 hash

---
 pkgs/development/compilers/gcc/8/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 9294985d99c..15b8b99c82f 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -183,7 +183,6 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
-    /* sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43"; */
     sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x";
   };
 
-- 
GitLab


From 48e44490e907d0bf978e7cf5188a5bdfcca44fc9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 2 May 2018 14:19:28 -0500
Subject: [PATCH 0078/1085] add cc-wrapper test variants for gcc7, gcc8, add to
 release.nix

---
 pkgs/top-level/all-packages.nix | 3 +++
 pkgs/top-level/release.nix      | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e994da03909..35af7305184 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6086,6 +6086,7 @@ with pkgs;
   };
 
   gcc7Stdenv = overrideCC gccStdenv gcc7;
+  gcc8Stdenv = overrideCC gccStdenv gcc8;
 
   wrapCCMulti = cc:
     if system == "x86_64-linux" then let
@@ -21390,6 +21391,8 @@ with pkgs;
   tests = recurseIntoAttrs {
     cc-wrapper = callPackage ../test/cc-wrapper { };
     cc-wrapper-gcc = callPackage ../test/cc-wrapper { stdenv = gccStdenv; };
+    cc-wrapper-gcc7 = callPackage ../test/cc-wrapper { stdenv = gcc7Stdenv; };
+    cc-wrapper-gcc8 = callPackage ../test/cc-wrapper { stdenv = gcc8Stdenv; };
     cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; };
     cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; };
     cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 3ea873cdc7f..5233051cad8 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -107,6 +107,10 @@ let
 
               jobs.tests.cc-wrapper.x86_64-linux
               jobs.tests.cc-wrapper.x86_64-darwin
+              jobs.tests.cc-wrapper-gcc7.x86_64-linux
+              jobs.tests.cc-wrapper-gcc7.x86_64-darwin
+              jobs.tests.cc-wrapper-gcc8.x86_64-linux
+              jobs.tests.cc-wrapper-gcc8.x86_64-darwin
               jobs.tests.cc-wrapper-clang.x86_64-linux
               jobs.tests.cc-wrapper-clang.x86_64-darwin
               jobs.tests.cc-wrapper-libcxx.x86_64-linux
-- 
GitLab


From 5794d941362df79071ffc3155a0a6fabc5051b7e Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Wed, 2 May 2018 22:31:58 +0200
Subject: [PATCH 0079/1085] gcc8: made the remove-selftests patch more robust,
 removed old hash

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

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 15b8b99c82f..00b3f944713 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -60,8 +60,8 @@ let version = "8.1.0";
          optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
-        url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
-        sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs";
+        url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
+        sha256 = ""; # TODO: uncomment and check hash when available.
       }) */
       ++ optional langFortran ../gfortran-driving.patch;
 
-- 
GitLab


From c7b21cd1911f880630102996b54956d19c974295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Wed, 2 May 2018 22:35:15 +0200
Subject: [PATCH 0080/1085] epeg: init at 0.9.1.042
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
---
 pkgs/applications/graphics/epeg/default.nix | 31 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/graphics/epeg/default.nix

diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix
new file mode 100644
index 00000000000..02528a43e31
--- /dev/null
+++ b/pkgs/applications/graphics/epeg/default.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake
+, libjpeg, libexif
+}:
+
+stdenv.mkDerivation rec {
+  name = "epeg-0.9.1.042"; # version taken from configure.ac
+
+  src = fetchFromGitHub {
+    owner = "mattes";
+    repo = "epeg";
+    rev = "248ae9fc3f1d6d06e6062a1f7bf5df77d4f7de9b";
+    sha256 = "14ad33w3pxrg2yfc2xzyvwyvjirwy2d00889dswisq8b84cmxfia";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ pkgconfig libtool autoconf automake ];
+
+  propagatedBuildInputs = [ libjpeg libexif ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mattes/epeg;
+    description = "Insanely fast JPEG/ JPG thumbnail scaling";
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ nh2 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c4e2e09a8..fcc6967b08f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15571,6 +15571,8 @@ with pkgs;
 
   epdfview = callPackage ../applications/misc/epdfview { };
 
+  epeg = callPackage ../applications/graphics/epeg/default.nix { };
+
   inherit (gnome3) epiphany;
 
   epic5 = callPackage ../applications/networking/irc/epic5 { };
-- 
GitLab


From 2cbaa1632691feadc0da66fd03f37b7f05bb58a6 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Wed, 2 May 2018 21:54:49 +0100
Subject: [PATCH 0081/1085] mono: create mono4 & mono5 aliases and fix
 gtk-sharp/pdfmod builds

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b20cf36a05f..1320f472186 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4286,7 +4286,7 @@ with pkgs;
 
   fmodex = callPackage ../games/zandronum/fmod.nix { };
 
-  pdfmod = callPackage ../applications/misc/pdfmod { };
+  pdfmod = callPackage ../applications/misc/pdfmod { mono = mono4; };
 
   pdf-quench = callPackage ../applications/misc/pdf-quench { };
 
@@ -6712,7 +6712,9 @@ with pkgs;
 
   mlton = callPackage ../development/compilers/mlton { };
 
-  mono = mono58;
+  mono  = mono5;
+  mono5 = mono58;
+  mono4 = mono48;
 
   mono40 = lowPrio (callPackage ../development/compilers/mono/4.0.nix {
     inherit (darwin) libobjc;
@@ -9287,7 +9289,7 @@ with pkgs;
 
   gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
 
-  gnome-sharp = callPackage ../development/libraries/gnome-sharp {};
+  gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; };
 
   granite = callPackage ../development/libraries/granite { };
   elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { };
@@ -9421,7 +9423,7 @@ with pkgs;
 
   hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
 
-  hyena = callPackage ../development/libraries/hyena { };
+  hyena = callPackage ../development/libraries/hyena { mono = mono4; };
 
   icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({
     nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; };
-- 
GitLab


From 8b4d3ed1ef94ef08f654d50451e10fbc7a69b390 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 16:12:39 -0700
Subject: [PATCH 0082/1085] groonga: 8.0.1 -> 8.0.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga-suggest-create-dataset -h’ got 0 exit code
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga-suggest-create-dataset --help’ got 0 exit code
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga -h’ got 0 exit code
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga --help’ got 0 exit code
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga-httpd -h’ got 0 exit code
- found 8.0.2 with grep in /nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2
- directory tree listing: https://gist.github.com/9a3a3eb436d26334ce117be25e74b45c
---
 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 063ad8c3f57..a4b2418f58c 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 = "8.0.1";
+  version = "8.0.2";
 
   src = fetchurl {
     url    = "http://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "074r71dcv1l8rm6an7b8iyfpcxbk00iysmzszssknqg8mrqvsphg";
+    sha256 = "0bsf4dbgbddij49xg6d6kl9kb1m5ywdyc1w1xz2giisqk1hdwsz4";
   };
 
   buildInputs = with stdenv.lib;
-- 
GitLab


From 12b78da1967df6761aeceb346c94ca0931d11014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 2 May 2018 21:09:14 -0300
Subject: [PATCH 0083/1085] terminology: 1.1.1 -> 1.2.0

- Update to version 1.2.0
- Switch build tools from autotools to meson
---
 pkgs/desktops/enlightenment/terminology.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 3a52707fcf4..1a15092c7e7 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
-    sha256 = "05ncxvzb9rzkyjvd95hzn8lswqdwr8cix6rd54nqn9559jibh4ns";
+    sha256 = "0kw34l5lahn1qaks3ah6x8k41d6hfywpqfak2p7qq1z87zj506mx";
   };
 
   nativeBuildInputs = [
+    meson
+    ninja
     (pkgconfig.override { vanilla = true; })
     makeWrapper
   ];
@@ -17,11 +19,12 @@ stdenv.mkDerivation rec {
   buildInputs = [
     efl
     pcre
+    mesa_noglu
   ];
 
   meta = {
-    description = "The best terminal emulator written with the EFL";
-    homepage = http://enlightenment.org/;
+    description = "Powerful terminal emulator based on EFL";
+    homepage = https://www.enlightenment.org/about-terminology;
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.bsd2;
     maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
-- 
GitLab


From 89b1eaa92b836628e8c8b7c5c0c19c51e6e14abb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 17:30:02 -0700
Subject: [PATCH 0084/1085] altcoins.bitcoin-abc: 0.17.0 -> 0.17.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoind -h’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoind --help’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-cli -h’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-cli --help’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-tx -h’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-tx --help’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/test_bitcoin --help’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-qt -h’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-qt --help’ got 0 exit code
- found 0.17.1 with grep in /nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1
- directory tree listing: https://gist.github.com/011ceeb08c6986692052c6b32e5f0577
---
 pkgs/applications/altcoins/bitcoin-abc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index 35488732117..bd365e16730 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "bitcoin-ABC";
     repo = "bitcoin-abc";
     rev = "v${version}";
-    sha256 = "1s2y29h2q4fnbrfg2ig1cd3h7g3kdcdyrfq7znq1ndnh8xj1j489";
+    sha256 = "1kq9n3s9vhkmfaizsyi2cb91ibi06gb6wx0hkcb9hg3nrrvcka3y";
   };
 
   patches = [ ./fix-bitcoin-qt-build.patch ];
-- 
GitLab


From d76ac2707bd0729d73909b7d4f0ef4f4687a7224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 2 May 2018 22:29:46 -0300
Subject: [PATCH 0085/1085] enlightenment: add dependency on mesa_noglu

---
 pkgs/desktops/enlightenment/enlightenment.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 9b782b94f7f..b0fd5f3db2b 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
   xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
-  luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU,
+  luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, mesa_noglu,
   xkeyboard_config, pcre
 }:
 
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
     libpthreadstubs
     gdbm
     pcre
+    mesa_noglu
   ] ++
     stdenv.lib.optionals stdenv.isLinux [ libcap ];
 
-- 
GitLab


From 4680fe67dbe1e24436d2e6030b26af1791ceec30 Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack@jackkelly.name>
Date: Thu, 3 May 2018 12:12:48 +1000
Subject: [PATCH 0086/1085] haskellPackages.blank-canvas: 0.6.3 -> 0.6.2

blank-canvas-0.6.3 depends on base-compat-batteries-0.10, which
depends on base-compat-0.10. This conflicts with the rest of the LTS
set, which uses base-compat-0.9. No base-compat-batteries-0.9 exists.

blank-canvas-0.6.2 only depends on base-compat >= 0.8 && < 0.10.
---
 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 6b18694dc8d..c602d312a3b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2398,6 +2398,7 @@ extra-packages:
   - aws ^>= 0.18                        # pre-lts-11.x versions neeed by git-annex 6.20180227
   - binary > 0.7 && < 0.8               # keep a 7.x major release around for older compilers
   - binary > 0.8 && < 0.9               # keep a 8.x major release around for older compilers
+  - blank-canvas < 0.6.3                # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.*
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.20.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.24.*                     # required for jailbreak-cabal etc.
-- 
GitLab


From ada2fc088cef052eb0071e0c226a7f0bb00bd0b5 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 2 May 2018 17:01:30 +0200
Subject: [PATCH 0087/1085] gcc49: backport retpoline support

To mitigate Spectre Variant 2, GCC needs to have retpoline
support (-mindirect-branch and -mfunction-return arguments on amd64
and i386).

Patches were pulled from H.J. Lu's backport branch to
4.9 (hjl/indirect/gcc-4_9-branch), available at
https://github.com/hjl-tools/gcc/tree/hjl/indirect/gcc-4_9-branch/master. Upstream
GCC does not apply patches to anything older than the
gcc-6-branch. H.J. Lu is the author of the upstream retpoline commits
as well.

Several Linux distributions already backported these patches to GCC 4
branches and some old kernels (3.13 for instance) have been recompiled
with these GCC patches. These kernels only allow to load kernel
modules that are compiled with the retpoline support.

References:
- Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/gcc-4.8/+bug/1749261
- Ubuntu package: https://launchpad.net/ubuntu/+source/gcc-4.8/4.8.4-2ubuntu1~14.04.4

Fixes #38394
---
 pkgs/development/compilers/gcc/4.9/default.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index fb82eee4ab8..fc9e7281250 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, noSysDirs
+{ stdenv, targetPackages, fetchurl, noSysDirs, fetchpatch
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
@@ -65,7 +65,21 @@ let version = "4.9.4";
       ++ optional noSysDirs ../no-sys-dirs.patch
       ++ optional langFortran ../gfortran-driving.patch
       ++ [ ../struct-ucontext.patch ../struct-sigaltstack-4.9.patch ] # glibc-2.26
-      ;
+      # Retpoline patches pulled from the branch hjl/indirect/gcc-4_9-branch (by H.J. Lu, the author of GCC upstream retpoline commits)
+      ++ builtins.map ({commit, sha256}: fetchpatch {url = "https://github.com/hjl-tools/gcc/commit/${commit}.patch"; inherit sha256;})
+         [{ commit = "e623d21608e96ecd6b65f0d06312117d20488a38"; sha256 = "1ix8i4d2r3ygbv7npmsdj790rhxqrnfwcqzv48b090r9c3ij8ay3"; }
+          { commit = "2015a09e332309f12de1dadfe179afa6a29368b8"; sha256 = "0xcfs0cbb63llj2gbcdrvxim79ax4k4aswn0a3yjavxsj71s1n91"; }
+          { commit = "6b11591f4494f705e8746e7d58b7f423191f4e92"; sha256 = "0aydyhsm2ig0khgbp27am7vq7liyqrq6kfhfi2ki0ij0ab1hfbga"; }
+          { commit = "203c7d9c3e9cb0f88816b481ef8e7e87b3ecc373"; sha256 = "0wqn16y7wy5kg8ngfcni5qdwfphl01axczibbk49bxclwnzvldqa"; }
+          { commit = "f039c6f284b2c9ce97c8353d6034978795c4872e"; sha256 = "13fkgdb17lpyxfksz1zanxhgpsm0jrss9w61nbl7an4im22hz7ci"; }
+          { commit = "ed42606bdab1c5d9e5ad828cd6fe1a0557f193b7"; sha256 = "0gdnn8v3p03imj3qga2mzdhpgbmjcklkxdl97jvz5xia2ikzknxm"; }
+          { commit = "5278e062ef292fd2fbf987d25389785f4c5c0f99"; sha256 = "0j81x758wf8v7j4rx5wc1cy7yhkvhlhv3wmnarwakxiwsspq0vrs"; }
+          { commit = "76f1ffbbb6cd9f6ecde6c82cd16e20a27242e890"; sha256 = "1py56y6gp7fjf4f8bbsfwh5bs1gnmlqda1ycsmnwlzfm0cshdp0c"; }
+          { commit = "4ca48b2b688b135c0390f54ea9077ef10aedd52c"; sha256 = "15r019pzr3k0lpgyvdc92c8fayw8b5lrzncna4bqmamcsdz7vsaw"; }
+          { commit = "98c7bf9ddc80db965d69d61521b1c7a1cec32d9a"; sha256 = "1d7pfdv1q23nf0wadw7jbp6d6r7pnzjpbyxgbdfv7j1vr9l1bp60"; }
+          { commit = "3dc76b53ad896494ca62550a7a752fecbca3f7a2"; sha256 = "0jvdzfpvfdmklfcjwqblwq1i22iqis7ljpvm7adra5d7zf2xk7xz"; }
+          { commit = "1e961ed49b18e176c7457f53df2433421387c23b"; sha256 = "04dnqqs4qsvz4g8cq6db5id41kzys7hzhcaycwmc9rpqygs2ajwz"; }
+          { commit = "e137c72d099f9b3b47f4cc718aa11eab14df1a9c"; sha256 = "1ms0dmz74yf6kwgjfs4d2fhj8y6mcp2n184r3jk44wx2xc24vgb2"; }];
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
-- 
GitLab


From d21ff87160cfde2db368622a8044006391cae60a Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Thu, 3 May 2018 13:07:19 +0200
Subject: [PATCH 0088/1085] gcc8: Removed java as a target language

---
 pkgs/development/compilers/gcc/8/default.nix | 67 +++-----------------
 1 file changed, 8 insertions(+), 59 deletions(-)

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 00b3f944713..16636f04982 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -2,23 +2,22 @@
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
-, langJava ? false
 , langGo ? false
 , profiledCompiler ? false
 , staticCompiler ? false
 , enableShared ? true
 , texinfo ? null
-, perl ? null # optional, for texi2pod (then pod2man); required for Java
+, perl ? null # optional, for texi2pod (then pod2man)
 , 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
+, zlib ? 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
+, x11Support ? false
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
@@ -33,10 +32,6 @@
 , buildPackages
 }:
 
-assert langJava     -> zip != null && unzip != null
-                       && zlib != null && boehmgc != null
-                       && perl != null;  # for `--enable-java-home'
-
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
@@ -65,29 +60,11 @@ let version = "8.1.0";
       }) */
       ++ 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 = targetPlatform.platform.gcc.arch or null;
@@ -277,13 +254,12 @@ stdenv.mkDerivation ({
 
   # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
   crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
+  inherit noSysDirs staticCompiler
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ texinfo which gettext ]
-    ++ (optional (perl != null) perl)
-    ++ (optional javaAwtGtk pkgconfig);
+    ++ (optional (perl != null) perl);
 
   # For building runtime libs
   depsBuildTarget =
@@ -298,8 +274,6 @@ stdenv.mkDerivation ({
     targetPackages.stdenv.cc.bintools # For linking code at run-time
   ] ++ (optional (isl != null) isl)
     ++ (optional (zlib != null) zlib)
-    ++ (optionals langJava [ boehmgc zip unzip ])
-    ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
     ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
@@ -351,7 +325,6 @@ stdenv.mkDerivation ({
           (  optional langC        "c"
           ++ optional langCC       "c++"
           ++ optional langFortran  "fortran"
-          ++ optional langJava     "java"
           ++ optional langGo       "go"
           ++ optional langObjC     "objc"
           ++ optional langObjCpp   "obj-c++"
@@ -372,19 +345,6 @@ stdenv.mkDerivation ({
     # Optional features
     optional (isl != null) "--with-isl=${isl}" ++
 
-    # Java options
-    optionals langJava [
-      "--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"
-    ] ++
-    optional javaAwtGtk "--enable-java-awt=gtk" ++
-    optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
-
     platformFlags ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
@@ -421,11 +381,6 @@ stdenv.mkDerivation ({
   # 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.
   #
   # Cross-compiling, we need gcc not to read ./specs in order to build the g++
@@ -434,9 +389,6 @@ stdenv.mkDerivation ({
 
   CPATH = optionals (targetPlatform == hostPlatform) (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
 
@@ -448,9 +400,6 @@ stdenv.mkDerivation ({
 
   LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([]
     ++ optional (zlib != null) zlib
-    ++ optional langJava boehmgc
-    ++ optionals javaAwtGtk xlibs
-    ++ optionals javaAwtGtk [ gmp mpfr ]
     ++ optional (libpthread != null) libpthread)
   );
 
@@ -491,8 +440,8 @@ stdenv.mkDerivation ({
 
     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,...).
+      Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as
+      libraries for these languages (libstdc++, 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.
-- 
GitLab


From 554e296c9fb46de531affb1aea54e5d29830485b Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Thu, 3 May 2018 14:00:17 +0100
Subject: [PATCH 0089/1085] Adding Zabbix agent 3.4 packages

---
 pkgs/servers/monitoring/zabbix/3.4.nix | 40 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/servers/monitoring/zabbix/3.4.nix

diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix
new file mode 100644
index 00000000000..332e139f428
--- /dev/null
+++ b/pkgs/servers/monitoring/zabbix/3.4.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, pcre, libevent, libiconv }:
+
+
+let
+
+  version = "3.4.8";
+  branch = "3.4";
+
+  src = fetchurl {
+    url = "https://netix.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz";
+    sha256 = "cec14993d1ec2c9d8c51f6608c9408620f27174db92edc2347bafa7b841ccc07";
+  };
+
+in
+
+{
+  agent = stdenv.mkDerivation {
+    name = "zabbix-agent-${version}";
+
+    inherit src;
+
+     configureFlags = [
+      "--enable-agent"
+      "--with-libpcre=${pcre.dev}"
+      "--with-iconv=${libiconv}"
+    ];
+    buildInputs = [ pcre libiconv ];
+
+    meta = with stdenv.lib; {
+      inherit branch;
+      description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
+      homepage = http://www.zabbix.com/;
+      license = licenses.gpl2;
+      maintainers = [ maintainers.eelco ];
+      platforms = platforms.linux;
+    };
+  };
+
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c4e2e09a8..00c466d5add 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13002,6 +13002,7 @@ with pkgs;
 
   zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { };
   zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { };
+  zabbix34 = callPackage ../servers/monitoring/zabbix/3.4.nix { };
 
   zipkin = callPackage ../servers/monitoring/zipkin { };
 
-- 
GitLab


From b62788f744225e5ff498059e7c5b9048d31f966d Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Thu, 3 May 2018 13:40:48 +0200
Subject: [PATCH 0090/1085] ledger: enable python command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ledger in nixpkgs currently uses python (it’s in buildInputs), but the
ledger python command isn’t available until you turn it on via a cmake
flag.
---
 pkgs/applications/office/ledger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index bb6e529f5d2..9675293cfe5 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python
-, texinfo, gnused }:
+, texinfo, gnused, usePython ? true }:
 
 stdenv.mkDerivation rec {
   name = "ledger-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
+  cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" (stdenv.lib.optionalString usePython "-DUSE_PYTHON=true") ];
 
   # Skip byte-compiling of emacs-lisp files because this is currently
   # broken in ledger...
-- 
GitLab


From 5b6129f69c689b219ce4b92bae54216b714de819 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Thu, 3 May 2018 15:09:43 +0200
Subject: [PATCH 0091/1085] gcc49: remove darwin support

---
 pkgs/development/compilers/gcc/4.9/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index fc9e7281250..f041252495a 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -496,8 +496,7 @@ stdenv.mkDerivation ({
     platforms =
       stdenv.lib.platforms.linux ++
       stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      stdenv.lib.platforms.illumos;
   };
 }
 
-- 
GitLab


From f99ded298f5b34437395cc739d52042b4dce3580 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Thu, 3 May 2018 16:02:32 +0200
Subject: [PATCH 0092/1085] Ruby: 2.3.6 -> 2.3.7, 2.4.3 -> 2.4.4, 2.5.0 ->
 2.5.1

---
 pkgs/development/interpreters/ruby/default.nix | 18 +++++++++---------
 .../interpreters/ruby/patchsets.nix            |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 4ebc488d998..b98e2c1a673 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -200,26 +200,26 @@ let
 
 in {
   ruby_2_3 = generic {
-    version = rubyVersion "2" "3" "6" "";
+    version = rubyVersion "2" "3" "7" "";
     sha256 = {
-      src = "07jpa7fw1gyf069m7alf2b0zm53qm08w2ns45mhzmvgrg4r528l3";
-      git = "1bk59i0ygdc5z3zz3k6indfrxd2ix55np6rwvkcdpdw8svm749ds";
+      src = "0zvx5kdp1frjs9n95n7ba7dy0alax33wi3nj8034m3ppvnf39k9m";
+      git = "11wbzw2ywwfnvlkg3qjg0as2pzk5zyk63y2iis42d91lg1l2flrk";
     };
   };
 
   ruby_2_4 = generic {
-    version = rubyVersion "2" "4" "3" "";
+    version = rubyVersion "2" "4" "4" "";
     sha256 = {
-      src = "161smb52q19r9lrzy22b3bhnkd0z8wjffm0qsfkml14j5ic7a0zx";
-      git = "0x2lqbqm2rq9j5zh1p72dma56nqvdkfbgzb9wybm4y4hwhiw8c1m";
+      src = "0nmfr2lijik6cykk0zbj11zcapcrvmdvq83k3r6q3k74g4d1qkr5";
+      git = "103cs7hz1v0h84lbrippl87s4lawi20m406rs5dgxl2gr2wyjpy5";
     };
   };
 
   ruby_2_5 = generic {
-    version = rubyVersion "2" "5" "0" "";
+    version = rubyVersion "2" "5" "1" "";
     sha256 = {
-      src = "1azj0d2lzziw6iml7bx3sxpxzcdmfwfq3yhm7djyp20q1xiz7rj6";
-      git = "0d436nqmp3ykdkp4sck5bb8sf3qvx30x1p58xh8axv66mvsyc2jd";
+      src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s";
+      git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj";
     };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index fc79761252f..e53f231884d 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -6,17 +6,17 @@ rec {
     "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.3.6" = ops useRailsExpress [
+  "2.3.7" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.4.3" = ops useRailsExpress [
+  "2.4.4" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.5.0" = ops useRailsExpress [
+  "2.5.1" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
-- 
GitLab


From 07ee2b907d8deabcf6d7fb4269ad0b681f9c0f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 3 May 2018 15:22:01 +0100
Subject: [PATCH 0093/1085] john: build with recent gcc

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f13edf9eba4..77f55ad2cbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3138,9 +3138,7 @@ with pkgs;
 
   go-jira = callPackage ../applications/misc/go-jira { };
 
-  john = callPackage ../tools/security/john {
-    gcc = gcc49; # doesn't build with gcc5
-  };
+  john = callPackage ../tools/security/john { };
 
   journalbeat = callPackage ../tools/system/journalbeat { };
 
-- 
GitLab


From 51ac1d8df08d606ae5d8af95073bb74e330249f3 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Thu, 3 May 2018 16:30:32 +0200
Subject: [PATCH 0094/1085] gcc8: Removed X11 components, since they were only
 used by langJava

---
 pkgs/development/compilers/gcc/8/default.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 16636f04982..2465e6149c0 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -12,12 +12,6 @@
 , libelf                      # optional, for link-time optimizations (LTO)
 , isl ? null # optional, for the Graphite optimization framework.
 , zlib ? 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 ? false
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
@@ -60,11 +54,6 @@ let version = "8.1.0";
       }) */
       ++ optional langFortran ../gfortran-driving.patch;
 
-    xlibs = [
-      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
-      xproto renderproto xextproto inputproto randrproto
-    ];
-
     /* Platform flags */
     platformFlags = let
         gccArch = targetPlatform.platform.gcc.arch or null;
@@ -150,9 +139,6 @@ let version = "8.1.0";
 
 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;
 
-- 
GitLab


From 7bb789bc984016730a019fa5cf65e387e0798b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 3 May 2018 14:17:38 -0300
Subject: [PATCH 0095/1085] jwm: 1653 -> 1685

---
 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 05f89728f6a..9085385fe25 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 = "1653";
+  version = "1685";
   
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
     rev = "s${version}";
-    sha256 = "09ci3g97xmif66pp9n4sdvdmlxpw67pwp8lbjynxhdvha5pwwpv5";
+    sha256 = "1kyvy022sij898g2hm5spy5vq0kw6aqd7fsnawl2xyh06gwh29wg";
   };
 
   nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
-- 
GitLab


From 54a13b07d5925c8e890e0d9aaa0842cd7ae0d8d6 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sat, 12 Aug 2017 21:14:36 +0200
Subject: [PATCH 0096/1085] switch-to-configuration: use Net::DBus to retrieve
 the list of units

This resolves the FIXME, and opens up the possibility of using more of
the systemd DBus interface to make things more robust.
---
 .../activation/switch-to-configuration.pl     | 19 +++++++++----------
 nixos/modules/system/activation/top-level.nix |  3 ++-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 87a4ab2a586..2ce04ed5342 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 use File::Basename;
 use File::Slurp;
+use Net::DBus;
 use Sys::Syslog qw(:standard :macros);
 use Cwd 'abs_path';
 
@@ -67,17 +68,15 @@ EOF
 $SIG{PIPE} = "IGNORE";
 
 sub getActiveUnits {
-    # FIXME: use D-Bus or whatever to query this, since parsing the
-    # output of list-units is likely to break.
-    # Use current version of systemctl binary before daemon is reexeced.
-    my $lines = `LANG= /run/current-system/sw/bin/systemctl list-units --full --no-legend`;
+    my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1");
+    my $units = $mgr->ListUnitsByPatterns([], []);
     my $res = {};
-    foreach my $line (split '\n', $lines) {
-        chomp $line;
-        last if $line eq "";
-        $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next;
-        next if $1 eq "UNIT";
-        $res->{$1} = { load => $2, state => $3, substate => $4 };
+    for my $item (@$units) {
+        my ($id, $description, $load_state, $active_state, $sub_state,
+            $following, $unit_path, $job_id, $job_type, $job_path) = @$item;
+        next unless $following eq '';
+        next if $job_id == 0 and $active_state eq 'inactive';
+        $res->{$id} = { load => $load_state, state => $active_state, substate => $sub_state };
     }
     return $res;
 }
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 091a2e412ee..e2d1dd49ef0 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -127,7 +127,8 @@ let
       configurationName = config.boot.loader.grub.configurationName;
 
       # Needed by switch-to-configuration.
-      perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
+
+      perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ]));
   } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}");
 
   # Replace runtime dependencies
-- 
GitLab


From bfb3232a13c2261a13eeb3bbfad0b3b3a6ed92c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 3 May 2018 15:19:54 -0300
Subject: [PATCH 0097/1085] theme-obsidian2: init at 2.5

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

diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix
new file mode 100644
index 00000000000..41f29f34be8
--- /dev/null
+++ b/pkgs/misc/themes/obsidian2/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "theme-obsidian2-${version}";
+  version = "2.5";
+
+  src = fetchFromGitHub {
+    owner = "madmaxms";
+    repo = "theme-obsidian-2";
+    rev = "v${version}";
+    sha256 = "12jya1gzmhpfh602vbf51vi69fmis7sanvx278h3skm03a7civlv";
+  };
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    mkdir -p $out/share/themes
+    cp -a Obsidian-2 $out/share/themes
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Gnome theme, based upon Adwaita-Maia dark skin";
+    homepage = https://github.com/madmaxms/theme-obsidian-2;
+    license = with licenses; [ gpl3 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97e2ee5a3a6..93fae25f5f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19715,6 +19715,8 @@ with pkgs;
 
   numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { };
 
+  theme-obsidian2 = callPackage ../misc/themes/obsidian2 { };
+
   onestepback = callPackage ../misc/themes/onestepback { };
 
   theme-vertex = callPackage ../misc/themes/vertex { };
-- 
GitLab


From 919d824efe142c6e23d7808621f571890b0d0503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 3 May 2018 15:45:57 -0300
Subject: [PATCH 0098/1085] iconpack-obsidian: init at 4.0.1

---
 pkgs/data/icons/iconpack-obsidian/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/data/icons/iconpack-obsidian/default.nix

diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
new file mode 100644
index 00000000000..efcaa1cbc53
--- /dev/null
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "iconpack-obsidian-${version}";
+  version = "4.0.1";
+
+  src = fetchFromGitHub {
+    owner = "madmaxms";
+    repo = "iconpack-obsidian";
+    rev = "v${version}";
+    sha256 = "1mlaldqjc3am2d2m577fhsidlnfqlhmnf1l8hh50iqr94mc14fab";
+  };
+
+  nativeBuildInputs = [ gtk3 ];
+
+  installPhase = ''
+     mkdir -p $out/share/icons
+     mv Obsidian* $out/share/icons
+  '';
+
+  postFixup = ''
+    for theme in $out/share/icons/*; do
+      gtk-update-icon-cache $theme
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Gnome Icon Pack based upon Faenza";
+    homepage = https://github.com/madmaxms/iconpack-obsidian;
+    license = licenses.lgpl3;
+    platforms = platforms.all;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97e2ee5a3a6..ff4e788e515 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14396,6 +14396,8 @@ with pkgs;
 
   ibm-plex = callPackage ../data/fonts/ibm-plex { };
 
+  iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { };
+
   inconsolata = callPackage ../data/fonts/inconsolata {};
   inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {};
 
-- 
GitLab


From adce6bf638bc6032f17e002334e444a3c8656ad2 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 3 May 2018 21:54:09 +0200
Subject: [PATCH 0099/1085] refind: fix runtime errors

In newer versions, instead of using $PWD to locate its ressource files,
Refind now refers to the dir containing $0.
This causes runtime errors due to missing ressources.

In lieu a wrapper binary, we now simply patch the variable 'RefindDir'
which stores the path to the ressource dir.
---
 pkgs/tools/bootloaders/refind/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index f305cff0ea2..80add316094 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     install -D -m0644 gptsync/gptsync_${efiPlatform}.efi $out/share/refind/tools_${efiPlatform}/gptsync_${efiPlatform}.efi
 
     # helper scripts
-    install -D -m0755 refind-install $out/share/refind/refind-install
+    install -D -m0755 refind-install $out/bin/refind-install
     install -D -m0755 mkrlconf $out/bin/refind-mkrlconf
     install -D -m0755 mvrefind $out/bin/refind-mvrefind
     install -D -m0755 fonts/mkfont.sh $out/bin/refind-mkfont
@@ -86,21 +86,13 @@ stdenv.mkDerivation rec {
     # keys
     install -D -m0644 keys/* $out/share/refind/keys/
 
-    # The refind-install script assumes that all resource files are
-    # installed under the same directory as the script itself. To avoid
-    # having to patch around this assumption, generate a wrapper that
-    # cds into $out/share/refind and executes the real script from
-    # there.
-    cat >$out/bin/refind-install <<EOF
-#! ${stdenv.shell}
-cd $out/share/refind && exec -a $out/bin/refind-install ./refind-install \$*
-EOF
-    chmod +x $out/bin/refind-install
+    # Fix variable definition of 'RefindDir' which is used to locate ressource files.
+    sed -i "s,\bRefindDir=.*,RefindDir=$out/share/refind,g" $out/bin/refind-install
 
     # Patch uses of `which`.  We could patch in calls to efibootmgr,
     # openssl, convert, and openssl, but that would greatly enlarge
     # refind's closure (from ca 28MB to over 400MB).
-    sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/share/refind/refind-install
+    sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install
     sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind
     sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont
   '';
-- 
GitLab


From 0f62284972aff639bc772245311446161911a985 Mon Sep 17 00:00:00 2001
From: florianjacob <accounts+github@florianjacob.de>
Date: Thu, 3 May 2018 23:38:14 +0200
Subject: [PATCH 0100/1085] matrix-synapse: 0.27.4 -> 0.28.1 (#39922)

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

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 4c82f5cfdde..77bcc98da04 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.27.4";
+  version = "0.28.1";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "051bwr4vz8mwglh1m9rqlljbn8g3alvd52f09ff887nsi6z3jc17";
+    sha256 = "1xgiprnhp893zc0g3i7wpwzgjy6q5nb858p0s6kcsca60vr9j6h0";
   };
 
   patches = [
-- 
GitLab


From c770e6162276fde2e4120ce632eb0a553b21304c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Fri, 4 May 2018 00:46:05 +0200
Subject: [PATCH 0101/1085] nheko: 0.3.1 -> 0.4.0

---
 .../networking/instant-messengers/nheko/default.nix       | 8 ++++----
 .../instant-messengers/nheko/external-deps.patch          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 8405769582f..688ac6d10d6 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -17,8 +17,8 @@ let
     src = fetchFromGitHub {
       owner = "mujx";
       repo = "matrix-structs";
-      rev = "91bb2b85a75d664007ef81aeb500d35268425922";
-      sha256 = "1v544pv18sd91gdrhbk0nm54fggprsvwwrkjmxa59jrvhwdk7rsx";
+      rev = "690080daa3bc1984297c4d7103cde9ea07e2e0b7";
+      sha256 = "0l6mncpdbjmrzp5a3q1jv0sxf7bwl5ljslrcjca1j2bjjbqb61bz";
     };
 
     postUnpack = ''
@@ -47,13 +47,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "nheko-${version}";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "mujx";
     repo = "nheko";
     rev = "v${version}";
-    sha256 = "1dqd698p6wicz0x1lb6mzlwcp68sjkivanb9lwz3yy1mlmy8i3jn";
+    sha256 = "1yg6bk193mqj99x3sy0f20x3ggpl0ahrp36w6hhx7pyw5qm17342";
   };
 
   # This patch is likely not strictly speaking needed, but will help detect when
diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
index 661ae756a4d..a3425a78045 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
+++ b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
@@ -54,7 +54,7 @@ index cef00f6..e69de29 100644
 -  MatrixStructs
 -
 -  GIT_REPOSITORY https://github.com/mujx/matrix-structs
--  GIT_TAG 91bb2b85a75d664007ef81aeb500d35268425922
+-  GIT_TAG 690080daa3bc1984297c4d7103cde9ea07e2e0b7
 -
 -  BUILD_IN_SOURCE 1
 -  SOURCE_DIR ${MATRIX_STRUCTS_ROOT}
-- 
GitLab


From ef82607d90b45683740f70bacc218566093a4455 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 3 May 2018 17:57:51 -0500
Subject: [PATCH 0102/1085] qt48: fix patch url

See #39927
---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 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 10f892bc4d0..d0319cdb43b 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
       })
       (fetchpatch {
         name = "fix-medium-font.patch";
-        url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/"
-          + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4";
+        url = "https://salsa.debian.org/qt-kde-team/qt/qt4-x11/raw/"
+          + "21b342d71c19e6d68b649947f913410fe6129ea4/debian/patches/kubuntu_39_fix_medium_font.diff";
         sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j";
       })
       (fetchpatch {
-- 
GitLab


From 4f1f7c4655ffe484858600a75d574db2c76e7321 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 3 May 2018 18:05:04 -0500
Subject: [PATCH 0103/1085] libgweather: fixup assertion error

---
 pkgs/desktops/gnome-2/desktop/libgweather/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
index ab68acda277..47f2b8c90fb 100644
--- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp }:
 
+assert stdenv ? glibc;
+
 stdenv.mkDerivation rec {
   name = "libgweather-2.30.3";
   src = fetchurl {
-- 
GitLab


From 51998c675acfd6b2bb4f07bc4910bca7e8a96c9c Mon Sep 17 00:00:00 2001
From: Michael Bishop <michael.bishop@iohk.io>
Date: Thu, 3 May 2018 20:04:11 -0300
Subject: [PATCH 0104/1085] runInLinuxVM: fix ext4 and crc32c-intel
 interactions

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

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 08d0a358e61..622fba0686f 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -92,7 +92,7 @@ rec {
 
     echo "loading kernel modules..."
     for i in $(cat ${modulesClosure}/insmod-list); do
-      insmod $i
+      insmod $i || echo "warning: unable to load $i"
     done
 
     mount -t devtmpfs devtmpfs /dev
-- 
GitLab


From 8f5c258cc13fd989fde6911d8c0b8077a77241a9 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 3 May 2018 20:04:56 -0500
Subject: [PATCH 0105/1085] icestorm: 2018.03.21 -> 2018.05.03

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/icestorm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 3c87abbdce9..cb203a431d4 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "icestorm-${version}";
-  version = "2018.03.21";
+  version = "2018.05.03";
 
   src = fetchFromGitHub {
     owner  = "cliffordwolf";
     repo   = "icestorm";
-    rev    = "4476d83f76fa0222be0b691fe27c1e0228266f82";
-    sha256 = "1r43vwwz61rvdpc3kylg8yzv0flz9p4j3yc1cc4h904zsdwjx39a";
+    rev    = "237280ce44f72c7b2e1ca671d5113dba34cc4fca";
+    sha256 = "0r9xh024snaf1g2r5k524yl6lvf5rkfhqwjzcixh1m12012i5hrh";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 922e78896c3053a3b31f7ff36bc9b9f6b895c058 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 3 May 2018 20:05:13 -0500
Subject: [PATCH 0106/1085] arachne-pnr: 2018.03.07 -> 2018.05.03

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/arachne-pnr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index 70acb79dc7e..bf8511704f8 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -4,13 +4,13 @@ with builtins;
 
 stdenv.mkDerivation rec {
   name = "arachne-pnr-${version}";
-  version = "2018.03.07";
+  version = "2018.05.03";
 
   src = fetchFromGitHub {
     owner  = "cseed";
     repo   = "arachne-pnr";
-    rev    = "6701132cbd5c7b31edd0ff18ca6727eb3691186b";
-    sha256 = "1c55k9gpq042mkyxrblwskbmr3v0baj4gkwm45v1gvmhdza6gfw8";
+    rev    = "ea2d04215bc0fd6072cda244caeb6670892033b3";
+    sha256 = "0qhf5djyh0pzmgv33rjnnqq6asmmwxjdadvr18a83iy9pll6gg5k";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From f17f6866842c0bf398c2c3bbe431a082afd9ce96 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 3 May 2018 20:05:41 -0500
Subject: [PATCH 0107/1085] yosys: 2018.03.21 -> 2018.05.03

ABC has now moved to GitHub, so we can eliminate the usage of
fetchFromBitbucket now, too.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/yosys/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index c20bffe26ed..4bd5640c854 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchFromBitbucket
+{ stdenv, fetchFromGitHub
 , pkgconfig, tcl, readline, libffi, python3, bison, flex
 }:
 
@@ -6,25 +6,25 @@ with builtins;
 
 stdenv.mkDerivation rec {
   name = "yosys-${version}";
-  version = "2018.03.21";
+  version = "2018.05.03";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "yosyshq";
       repo   = "yosys";
-      rev    = "3f0070247590458c5ed28c5a7abfc3b9d1ec138b";
-      sha256 = "0rsnjk25asg7dkxcmim464rmxgvm7x7njmcp5nyl8y4iwn8i9p8v";
+      rev    = "a572b495387743a58111e7264917a497faa17ebf";
+      sha256 = "0q4xh4sy3n83c8il8lygzv0i6ca4qw36i2k6qz6giw0wd2pkibkb";
       name   = "yosys";
     })
 
     # NOTE: the version of abc used here is synchronized with
     # the one in the yosys Makefile of the version above;
     # keep them the same for quality purposes.
-    (fetchFromBitbucket {
-      owner  = "alanmi";
+    (fetchFromGitHub {
+      owner  = "berkeley-abc";
       repo   = "abc";
-      rev    = "6e3c24b3308a";
-      sha256 = "1i4wv0si4fb6dpv2yrpkp588mdlfrnx2s02q2fgra5apdm54c53w";
+      rev    = "f23ea8e33f6d5cc54f58bec6d9200483e5d8c704";
+      sha256 = "1xwmq3k5hfavdrs7zbqjxh35kr2pis4i6hhzrq7qzyzs0az0hls9";
       name   = "yosys-abc";
     })
   ];
-- 
GitLab


From 301f14e993e54d1fa79b47c2efa699ea2c774b4b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 3 May 2018 20:06:20 -0500
Subject: [PATCH 0108/1085] symbiyosys: 2018.03.21 -> 2018.05.03

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/symbiyosys/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 98acebcf2cc..2580b9b0fbe 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "symbiyosys-${version}";
-  version = "2018.03.21";
+  version = "2018.05.03";
 
   src = fetchFromGitHub {
     owner  = "yosyshq";
     repo   = "symbiyosys";
-    rev    = "76a624a363bc44df102359595d34f29370c6668b";
-    sha256 = "1ikax1yiqgj5442wcgp1iigw8wiyw7k848z4ykn7k068kbc320bm";
+    rev    = "35d956c7bb77c0602d198035b2d73a9c61cb4de4";
+    sha256 = "02zg3nkwp3fdjwz1agvsn55k1xipwh2rradb0bgjrjpsmmw63gda";
   };
 
   buildInputs = [ python3 yosys ];
-- 
GitLab


From e730e05d5c1502220e0252a069c4b27d6c6e8f7e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 4 May 2018 12:41:44 +0800
Subject: [PATCH 0109/1085] freetds: 1.00.80 -> 1.00.91

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

diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index b097e5cbb64..52d439918aa 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -4,19 +4,17 @@
 
 assert odbcSupport -> unixODBC != null;
 
+# Work is in progress to move to cmake so revisit that later
+
 stdenv.mkDerivation rec {
   name = "freetds-${version}";
-  version = "1.00.80";
+  version = "1.00.91";
 
   src = fetchurl {
     url    = "http://www.freetds.org/files/stable/${name}.tar.bz2";
-    sha256 = "17s15avxcyhfk0zsj8rggizhpd2j2sa41w5xlnshzd2r3piqyl6k";
+    sha256 = "04c344xdvh2j36r01ph7yhy5rb1668il0z9vyphwdy6qqwywh622";
   };
 
-  configureFlags = [
-    "--with-tdsver=7.3"
-  ];
-
   buildInputs = [
     openssl
   ] ++ stdenv.lib.optional odbcSupport unixODBC;
-- 
GitLab


From d8ebe4f2cfce622066f174bc33a35910ea52093e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 3 May 2018 18:37:47 +0000
Subject: [PATCH 0110/1085] ocamlPackages.git: 1.11.4 -> 1.11.5

Also enable tests
---
 pkgs/development/ocaml-modules/git-http/default.nix |  9 +++++++--
 pkgs/development/ocaml-modules/git/default.nix      | 10 +++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix
index 5b93b960765..5e757b5b672 100644
--- a/pkgs/development/ocaml-modules/git-http/default.nix
+++ b/pkgs/development/ocaml-modules/git-http/default.nix
@@ -1,10 +1,12 @@
-{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt }:
+{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt
+, alcotest, mtime, nocrypto
+}:
 
 stdenv.mkDerivation rec {
 	name = "ocaml${ocaml.version}-git-http-${version}";
 	inherit (git) version src;
 
-	buildInputs = [ ocaml findlib jbuilder ];
+	buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ];
 
 	propagatedBuildInputs = [ git cohttp-lwt ];
 
@@ -12,6 +14,9 @@ stdenv.mkDerivation rec {
 
 	inherit (jbuilder) installPhase;
 
+	doCheck = true;
+	checkPhase = "jbuilder runtest -p git-http";
+
 	meta = {
 		description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml";
 		inherit (git.meta) homepage license maintainers platforms;
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index 9347c6ad00c..6f0f0d0b120 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam
 , astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri
+, alcotest, mtime, nocrypto
 }:
 
 stdenv.mkDerivation rec {
-	version = "1.11.4";
+	version = "1.11.5";
 	name = "ocaml${ocaml.version}-git-${version}";
 
 	src = fetchFromGitHub {
 		owner = "mirage";
 		repo = "ocaml-git";
 		rev = version;
-		sha256 = "182b6shcfcq50r5snm01hwalnmck43x1xgdd4fvjb6q78pbwag2x";
+		sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh";
 	};
 
-	buildInputs = [ ocaml findlib jbuilder ];
+	buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ];
 
 	propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ];
 
@@ -21,6 +22,9 @@ stdenv.mkDerivation rec {
 
 	inherit (jbuilder) installPhase;
 
+	doCheck = true;
+	checkPhase = "jbuilder runtest -p git";
+
 	meta = {
 		description = "Git format and protocol in pure OCaml";
 		license = stdenv.lib.licenses.isc;
-- 
GitLab


From cf50edf58385c4ca261b53ad09c9be2d94349427 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 3 May 2018 15:35:51 +0200
Subject: [PATCH 0111/1085] python3Packages.yowsup: 2.5.2 -> 2.5.7

The latest update of `yowsup` (https://github.com/tgalal/yowsup/releases/tag/v2.5.7)
contains the following fixes:

* Updated tokens
* Fixed tgalal/yowsup#1842: Bug in protocol_groups RemoveGroupsNotificationProtocolEntity
* Other minor bug fixes

The `argparse-dependency.patch` required a rebase onto the latest
version of `setup.py` and ensures that `argparse` won't be needed as
extra dependency as our `python3` package ships `argparse` by default.

A short note to Python 2 support:

the actual issue related to Python 2.x support has been resolved
(https://github.com/tgalal/yowsup/issues/2325#issuecomment-354533727),
however this relies on `six==1.10` which isn't support by `nixpkgs` as
`six` has been bumped to `1.11`. When trying to inject a patched version
of our `six` package based on `six==1.10` you'll run into issues with
duplicated libraries in your closure as further build dependencies
(`pytest` in this case) use the latest `six` version. As Python 2.7 will
die in 2020 (https://pythonclock.org/) and patching around in the
dependencies of `pytest` to get `yowsup` running isn't worth the effort
in my opinion I decided to keep the Python 2.x build disabled for now.
---
 .../python-modules/yowsup/argparse-dependency.patch      | 6 +++---
 pkgs/development/python-modules/yowsup/default.nix       | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/yowsup/argparse-dependency.patch b/pkgs/development/python-modules/yowsup/argparse-dependency.patch
index 364f0054fe7..e2b9f0c9a74 100644
--- a/pkgs/development/python-modules/yowsup/argparse-dependency.patch
+++ b/pkgs/development/python-modules/yowsup/argparse-dependency.patch
@@ -1,13 +1,13 @@
 diff --git a/setup.py b/setup.py
-index 053ed07..60f0d9a 100755
+index 991e89c..7a96ccf 100755
 --- a/setup.py
 +++ b/setup.py
 @@ -5,7 +5,7 @@ import yowsup
  import platform
  import sys
  
--deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six']
+-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six==1.10']
 +deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six']
  
  if sys.version_info < (2,7):
-     deps += ['importlib']
+     deps += ['importlib', "protobuf==3.4.0"]
diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix
index f7ee986aebb..5fa4af18c08 100644
--- a/pkgs/development/python-modules/yowsup/default.nix
+++ b/pkgs/development/python-modules/yowsup/default.nix
@@ -3,19 +3,18 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "yowsup";
-  version = "2.5.2";
+  version = "2.5.7";
 
-  # python2 is currently incompatible with yowsup:
-  # https://github.com/tgalal/yowsup/issues/2325#issuecomment-343516519
+  # The Python 2.x support of this package is incompatible with `six==1.11`:
+  # https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "tgalal";
     repo = "yowsup";
     rev = "v${version}";
-    sha256 = "16l8jmr32wwvl11m0a4r4id3dkfqj2n7dn6gky1077xwmj2da4fl";
+    sha256 = "1p0hdj5x38v2cxjnhdnqcnp5g7la57mbi365m0z83wa01x2n73w6";
   };
 
   checkInputs = [ pytest ];
-- 
GitLab


From 1f1e16af732a579bf9967494473eaf7079aeaed5 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Fri, 4 May 2018 13:02:02 +0200
Subject: [PATCH 0112/1085] mathematica: add mesa, fix `libGL.so.1 not found`
 messages

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

diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 9b9d5b250ef..97781a69ce6 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -19,6 +19,8 @@
 , libxml2
 , libuuid
 , lang ? "en"
+, libGL
+, libGLU
 }:
 
 let
@@ -56,6 +58,8 @@ stdenv.mkDerivation rec {
     libxml2
     libuuid
     zlib
+    libGL
+    libGLU
   ] ++ (with xorg; [
     libX11
     libXext
-- 
GitLab


From 20bb5fb0d94823eca8a4b68bc5ddfce459346d72 Mon Sep 17 00:00:00 2001
From: Yorick <yorick@yorickvanpelt.nl>
Date: Fri, 4 May 2018 13:12:09 +0200
Subject: [PATCH 0113/1085] impure.nix: stringify path from NIX_PATH

If impure.nix gets the path from NIX_PATH, the type is `path`, and `path+"/."` is a no-op. Stringify it first so `isDir` will return false if it's not, in fact, a dir. This way, single files can be specified with nixpkgs-overlays in the NIX_PATH.
---
 pkgs/top-level/impure.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index a9f21e45aed..df462665dd1 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -41,7 +41,7 @@ in
   # fix-point made by Nixpkgs.
   overlays ? let
       isDir = path: pathExists (path + "/.");
-      pathOverlays = try <nixpkgs-overlays> "";
+      pathOverlays = try (toString <nixpkgs-overlays>) "";
       homeOverlaysFile = homeDir + "/.config/nixpkgs/overlays.nix";
       homeOverlaysDir = homeDir + "/.config/nixpkgs/overlays";
       overlays = path:
-- 
GitLab


From 23d98f9e8ff8d88ba1adc576c14285e0d84a1785 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Fri, 4 May 2018 13:21:50 +0200
Subject: [PATCH 0114/1085] prometheus-postfix-exporter: 0.1.1 -> 0.1.2

With this release systemd support became optional.
It can now be disabled by passing `withSystemdSupport = false` to `callPackage`.
---
 .../prometheus/postfix-exporter-deps.nix      | 26 ++-----------
 .../prometheus/postfix-exporter.nix           | 38 +++++++++++++++----
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
index 194651f4332..07bedaba9f3 100644
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
@@ -9,31 +9,13 @@
       sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
     };
   }
-  {
-    goPackagePath = "github.com/coreos/go-systemd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/coreos/go-systemd";
-      rev = "d1b7d058aa2adfc795ad17ff4aaa2bc64ec11c78";
-      sha256 = "1nz3v1b90hnmj2vjjwq96pr6psxlndqjyd30v9sgiwygzb7db9mv";
-    };
-  }
-  {
-    goPackagePath = "github.com/coreos/pkg";
-    fetch = {
-      type = "git";
-      url = "https://github.com/coreos/pkg";
-      rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1";
-      sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21";
-    };
-  }
   {
     goPackagePath = "github.com/golang/protobuf";
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "e09c5db296004fbe3f74490e84dcd62c3c5ddb1b";
-      sha256 = "1acnmalkqwrq6k3l71c4pyws0zn18r2609kqaq55lhbdcjgzid31";
+      rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
     };
   }
   {
@@ -68,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/common";
-      rev = "d0f7cd64bda49e08b22ae8a730aa57aa0db125d6";
-      sha256 = "1d4hfbb66xsf0wq317fwhgrwakqzhvryw4d7ip851lwrpql5fqcx";
+      rev = "d811d2e9bf898806ecfb6ef6296774b13ffc314c";
+      sha256 = "0r4067r4ysmljksqw3awcxx5qplqhykahc5igdzgkky7i4bvaik1";
     };
   }
   {
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
index 3c2f01c0a5c..97df26aea4e 100644
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
@@ -1,8 +1,11 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, systemd, makeWrapper }:
+{ stdenv, buildGoPackage, fetchFromGitHub, systemd, makeWrapper
+, withSystemdSupport ? true }:
+
+with stdenv.lib;
 
 buildGoPackage rec {
   name = "postfix_exporter-${version}";
-  version = "0.1.1";
+  version = "0.1.2";
 
   goPackagePath = "github.com/kumina/postfix_exporter";
 
@@ -10,20 +13,41 @@ buildGoPackage rec {
     owner = "kumina";
     repo = "postfix_exporter";
     rev = version;
-    sha256 = "1p2j66jzzgyv2w832pw57g02vrac6ldrblqllgwyy0i8krb3ibyz";
+    sha256 = "1b9ib3scxni6hlw55wv6f0z1xfn27l0p29as24f71rs70pyzy4hm";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ systemd ];
+  nativeBuildInputs = optional withSystemdSupport makeWrapper;
+  buildInputs = optional withSystemdSupport systemd;
+  buildFlags = optional (!withSystemdSupport) "-tags nosystemd";
 
   goDeps = ./postfix-exporter-deps.nix;
+  extraSrcs = optionals withSystemdSupport [
+    {
+      goPackagePath = "github.com/coreos/go-systemd";
+      src = fetchFromGitHub {
+        owner = "coreos";
+        repo = "go-systemd";
+        rev = "d1b7d058aa2adfc795ad17ff4aaa2bc64ec11c78";
+        sha256 = "1nz3v1b90hnmj2vjjwq96pr6psxlndqjyd30v9sgiwygzb7db9mv";
+      };
+    }
+    {
+      goPackagePath = "github.com/coreos/pkg";
+      src = fetchFromGitHub {
+        owner = "coreos";
+        repo = "pkg";
+        rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1";
+        sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21";
+      };
+    }
+  ];
 
-  postInstall = ''
+  postInstall = optionalString withSystemdSupport ''
     wrapProgram $bin/bin/postfix_exporter \
       --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     inherit (src.meta) homepage;
     description = "A Prometheus exporter for Postfix";
     license = licenses.asl20;
-- 
GitLab


From 9d0b6b9dfc92a2704e2111aa836f5bdbf8c9ba42 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 4 May 2018 13:26:10 +0200
Subject: [PATCH 0115/1085] nix: 2.0.1 -> 2.0.2

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 8 ++++----
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 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 6bb556a0123..5ad28ea9499 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
 {
-  x86_64-linux = "/nix/store/2gk7rk2sx2dkmsjr59gignrfdmya8f6s-nix-2.0.1";
-  i686-linux = "/nix/store/5160glkphiv13qggnivyidg8r0491pbl-nix-2.0.1";
-  aarch64-linux = "/nix/store/jk29zz3ns9vdkkclcyzzkpzp8dhv1x3i-nix-2.0.1";
-  x86_64-darwin = "/nix/store/4a9czmrpd4hf3r80zcmga2c2lm3hbbvv-nix-2.0.1";
+  x86_64-linux = "/nix/store/z6avpvg24f6d1br2sr6qlphsq3h4d91v-nix-2.0.2";
+  i686-linux = "/nix/store/cdqjyb9srhwkc4gqbknnap7y31lws4yq-nix-2.0.2";
+  aarch64-linux = "/nix/store/fbgaa3fb2am30klwv4lls44njwqh487a-nix-2.0.2";
+  x86_64-darwin = "/nix/store/hs8mxsvdhm95dxgx943d74fws01j2zj3-nix-2.0.2";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 23099489723..1d15bd11b7f 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -132,10 +132,10 @@ in rec {
   }) // { perl-bindings = nixStable; };
 
   nixStable = (common rec {
-    name = "nix-2.0.1";
+    name = "nix-2.0.2";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "689c33b9885b56b7817bf94aad3bc7ccf50710ebb34b01c5a5a2ac4e472750b1";
+      sha256 = "2d2984410f73d759485526e594ce41b9819fafa4676f4f85a93dbdd5352a1435";
     };
   }) // { perl-bindings = perl-bindings { nix = nixStable; }; };
 
-- 
GitLab


From 39c63320cbf4654eabdc7e15aebf1d3a74598dbd Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 May 2018 16:06:47 +0200
Subject: [PATCH 0116/1085] minitube: 2.4 -> 2.9

Version 2.9 is based on QT5 (with a much better interface) and requires
additionally the dependencies `qtbase`, `qtdeclarative` and `qttools`.

Furthermore the `QT_PLUGIN_PATH` had to be altered, however the
`phonon-backend` contains versioned paths, so we provide the plugin path
that matches the QT version used to build this package.

See #33248
---
 pkgs/applications/video/minitube/default.nix | 15 +++++++++------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 8b94204cd62..3b8dce90243 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook
+{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qtbase, qmake
+, qtdeclarative, qttools
+
 # "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google
 # account. You'll need to generate (and please share :-) a new one if it breaks.
 , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
 
 stdenv.mkDerivation rec {
   name = "minitube-${version}";
-  version = "2.4";
+  version = "2.9";
 
   src = fetchFromGitHub {
-    sha256 = "0mm8v2vpspwxh2fqaykb381v6r9apywc1b0x8jkcbp7s43w10lp5";
+    sha256 = "11zkmwqadlgrrghs3rxq0h0fllfnyd3g09d7gdd6vd9r1a1yz73f";
     rev = version;
     repo = "minitube";
     owner = "flaviotordini";
   };
 
-  buildInputs = [ phonon phonon-backend-vlc qt4 ];
-  nativeBuildInputs = [ makeWrapper qmake4Hook ];
+  buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools ];
+  nativeBuildInputs = [ makeWrapper qmake ];
 
   qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
 
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/minitube \
-      --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/kde4/plugins"
+      --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/qt-5.${stdenv.lib.versions.minor qtbase.version}/plugins"
   '';
 
   meta = with stdenv.lib; {
@@ -36,5 +38,6 @@ stdenv.mkDerivation rec {
     homepage = https://flavio.tordini.org/minitube;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ ma27 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c4e2e09a8..684fb560d9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16778,7 +16778,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) vmnet;
   };
 
-  minitube = callPackage ../applications/video/minitube { };
+  minitube = libsForQt5.callPackage ../applications/video/minitube { };
 
   mimms = callPackage ../applications/audio/mimms {};
 
-- 
GitLab


From 5777272bd2f4bde3ec9b048c0da3c388a8e0239e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 2 May 2018 23:10:43 +0200
Subject: [PATCH 0117/1085] nixos/plymouth: multi-user.target wants
 plymouth-quit-wait.service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is apparent from the service file directory in plymouth:
├── multi-user.target.wants
│   ├── plymouth-quit.service -> ../plymouth-quit.service
│   └── plymouth-quit-wait.service -> ../plymouth-quit-wait.service

Leaving it unspecified caused gdm-wayland to crash on boot, see #39615.

The change made other display managers not quit plymouth properly however. By
removing "multi-user.target" from `plymouth-quit.after` this is resolved.
---
 nixos/modules/system/boot/plymouth.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index f8fb8a64cb9..e4223bae7d3 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -87,9 +87,10 @@ in
 
     systemd.services.plymouth-kexec.wantedBy = [ "kexec.target" ];
     systemd.services.plymouth-halt.wantedBy = [ "halt.target" ];
+    systemd.services.plymouth-quit-wait.wantedBy = [ "multi-user.target" ];
     systemd.services.plymouth-quit = {
       wantedBy = [ "multi-user.target" ];
-      after = [ "display-manager.service" "multi-user.target" ];
+      after = [ "display-manager.service" ];
     };
     systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ];
     systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ];
-- 
GitLab


From ce00943916f81d26d15fab054315aa494233496c Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 4 May 2018 10:19:31 -0400
Subject: [PATCH 0118/1085] =?UTF-8?q?pytorch:=200.2.0=20=E2=86=92=200.3.1?=
 =?UTF-8?q?=20with=20CUDA=20and=20cuDNN=20(#38530)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* pytorch-0.3 with optional cuda and cudnn

* pytorch tests reenabled if compiling without cuda

* pytorch: Conditionalize cudnn dependency on cudaSupport

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

* pytorch: Compile with the same GCC version used by CUDA if cudaSupport

Fixes this error:

In file included from /nix/store/gv7w3c71jg627cpcff04yi6kwzpzjyap-cudatoolkit-9.1.85.1/include/host_config.h:50:0,
                 from /nix/store/gv7w3c71jg627cpcff04yi6kwzpzjyap-cudatoolkit-9.1.85.1/include/cuda_runtime.h:78,
                 from <command-line>:0:
/nix/store/gv7w3c71jg627cpcff04yi6kwzpzjyap-cudatoolkit-9.1.85.1/include/crt/host_config.h:121:2: error: #error -- unsupported GNU version! gcc versions later than 6 are not supported!
 #error -- unsupported GNU version! gcc versions later than 6 are not supported!
  ^~~~~

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

* pytorch: Build with joined cudatoolkit

Similar to #30058 for TensorFlow.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

* pytorch: 0.3.0 -> 0.3.1

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

* pytorch: Patch for “refcounted file mapping not supported” failure

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

* pytorch: Skip distributed tests

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

* pytorch: Use the stub libcuda.so from cudatoolkit for running tests

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../python-modules/pytorch/default.nix        | 66 ++++++++++++++++---
 pkgs/top-level/python-packages.nix            | 12 +++-
 2 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index a510eedee4f..c8376196d3a 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,8 +1,31 @@
-{ buildPythonPackage, fetchFromGitHub, lib, numpy, pyyaml, cffi, cmake,
-  git, stdenv }:
+{ buildPythonPackage,
+  cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
+  fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, cmake,
+  git, stdenv, linkFarm, symlinkJoin,
+  utillinux, which }:
 
-buildPythonPackage rec {
-  version = "0.2.0";
+assert cudnn == null || cudatoolkit != null;
+assert !cudaSupport || cudatoolkit != null;
+
+let
+  cudatoolkit_joined = symlinkJoin {
+    name = "${cudatoolkit.name}-unsplit";
+    paths = [ cudatoolkit.out cudatoolkit.lib ];
+  };
+
+  # Normally libcuda.so.1 is provided at runtime by nvidia-x11 via
+  # LD_LIBRARY_PATH=/run/opengl-driver/lib.  We only use the stub
+  # libcuda.so from cudatoolkit for running tests, so that we don’t have
+  # to recompile pytorch on every update to nvidia-x11 or the kernel.
+  cudaStub = linkFarm "cuda-stub" [{
+    name = "libcuda.so.1";
+    path = "${cudatoolkit}/lib/stubs/libcuda.so";
+  }];
+  cudaStubEnv = lib.optionalString cudaSupport
+    "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ";
+
+in buildPythonPackage rec {
+  version = "0.3.1";
   pname = "pytorch";
   name = "${pname}-${version}";
 
@@ -10,18 +33,41 @@ buildPythonPackage rec {
     owner  = "pytorch";
     repo   = "pytorch";
     rev    = "v${version}";
-    sha256 = "1s3f46ga1f4lfrcj3lpvvhgkdr1pi8i2hjd9xj9qiz3a9vh2sj4n";
+    fetchSubmodules = true;
+    sha256 = "1k8fr97v5pf7rni5cr2pi21ixc3pdj3h3lkz28njbjbgkndh7mr3";
   };
 
-  checkPhase = ''
-    ${stdenv.shell} test/run_test.sh
+  patches = [
+    (fetchpatch {
+      # make sure stdatomic.h is included when checking for ATOMIC_INT_LOCK_FREE
+      # Fixes this test failure:
+      # RuntimeError: refcounted file mapping not supported on your system at /tmp/nix-build-python3.6-pytorch-0.3.0.drv-0/source/torch/lib/TH/THAllocator.c:525
+      url = "https://github.com/pytorch/pytorch/commit/502aaf39cf4a878f9e4f849e5f409573aa598aa9.patch";
+      stripLen = 3;
+      extraPrefix = "torch/lib/";
+      sha256 = "1miz4lhy3razjwcmhxqa4xmlcmhm65lqyin1czqczj8g16d3f62f";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace test/run_test.sh --replace \
+      "INIT_METHOD='file://'\$TEMP_DIR'/shared_init_file' \$PYCMD ./test_distributed.py" \
+      "echo Skipped for Nix package"
+  '';
+
+  preConfigure = lib.optionalString cudaSupport ''
+    export CC=${cudatoolkit.cc}/bin/gcc
+  '' + lib.optionalString (cudaSupport && cudnn != null) ''
+    export CUDNN_INCLUDE_DIR=${cudnn}/include
   '';
 
   buildInputs = [
      cmake
      git
      numpy.blas
-  ];
+     utillinux
+     which
+  ] ++ lib.optionals cudaSupport [cudatoolkit_joined cudnn];
 
   propagatedBuildInputs = [
     cffi
@@ -29,8 +75,8 @@ buildPythonPackage rec {
     pyyaml
   ];
 
-  preConfigure = ''
-    export NO_CUDA=1
+  checkPhase = ''
+    ${cudaStubEnv}${stdenv.shell} test/run_test.sh
   '';
 
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ca0ee1195cc..4da4910bbbd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5623,7 +5623,17 @@ in {
     };
   };
 
-  pytorch = callPackage ../development/python-modules/pytorch { };
+  pytorch = callPackage ../development/python-modules/pytorch {
+    cudaSupport = pkgs.config.cudaSupport or false;
+  };
+
+  pytorchWithCuda = self.pytorch.override {
+    cudaSupport = true;
+  };
+
+  pytorchWithoutCuda = self.pytorch.override {
+    cudaSupport = false;
+  };
 
   python2-pythondialog = buildPythonPackage rec {
     name = "python2-pythondialog-${version}";
-- 
GitLab


From 7f53ee8412b6f4777f827acf15db119e000d8f6f Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 3 May 2018 21:30:06 +0200
Subject: [PATCH 0119/1085] restic-rest-server module: init

---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/backup/restic-rest-server.nix    | 107 ++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 nixos/modules/services/backup/restic-rest-server.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0ed820a32ac..805d83c7ce3 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -306,6 +306,7 @@
       ceph = 288;
       duplicati = 289;
       monetdb = 290;
+      restic = 291;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -580,6 +581,7 @@
       ceph = 288;
       duplicati = 289;
       monetdb = 290;
+      restic = 291;
 
       # 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 505c5497d36..26804d3682d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -167,6 +167,7 @@
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/restic.nix
+  ./services/backup/restic-rest-server.nix
   ./services/backup/rsnapshot.nix
   ./services/backup/tarsnap.nix
   ./services/backup/znapzend.nix
diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix
new file mode 100644
index 00000000000..d4b47a09941
--- /dev/null
+++ b/nixos/modules/services/backup/restic-rest-server.nix
@@ -0,0 +1,107 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.restic.server;
+in
+{
+  meta.maintainers = [ maintainers.bachp ];
+
+  options.services.restic.server = {
+    enable = mkEnableOption "Restic REST Server";
+
+    listenAddress = mkOption {
+      default = ":8000";
+      example = "127.0.0.1:8080";
+      type = types.str;
+      description = "Listen on a specific IP address and port.";
+    };
+
+    dataDir = mkOption {
+      default = "/var/lib/restic";
+      type = types.path;
+      description = "The directory for storing the restic repository.";
+    };
+
+    appendOnly = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Enable append only mode.
+        This mode allows creation of new backups but prevents deletion and modification of existing backups.
+        This can be useful when backing up systems that have a potential of being hacked.
+      '';
+    };
+
+    privateRepos = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Enable private repos.
+        Grants access only when a subdirectory with the same name as the user is specified in the repository URL.
+      '';
+    };
+
+    prometheus = mkOption {
+      default = false;
+      type = types.bool;
+      description = "Enable Prometheus metrics at /metrics.";
+    };
+
+    extraFlags = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Extra commandline options to pass to Restic REST server.
+      '';
+    };
+
+    package = mkOption {
+      default = pkgs.restic-rest-server;
+      defaultText = "pkgs.restic-rest-server";
+      type = types.package;
+      description = "Restic REST server package to use.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.restic-rest-server = {
+      description = "Restic REST Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = ''
+          ${cfg.package}/bin/rest-server \
+          --listen ${cfg.listenAddress} \
+          --path ${cfg.dataDir} \
+          ${optionalString cfg.appendOnly "--append-only"} \
+          ${optionalString cfg.privateRepos "--private-repos"} \
+          ${optionalString cfg.prometheus "--prometheus"} \
+          ${escapeShellArgs cfg.extraFlags} \
+        '';
+        Type = "simple";
+        User = "restic";
+        Group = "restic";
+
+        # Security hardening
+        ReadWritePaths = [ cfg.dataDir ];
+        PrivateTmp = true;
+        ProtectSystem = "strict";
+        ProtectKernelTunables = true;
+        ProtectKernelModules = true;
+        ProtectControlGroups = true;
+        PrivateDevices = true;
+      };
+    };
+
+    users.extraUsers.restic = {
+      group = "restic";
+      home = cfg.dataDir;
+      createHome = true;
+      uid = config.ids.uids.restic;
+    };
+
+    users.extraGroups.restic.gid = config.ids.uids.restic;
+  };
+}
-- 
GitLab


From 9fe26eed9ed92ab3899e7aa30f9d40a793af64ed Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio+git@lunesu.com>
Date: Fri, 4 May 2018 07:41:06 +0800
Subject: [PATCH 0120/1085] nix-prefetch-git: fix handling of submodules with
 spaces

The script would parse the output of `git submodule status` but
didn't handle paths with spaces in them. This would result in the
following error when trying to determine the URL of the submodule:

error: key does not contain a section: .url
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 2441da156d1..1d993dcc109 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -185,7 +185,7 @@ init_submodules(){
 
         # checkout each submodule
         hash=$(echo "$l" | awk '{print $1}' | tr -d '-')
-        dir=$(echo "$l" | awk '{print $2}')
+        dir=$(echo "$l" | sed -n 's/^ \{0,1\}[^ ]* \(.*\) ([^ ]*)$/\1/p')
         name=$(
             git config -f .gitmodules --get-regexp submodule\..*\.path |
             sed -n "s,^\(.*\)\.path $dir\$,\\1,p")
-- 
GitLab


From 04d126a3f02e8f07bb18bc4300715aeddc0a0632 Mon Sep 17 00:00:00 2001
From: voobscout <voobscout@archlinux.info>
Date: Fri, 4 May 2018 18:21:43 +0200
Subject: [PATCH 0121/1085] ntfs-3g: fix debian url

---
 pkgs/tools/filesystems/ntfs-3g/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index 6acf5e221d4..4bcef5a83f0 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      url = "https://sources.debian.net/data/main/n/ntfs-3g/1:2016.2.22AR.1-4/debian/patches/0003-CVE-2017-0358.patch";
+      url = "https://sources.debian.org/data/main/n/ntfs-3g/1:2016.2.22AR.1+dfsg-1/debian/patches/0003-CVE-2017-0358.patch";
       sha256 = "0hd05q9q06r18k8pmppvch1sslzqln5fvqj51d5r72g4mnpavpj3";
     })
   ];
-- 
GitLab


From 7873fe26693e86e38195e07ee0fd31d1a7f44e6c Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 4 May 2018 11:37:58 -0500
Subject: [PATCH 0122/1085] dunst: remove fetchpatch

Closes #39962
---
 pkgs/applications/misc/dunst/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 9906b1fd858..5396299943c 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub
 , pkgconfig, which, perl, libXrandr
 , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
 , libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg
-- 
GitLab


From d2028096ae86debc762381ad2f539d822a734b9d Mon Sep 17 00:00:00 2001
From: Florian Engel <florianengel39@gmail.com>
Date: Fri, 4 May 2018 18:51:38 +0200
Subject: [PATCH 0123/1085] lolcat: 99.9.10 -> 99.9.11

---
 pkgs/tools/misc/lolcat/Gemfile.lock | 2 +-
 pkgs/tools/misc/lolcat/gemset.nix   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock
index 1ef7e552796..3c4646ddf48 100644
--- a/pkgs/tools/misc/lolcat/Gemfile.lock
+++ b/pkgs/tools/misc/lolcat/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    lolcat (99.9.10)
+    lolcat (99.9.11)
       manpages (~> 0.6.1)
       paint (~> 2.0.0)
       trollop (~> 2.1.2)
diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix
index 78677edcc34..86069f7ecc0 100644
--- a/pkgs/tools/misc/lolcat/gemset.nix
+++ b/pkgs/tools/misc/lolcat/gemset.nix
@@ -3,10 +3,10 @@
     dependencies = ["manpages" "paint" "trollop"];
     source = {
       remotes = ["http://rubygems.org"];
-      sha256 = "0fidwmgywkklxf2a4f4dl82b8mx4w4n73vqm6jqgyqd3nfmgysnl";
+      sha256 = "1z0j354sj2qm2srgz3i28s347fwylvv1j614806cr33zcd1j4mwp";
       type = "gem";
     };
-    version = "99.9.10";
+    version = "99.9.11";
   };
   manpages = {
     source = {
-- 
GitLab


From c68dc2212e22899de52d470198c74abd51935dab Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 May 2018 18:55:09 +0200
Subject: [PATCH 0124/1085] openscad: fix build by switching to git master and
 Qt5

---
 .../graphics/openscad/default.nix             | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 33fddf6c8d0..9ab5288700c 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -1,20 +1,30 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
-, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext
+{ stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5
+, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
+, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext
 }:
 
 stdenv.mkDerivation rec {
-  version = "2015.03-3";
+  version = "2018.04-git";
   name = "openscad-${version}";
 
-  src = fetchurl {
-    url = "http://files.openscad.org/${name}.src.tar.gz";
-    sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx";
+#  src = fetchurl {
+#    url = "http://files.openscad.org/${name}.src.tar.gz";
+#    sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx";
+#  };
+  src = fetchFromGitHub {
+    owner = "openscad";
+    repo = "openscad";
+    rev = "179074dff8c23cbc0e651ce8463737df0006f4ca";
+    sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb";
   };
 
   buildInputs = [
-    qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib
-    pkgconfig harfbuzz qscintilla gettext
-  ];
+    bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib
+    pkgconfig harfbuzz gettext
+  ]
+    ++ (with qt5; [qtbase qmake])
+    ++ (with libsForQt5; [qscintilla])
+  ;
 
   qmakeFlags = [ "VERSION=${version}" ];
 
-- 
GitLab


From 0c2a7fa4dceb8d57780330c626d86a78978a11e3 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Wed, 18 Apr 2018 12:27:03 -0700
Subject: [PATCH 0125/1085] pass: refactor extension packaging

---
 pkgs/tools/security/pass/default.nix          | 190 +++++++++---------
 .../security/pass/extensions/default.nix      |  12 ++
 .../tools/security/pass/extensions/import.nix |  37 ++++
 .../default.nix => pass/extensions/otp.nix}   |  11 +-
 pkgs/tools/security/pass/extensions/tomb.nix  |  32 +++
 .../tools/security/pass/extensions/update.nix |  25 +++
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   3 +-
 8 files changed, 212 insertions(+), 99 deletions(-)
 create mode 100644 pkgs/tools/security/pass/extensions/default.nix
 create mode 100644 pkgs/tools/security/pass/extensions/import.nix
 rename pkgs/tools/security/{pass-otp/default.nix => pass/extensions/otp.nix} (82%)
 create mode 100644 pkgs/tools/security/pass/extensions/tomb.nix
 create mode 100644 pkgs/tools/security/pass/extensions/update.nix

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 4f9e6c06697..5ce0ce0dbc2 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -1,10 +1,12 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub
+{ stdenv, lib, pkgs, fetchurl, fetchFromGitHub, buildEnv
 , coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode
 , makeWrapper
 
 , xclip ? null, xdotool ? null, dmenu ? null
 , x11Support ? !stdenv.isDarwin
-, tombPluginSupport ? false, tomb
+
+# For backwards-compatibility
+, tombPluginSupport ? false
 }:
 
 with lib;
@@ -14,98 +16,100 @@ assert x11Support -> xclip != null
                   && dmenu != null;
 
 let
-  plugins = map (p: (fetchFromGitHub {
-    owner  = "roddhjav";
-    repo   = "pass-${p.name}";
-    inherit (p) rev sha256;
-  }))
-  ([
-    { name = "import";
-      rev = "491935bd275f29ceac2b876b3a288011d1ce31e7";
-      sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; }
-    { name = "update";
-      rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde";
-      sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; }
-    ] ++ stdenv.lib.optional tombPluginSupport {
-      name = "tomb";
-      rev = "3368134898a42c1b758fabac625ec240e125c6be";
-      sha256 = "0qqmxfg4w3r088qhlkhs44036mya82vjflsjjhw2hk8y0wd2i6ds"; }
-  );
-
-in stdenv.mkDerivation rec {
-  version = "1.7.1";
-  name    = "password-store-${version}";
-
-  src = fetchurl {
-    url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
-    sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn";
-  };
+  passExtensions = import ./extensions { inherit pkgs; };
+
+  env = extensions:
+    let
+      selected = extensions passExtensions
+        ++ stdenv.lib.optional tombPluginSupport passExtensions.tomb;
+    in buildEnv {
+      name = "pass-extensions-env";
+      paths = selected;
+      buildInputs = concatMap (x: x.buildInputs) selected;
+    };
+
+  generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec {
+    version = "1.7.1";
+    name    = "password-store-${version}";
+
+    src = fetchurl {
+      url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
+      sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn";
+    };
+
+    patches = [ ./set-correct-program-name-for-sleep.patch
+              ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
+
+    nativeBuildInputs = [ makeWrapper ];
+
+    buildInputs = [ extensionsEnv ];
+
+    installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ];
+
+    postInstall = ''
+      # Install Emacs Mode. NOTE: We can't install the necessary
+      # dependencies (s.el and f.el) here. The user has to do this
+      # himself.
+      mkdir -p "$out/share/emacs/site-lisp"
+      cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/"
+    '' + optionalString x11Support ''
+      cp "contrib/dmenu/passmenu" "$out/bin/"
+    '';
 
-  patches = [ ./set-correct-program-name-for-sleep.patch
-            ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ];
-
-  postInstall = ''
-    # plugins
-    ${stdenv.lib.concatStringsSep "\n" (map (plugin: ''
-      pushd ${plugin}
-      PREFIX=$out make install
-      popd
-    '') plugins)}
-
-    # Install Emacs Mode. NOTE: We can't install the necessary
-    # dependencies (s.el and f.el) here. The user has to do this
-    # himself.
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/"
-  '' + optionalString x11Support ''
-    cp "contrib/dmenu/passmenu" "$out/bin/"
-  '';
-
-  wrapperPath = with stdenv.lib; makeBinPath ([
-    coreutils
-    getopt
-    git
-    gnupg
-    gnused
-    tree
-    which
-    qrencode
-    procps
-  ] ++ optional tombPluginSupport tomb
-    ++ ifEnable x11Support [ dmenu xclip xdotool ]);
-
-  postFixup = ''
-    # Fix program name in --help
-    substituteInPlace $out/bin/pass \
-      --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass"
-
-    # Ensure all dependencies are in PATH
-    wrapProgram $out/bin/pass \
-      --prefix PATH : "${wrapperPath}"
-  '' + stdenv.lib.optionalString x11Support ''
-    # We just wrap passmenu with the same PATH as pass. It doesn't
-    # need all the tools in there but it doesn't hurt either.
-    wrapProgram $out/bin/passmenu \
-      --prefix PATH : "$out/bin:${wrapperPath}"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Stores, retrieves, generates, and synchronizes passwords securely";
-    homepage    = https://www.passwordstore.org/;
-    license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lovek323 the-kenny fpletz ];
-    platforms   = platforms.unix;
-
-    longDescription = ''
-      pass is a very simple password store that keeps passwords inside gpg2
-      encrypted files inside a simple directory tree residing at
-      ~/.password-store. The pass utility provides a series of commands for
-      manipulating the password store, allowing the user to add, remove, edit,
-      synchronize, generate, and manipulate passwords.
+    wrapperPath = with stdenv.lib; makeBinPath ([
+      coreutils
+      getopt
+      git
+      gnupg
+      gnused
+      tree
+      which
+      qrencode
+      procps
+    ] ++ ifEnable x11Support [ dmenu xclip xdotool ]);
+
+    postFixup = ''
+      # Link extensions env
+      rmdir $out/lib/password-store/extensions
+      ln -s ${extensionsEnv}/lib/password-store/extensions $out/lib/password-store/.
+
+      # Fix program name in --help
+      substituteInPlace $out/bin/pass \
+        --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass"
+
+      # Ensure all dependencies are in PATH
+      wrapProgram $out/bin/pass \
+        --prefix PATH : "${wrapperPath}"
+    '' + stdenv.lib.optionalString x11Support ''
+      # We just wrap passmenu with the same PATH as pass. It doesn't
+      # need all the tools in there but it doesn't hurt either.
+      wrapProgram $out/bin/passmenu \
+        --prefix PATH : "$out/bin:${wrapperPath}"
     '';
+
+    passthru = {
+      extensions = passExtensions;
+    } // extraPassthru;
+
+    meta = with stdenv.lib; {
+      description = "Stores, retrieves, generates, and synchronizes passwords securely";
+      homepage    = https://www.passwordstore.org/;
+      license     = licenses.gpl2Plus;
+      maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ];
+      platforms   = platforms.unix;
+
+      longDescription = ''
+        pass is a very simple password store that keeps passwords inside gpg2
+        encrypted files inside a simple directory tree residing at
+        ~/.password-store. The pass utility provides a series of commands for
+        manipulating the password store, allowing the user to add, remove, edit,
+        synchronize, generate, and manipulate passwords.
+      '';
+    };
   };
+
+in
+
+generic (env (_: [])) {
+  withExtensions = extensions: generic (env extensions) {};
 }
diff --git a/pkgs/tools/security/pass/extensions/default.nix b/pkgs/tools/security/pass/extensions/default.nix
new file mode 100644
index 00000000000..dfb853c0a0b
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+with pkgs;
+
+{
+  pass-import = callPackage ./import.nix {
+    pythonPackages = python3Packages;
+  };
+  pass-otp = callPackage ./otp.nix {};
+  pass-tomb = callPackage ./tomb.nix {};
+  pass-update = callPackage ./update.nix {};
+}
diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix
new file mode 100644
index 00000000000..8ba4abc5e3d
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/import.nix
@@ -0,0 +1,37 @@
+{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper }:
+
+let
+  pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]);
+
+in stdenv.mkDerivation rec {
+  name = "pass-import-${version}";
+  version = "2.2";
+
+  src = fetchFromGitHub {
+    owner = "roddhjav";
+    repo = "pass-import";
+    rev = "v${version}";
+    sha256 = "189wf2jz2j43k27930cnl53sm2drh1s0nq1nmh4is3rzn8cna6wq";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ pythonEnv ];
+
+  dontBuild = true;
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postFixup = ''
+    wrapProgram $out/lib/password-store/extensions/import.bash \
+      --prefix PATH : "${pythonEnv}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pass extension for importing data from existing password managers";
+    homepage = https://github.com/roddhjav/pass-import;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/security/pass-otp/default.nix b/pkgs/tools/security/pass/extensions/otp.nix
similarity index 82%
rename from pkgs/tools/security/pass-otp/default.nix
rename to pkgs/tools/security/pass/extensions/otp.nix
index 7f0f44bdfa4..60198675b29 100644
--- a/pkgs/tools/security/pass-otp/default.nix
+++ b/pkgs/tools/security/pass/extensions/otp.nix
@@ -1,4 +1,5 @@
-{ stdenv, pass, fetchFromGitHub, oathToolkit }:
+{ stdenv, fetchFromGitHub, oathToolkit }:
+
 stdenv.mkDerivation rec {
   name = "pass-otp-${version}";
   version = "1.1.0";
@@ -10,15 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1cgj4zc8fq88n3h6c0vkv9i5al785mdprpgpbv5m22dz9p1wqvbb";
   };
 
-  buildInputs = [ pass oathToolkit ];
+  buildInputs = [ oathToolkit ];
+
+  dontBuild = true;
 
   patchPhase = ''
     sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash
   '';
 
-  installPhase = ''
-    make PREFIX=$out install
-  '';
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "A pass extension for managing one-time-password (OTP) tokens";
diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix
new file mode 100644
index 00000000000..b9f458cd4e1
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/tomb.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, tomb }:
+
+stdenv.mkDerivation rec {
+  name = "pass-tomb-${version}";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "roddhjav";
+    repo = "pass-tomb";
+    rev = "v${version}";
+    sha256 = "0wxa673yyzasjlkpd5f3yl5zf7bhsw7h1jbhf6sdjz65bypr2596";
+  };
+
+  buildInputs = [ tomb ];
+
+  dontBuild = true;
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postFixup = ''
+    substituteInPlace $out/lib/password-store/extensions/tomb.bash \
+      --replace 'TOMB="''${PASSWORD_STORE_TOMB:-tomb}"' 'TOMB="''${PASSWORD_STORE_TOMB:-${tomb}/bin/tomb}"'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pass extension that keeps the password store encrypted inside a tomb";
+    homepage = https://github.com/roddhjav/pass-tomb;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix
new file mode 100644
index 00000000000..dd145b06972
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/update.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "pass-update-${version}";
+  version = "2.0";
+
+  src = fetchFromGitHub {
+    owner = "roddhjav";
+    repo = "pass-update";
+    rev = "v${version}";
+    sha256 = "0a81q0jfni185zmbislzbcv0qr1rdp0cgr9wf9riygis2xv6rs6k";
+  };
+
+  dontBuild = true;
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Pass extension that provides an easy flow for updating passwords";
+    homepage = https://github.com/roddhjav/pass-update;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 334905b79f2..8b0812f8305 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -151,6 +151,7 @@ mapAliases (rec {
   openssh_with_kerberos = openssh; # added 2018-01-28
   owncloudclient = owncloud-client;  # added 2016-08
   p11_kit = p11-kit; # added 2018-02-25
+  pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04
   pgp-tools = signing-party; # added 2017-03-26
   pidgin-with-plugins = pidgin; # added 2016-06
   pidginlatexSF = pidgin-latex; # added 2014-11-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a37de17c696..7631b357eaa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -656,7 +656,8 @@ with pkgs;
   lastpass-cli = callPackage ../tools/security/lastpass-cli { };
 
   pass = callPackage ../tools/security/pass { };
-  pass-otp = callPackage ../tools/security/pass-otp { };
+
+  passExtensions = recurseIntoAttrs pass.extensions;
 
   gopass = callPackage ../tools/security/gopass { };
 
-- 
GitLab


From e9ac594ea1cc805aabcad5b24b25c0ca3d541624 Mon Sep 17 00:00:00 2001
From: Sander Hollaar <git@humilis.net>
Date: Fri, 4 May 2018 19:53:23 +0200
Subject: [PATCH 0126/1085] fix-way-cooler - remove 'mv' commands not needed
 anymore, and replace '_' with '-' to fix multiple way-cooler compile failures

---
 .../window-managers/way-cooler/default.nix           | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
index c8b67ec047a..442bf5e08df 100644
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -20,24 +20,16 @@ let
       mkdir -p $out/etc
       cp -r config $out/etc/way-cooler
     '';
-    postFixup = ''
-      cd $out/bin
-      mv way_cooler way-cooler
-    '';
   });
   wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec {
     nativeBuildInputs = [ makeWrapper ];
 
     postFixup = ''
-      makeWrapper $out/bin/wc_bg $out/bin/wc-bg \
+      makeWrapper $out/bin/wc-bg $out/bin/wc-bg \
         --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}"
     '';
   });
   wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab {}).overrideAttrs (oldAttrs: rec {
-    postFixup = ''
-      cd $out/bin
-      mv wc_grab wc-grab
-    '';
   });
   wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override {
     crateOverrides = defaultCrateOverrides // {
@@ -47,7 +39,7 @@ let
     nativeBuildInputs = [ makeWrapper ];
 
     postFixup = ''
-      makeWrapper $out/bin/wc_lock $out/bin/wc-lock \
+      makeWrapper $out/bin/wc-lock $out/bin/wc-lock \
         --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}"
     '';
   });
-- 
GitLab


From 814938a7ce2d9bd25c90065fdde6c98c1e389c5c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 4 May 2018 19:56:38 +0200
Subject: [PATCH 0127/1085] ruby: fix darwin dependencies

---
 pkgs/development/interpreters/ruby/default.nix | 15 +++++++--------
 pkgs/top-level/all-packages.nix                |  5 ++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index b98e2c1a673..89d394c8756 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -1,8 +1,8 @@
 { stdenv, buildPackages, lib
 , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
 , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison
-, autoconf, darwin ? null
-, buildEnv, bundler, bundix, Foundation
+, autoconf, libiconv, libobjc, libunwind, Foundation
+, buildEnv, bundler, bundix
 } @ args:
 
 let
@@ -37,7 +37,7 @@ let
     isRuby25 = ver.majMin == "2.5";
     baseruby = self.override { useRailsExpress = false; };
     self = lib.makeOverridable (
-  { stdenv, buildPackages, lib
+      { stdenv, buildPackages, lib
       , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
       , useRailsExpress ? true
       , zlib, zlibSupport ? true
@@ -48,8 +48,8 @@ let
       , libyaml, yamlSupport ? true
       , libffi, fiddleSupport ? true
       , autoreconfHook, bison, autoconf
-      , darwin ? null
-      , buildEnv, bundler, bundix, Foundation
+      , buildEnv, bundler, bundix
+      , libiconv, libobjc, libunwind, Foundation
       }:
       let rubySrc =
         if useRailsExpress then fetchFromGitHub {
@@ -93,9 +93,8 @@ let
           # support is not enabled, so add readline to the build inputs if curses
           # support is disabled (if it's enabled, we already have it) and we're
           # running on darwin
-          ++ (op (!cursesSupport && stdenv.isDarwin) readline)
-          ++ (op (isRuby25 && stdenv.isDarwin) Foundation)
-          ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ]));
+          ++ op (!cursesSupport && stdenv.isDarwin) readline
+          ++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ];
 
         enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c4e2e09a8..206873d8e29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7355,7 +7355,10 @@ with pkgs;
   bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
   bundlerApp = callPackage ../development/ruby-modules/bundler-app { };
 
-  inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; })
+  inherit (callPackage ../development/interpreters/ruby {
+    inherit (darwin) libiconv libobjc libunwind;
+    inherit (darwin.apple_sdk.frameworks) Foundation;
+  })
     ruby_2_3
     ruby_2_4
     ruby_2_5;
-- 
GitLab


From 77a54ea59fede09c7acb413add8c4f1f75b1dd95 Mon Sep 17 00:00:00 2001
From: Brandon Elam Barker <beb82@cornell.edu>
Date: Fri, 4 May 2018 18:05:08 +0000
Subject: [PATCH 0128/1085] adding untested git-secrets

---
 .../git-and-tools/git-secrets/default.nix     | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-secrets/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
new file mode 100644
index 00000000000..ac4d2e474b2
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper, git }:
+
+let
+  version = "1.2.1";
+  repo = "git-secrets";
+
+in stdenv.mkDerivation {
+  name = "${repo}-${version}";
+
+  src = fetchFromGitHub {
+    inherit repo;
+    owner = "awslabs";
+    rev = "v${version}";
+    sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    install -D git-secrets $out/bin/git-secrets
+
+    wrapProgram $out/bin/git-secrets \
+      --prefix PATH : "${lib.makeBinPath [ git ]}"
+
+    mkdir $out/share
+    cp -r man $out/share
+  '';
+
+  meta = {
+    description = "Prevents you from committing passwords and other sensitive information to a git repository";
+    homepage = https://github.com/awslabs/git-secretshttps://github.com/awslabs/git-secrets;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
-- 
GitLab


From 3837dddedb64ae9456e0b07ae2915c828e92eb7f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 4 May 2018 03:19:25 +0200
Subject: [PATCH 0129/1085] firefox: remove GStreamer

Apparently, it has been dropped:

https://bugzilla.mozilla.org/show_bug.cgi?id=1234092
---
 .../networking/browsers/firefox/wrapper.nix            | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index ed6cf712ed9..b619941820e 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -2,7 +2,7 @@
 
 ## various stuff that can be plugged in
 , flashplayer, hal-flash
-, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2
+, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2
 , jrePlugin, icedtea_web
 , trezor-bridge, bluejeans, djview4, adobe-reader
 , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
@@ -67,13 +67,12 @@ let
           ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
           ++ extraNativeMessagingHosts
         );
-      libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
+      libs = lib.optional ffmpegSupport ffmpeg
             ++ lib.optional gssSupport kerberos
             ++ lib.optionals (cfg.enableQuakeLive or false)
             (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ])
             ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
             ++ lib.optional (config.pulseaudio or true) libpulseaudio;
-      gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
       gtk_modules = [ libcanberra-gtk2 ];
 
     in stdenv.mkDerivation {
@@ -99,7 +98,6 @@ let
       };
 
       buildInputs = [makeWrapper]
-        ++ lib.optional (!ffmpegSupport) gst-plugins
         ++ lib.optional (browser ? gtk3) browser.gtk3;
 
       buildCommand = ''
@@ -119,9 +117,7 @@ let
             --suffix PATH ':' "$out/bin" \
             --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
             --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
-            ${lib.optionalString (!ffmpegSupport)
-                ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"''
-            + lib.optionalString (browser ? gtk3)
+            ${lib.optionalString (browser ? gtk3)
                 ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
                   --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share'
                 ''
-- 
GitLab


From db78fe50e6e6729b12f8c8b4414de1c71192c069 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 4 May 2018 03:51:07 +0200
Subject: [PATCH 0130/1085] opencv: use GStreamer 1.0

---
 pkgs/development/libraries/opencv/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index cbac7210a10..d2d10682716 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -8,7 +8,7 @@
 , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
 , enableJPEG2K ? true, jasper
 , enableFfmpeg ? false, ffmpeg
-, enableGStreamer ? false, gst_all
+, enableGStreamer ? false, gst_all_1
 , enableEigen ? true, eigen
 , darwin
 }:
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     ++ lib.optionals enableEXR [ openexr ilmbase ]
     ++ lib.optional enableJPEG2K jasper
     ++ lib.optional enableFfmpeg ffmpeg
-    ++ lib.optionals enableGStreamer (with gst_all; [ gstreamer gst-plugins-base ])
+    ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
     ++ lib.optional enableEigen eigen
     ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa QTKit ])
     ;
@@ -69,6 +69,7 @@ stdenv.mkDerivation rec {
     (opencvFlag "JPEG" enableJPEG)
     (opencvFlag "PNG" enablePNG)
     (opencvFlag "OPENEXR" enableEXR)
+    (opencvFlag "GSTREAMER" enableGStreamer)
   ];
 
   enableParallelBuilding = true;
-- 
GitLab


From 1c33dff43315303649f9189656a7b26f24f20218 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 4 May 2018 15:30:54 +0200
Subject: [PATCH 0131/1085] libcanberra: fix GStreamer support

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

diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 54f2273c2fc..83f86c40c0d 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap
-, alsaLib, libpulseaudio, gstreamer, gst-plugins-base, libvorbis }:
+, alsaLib, libpulseaudio, gst_all_1, libvorbis }:
 
 stdenv.mkDerivation rec {
   name = "libcanberra-0.30";
@@ -9,11 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
-    libtool alsaLib libpulseaudio libvorbis gtk libcap
-    /*gstreamer gst-plugins-base*/      # ToDo: gstreamer not found (why?), add (g)udev?
-  ];
+    alsaLib libpulseaudio libvorbis gtk libcap
+  ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]);
 
   configureFlags = "--disable-oss";
 
-- 
GitLab


From 91b092986b3ed2c0109d69331287937834496677 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 4 May 2018 19:11:45 +0000
Subject: [PATCH 0132/1085] poco: support MySQL

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

diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index d44bc78a533..4dffa7486a1 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ];
 
+  MYSQL_DIR = mysql.connector-c;
+  MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";
+
   cmakeFlags = [
     "-DPOCO_UNBUNDLED=ON"
   ];
-- 
GitLab


From 8723594059695b1ed2f03ec997f8b9db18cd0b16 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 4 May 2018 14:41:13 -0500
Subject: [PATCH 0133/1085] rl-1809: add googleearth

---
 nixos/doc/manual/release-notes/rl-1809.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index ec7b2f107e8..7136f454050 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -101,6 +101,12 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      that can be mapped onto the YAML configuration defined in <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the <varname>docker/distribution</varname> docs</link>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     <literal>googleearth</literal> has been removed from Nixpkgs. Google does not provide
+     a stable URL for Nixpkgs to use to package this proprietary software.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
-- 
GitLab


From 62855fc04a46e80bb45347cc55f4b6422ebb1779 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Thu, 3 May 2018 14:42:01 +0000
Subject: [PATCH 0134/1085] pythonPackages.supervise_api: 0.4.0 -> 0.5.3

Upstream added tests, so we run those too now.
---
 .../python-modules/supervise_api/default.nix          | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix
index f73aba0a5f9..35600357d2c 100644
--- a/pkgs/development/python-modules/supervise_api/default.nix
+++ b/pkgs/development/python-modules/supervise_api/default.nix
@@ -4,17 +4,16 @@
 , supervise
 , isPy3k
 , whichcraft
+, utillinux
 }:
 
 buildPythonPackage rec {
   pname = "supervise_api";
-  version = "0.4.0";
-
-  name = "${pname}-${version}";
+  version = "0.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "029h1mlfhkm9lw043rawh24ld8md620y94k6c1l9hs5vvyq4fs84";
+    sha256 = "0dakc1h2ih1bw67y137wp0vph8d3y2lx5d70b8dgggy1zbpqxl1m";
   };
 
   propagatedBuildInputs = [
@@ -22,9 +21,7 @@ buildPythonPackage rec {
   ] ++ lib.optionals ( !isPy3k ) [
     whichcraft
   ];
-
-  # no tests
-  doCheck = false;
+  checkInputs = [ utillinux ];
 
   meta = {
     description = "An API for running processes safely and securely";
-- 
GitLab


From 397a618e34ea132df500b3d92f06775f3d0292b8 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 4 May 2018 15:10:30 -0500
Subject: [PATCH 0135/1085] kotlin: move LICENSE to separate place

Fixes #39641
---
 pkgs/development/compilers/kotlin/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index d5ce240b4a5..76244913315 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -22,6 +22,11 @@ in stdenv.mkDerivation rec {
     for p in $(ls $out/bin/) ; do
       wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ;
     done
+
+    if [ -f $out/LICENSE ]; then
+      install -D $out/LICENSE $out/share/kotlin/LICENSE
+      rm $out/LICENSE
+    fi
   '';
 
   meta = {
-- 
GitLab


From cf84d6c275b1cd65ba6a42dc7beaa74da7f47c3b Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 4 May 2018 15:11:09 -0500
Subject: [PATCH 0136/1085] openjdk: move license

---
 pkgs/development/compilers/openjdk/darwin/8.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix
index cc7c5fd371d..7457ffceab1 100644
--- a/pkgs/development/compilers/openjdk/darwin/8.nix
+++ b/pkgs/development/compilers/openjdk/darwin/8.nix
@@ -26,6 +26,11 @@ let
 
       # jni.h expects jni_md.h to be in the header search path.
       ln -s $out/include/darwin/*_md.h $out/include/
+
+      if [ -f $out/LICENSE ]; then
+        install -D $out/LICENSE $out/share/zulu/LICENSE
+        rm $out/LICENSE
+      fi
     '';
 
     preFixup = ''
-- 
GitLab


From b5e558b573f1989889e423df8b48e1084608022f Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 4 May 2018 15:11:45 -0500
Subject: [PATCH 0137/1085] openjdk: move license (again)

---
 pkgs/development/compilers/openjdk/darwin/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix
index 6ecc785be3b..54239e58002 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -16,6 +16,11 @@ let
 
       # jni.h expects jni_md.h to be in the header search path.
       ln -s $out/include/darwin/*_md.h $out/include/
+
+      if [ -f $out/LICENSE ]; then
+        install -D $out/LICENSE $out/share/zulu/LICENSE
+        rm $out/LICENSE
+      fi
     '';
 
     preFixup = ''
-- 
GitLab


From b4bfc02d352a737b08d11592efe0128bf1075a8d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 May 2018 15:11:12 +0200
Subject: [PATCH 0138/1085] simplescreenrecorder: port to qt5

See #33248
---
 .../video/simplescreenrecorder/default.nix             | 10 ++++++----
 pkgs/top-level/all-packages.nix                        |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 0ae9de04680..d1f6f8b6ad1 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext
-, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qt4, cmake, ninja
+{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras
+, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qtbase, cmake, ninja
 }:
 
 stdenv.mkDerivation rec {
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "02rl9yyx3hlz9fqvgzv7ipmvx2qahj7ws5wx2m7zs3lssq3qag3g";
   };
 
+  cmakeFlags = [ "-DWITH_QT5=TRUE" ];
+
   patches = [ ./fix-paths.patch ];
 
   postPatch = ''
@@ -24,14 +26,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig cmake ninja ];
   buildInputs = [
     alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined
-    libpulseaudio qt4
+    libpulseaudio qtbase qtx11extras
   ];
 
   meta = with stdenv.lib; {
     description = "A screen recorder for Linux";
     homepage = http://www.maartenbaert.be/simplescreenrecorder;
     license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = [ maintainers.goibhniu ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c4e2e09a8..529298d1759 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4878,7 +4878,7 @@ with pkgs;
 
   simpleproxy = callPackage ../tools/networking/simpleproxy { };
 
-  simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
+  simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { };
 
   sipsak = callPackage ../tools/networking/sipsak { };
 
-- 
GitLab


From 40226e647e5481f8276f2265207d262d4ab750ea Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 3 May 2018 11:25:19 +0200
Subject: [PATCH 0139/1085] shutter: wrap `XDG_DATA_DIRS` with
 `hicolor-icon-theme`

When opening `shutter` it adds an indicator icon to the status bar.
However this doesn't happen (and an ugly default icon will be used) if
`shutter` can't find the `hicolor-icon-theme`. In such a case a warning
like this can be found in `stderr`:

```
Gtk-WARNING **: Could not find the icon 'image-png'. The 'hicolor' theme
was not found either, perhaps you need to install it.
```

As I don't think that we should force users to install this theme
globally and several other packages including `tor-browser`, `gparted`
or `clawsmail` add `hicolor-icon-theme` to their closure this seems to
be a fair measure.
---
 pkgs/applications/graphics/shutter/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 2cc127a3fc6..3bc814e1e75 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }:
+{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
+, hicolor-icon-theme
+}:
 
 let
   perlModules = with perlPackages;
@@ -29,6 +31,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/shutter \
       --set PERL5LIB "${stdenv.lib.makePerlPath perlModules}" \
       --prefix PATH : "${imagemagick.out}/bin" \
+      --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
   '';
 
-- 
GitLab


From 401fa33429d0265f7f300a2d933dd446ea29646e Mon Sep 17 00:00:00 2001
From: Unknown <iulian.meghea@gmail.com>
Date: Fri, 4 May 2018 23:59:46 +0300
Subject: [PATCH 0140/1085] Upgrade gitkraken to 3.6.0

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

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 1e29b458a31..cf68da44a5f 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "3.4.0";
+  version = "3.6.0";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "0jj3a02bz30xa7p4migyhvxd9s0cllymsp1rdh2pbh40p79g1fp1";
+    sha256 = "0zrxw7rrlspm3ic847dy1ly4rlcdkizdr6m8nycmrxg4s98yxkb8";
   };
 
   libPath = makeLibraryPath [
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
 
     find $out/share/gitkraken -name "*.node" -exec patchelf --set-rpath "${libPath}:$out/share/gitkraken" {} \;
 
-    rm $out/bin/gitkraken
+    mkdir $out/bin
     ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken
   '';
 
-- 
GitLab


From a0502800cf4927d16285eb1a731f82b859d340e9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 May 2018 23:07:40 +0200
Subject: [PATCH 0141/1085] yubikey-personalization-gui: port to qt5

Uses QT5's `qmake` hook (http://doc.qt.io/qt-5/qmake-manual.html) to
build `yubikey-personalization-gui` with a non-90s interface.

See #33248
---
 pkgs/tools/misc/yubikey-personalization-gui/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
index e6a1c93d2bb..d507816dbd3 100644
--- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt4, qmake4Hook, libyubikey }:
+{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }:
 
 stdenv.mkDerivation rec {
   name = "yubikey-personalization-gui-3.1.25";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8";
   };
 
-  nativeBuildInputs = [ pkgconfig qmake4Hook ];
-  buildInputs = [ yubikey-personalization qt4 libyubikey ];
+  nativeBuildInputs = [ pkgconfig qmake ];
+  buildInputs = [ yubikey-personalization qtbase libyubikey ];
   
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52a3c0619fe..3dc6294d3e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11994,7 +11994,7 @@ with pkgs;
     libusb = libusb1;
   };
 
-  yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { };
+  yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { };
 
   zeitgeist = callPackage ../development/libraries/zeitgeist { };
 
-- 
GitLab


From b41ede5e3a398683d5722b7c0503e019a365d222 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 4 May 2018 23:10:21 +0200
Subject: [PATCH 0142/1085] libgdiplus: remove conflicting libungif that causes
 segfaults when opening a GIF file

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

diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index f84cc677d16..d3a21ee7fa2 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig
-, libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer
+, libtiff, giflib, libjpeg, libpng, monoDLLFixer
 , libXrender, libexif }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   patchFlags = "-p0";
 
   buildInputs =
-    [ pkgconfig glib cairo fontconfig libtiff giflib libungif
+    [ pkgconfig glib cairo fontconfig libtiff giflib
       libjpeg libpng libXrender libexif
     ]
     ++ stdenv.lib.optional stdenv.isDarwin Carbon;
-- 
GitLab


From 5deb50c038a40d9331be0359c84b0e3ade78db9d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 4 May 2018 23:22:09 +0200
Subject: [PATCH 0143/1085] firefox-bin: remove unneeded GStreamer dependency

---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 97ce7d06c41..6b2bb541a3a 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -12,8 +12,6 @@
 , gdk_pixbuf
 , glib
 , glibc
-, gst-plugins-base
-, gstreamer
 , gtk2
 , gtk3
 , kerberos
@@ -98,8 +96,6 @@ stdenv.mkDerivation {
       gdk_pixbuf
       glib
       glibc
-      gst-plugins-base
-      gstreamer
       gtk2
       gtk3
       kerberos
-- 
GitLab


From 0b2b174bbaf84e4065f05c8f4a9168ed1a62539a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 5 May 2018 00:00:59 +0200
Subject: [PATCH 0144/1085] qstopmotion: remove unnecessary gstreamer
 dependency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to 2.3.1 release notes: “All gstreamer grabber are removed from the application. The reason is the end of the support for gstreamer 0.10 in many distributions.”
---
 pkgs/applications/video/qstopmotion/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index 2454044bb48..a689697e0a0 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -1,6 +1,5 @@
-{ 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
+{ stdenv, fetchurl, qt5, ffmpeg, guvcview, automoc4
+, cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils
 , libv4l, pcre }:
 
 stdenv.mkDerivation rec {
@@ -13,11 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf";
   };
 
-  buildInputs = [ qt5.qtbase gstreamer gstreamermm gst_plugins_bad gst_plugins_good
-                  gst_plugins_base ffmpeg guvcview v4l_utils libv4l pcre
-		];
+  buildInputs = [ qt5.qtbase ffmpeg guvcview v4l_utils libv4l pcre ];
 
-  nativeBuildInputs = [ pkgconfig cmake gettext libgphoto2 gphoto2 libxml2 libv4l ];
+  nativeBuildInputs = [ pkgconfig cmake ninja gettext libgphoto2 gphoto2 libxml2 libv4l ];
 
   meta = with stdenv.lib; {
     homepage = http://www.qstopmotion.org;
-- 
GitLab


From ee270fe647e2dd5f21028dbf5a1f9213a627a149 Mon Sep 17 00:00:00 2001
From: Brandon Elam Barker <beb82@cornell.edu>
Date: Fri, 4 May 2018 22:02:55 +0000
Subject: [PATCH 0145/1085] confirmed git-secrets is now working

---
 .../version-management/git-and-tools/default.nix    |  2 ++
 .../git-and-tools/git-secrets/default.nix           | 13 +++++++++----
 pkgs/top-level/all-packages.nix                     |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 2bd8697c8ec..13b861d0a9e 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -89,6 +89,8 @@ rec {
 
   git-secret = callPackage ./git-secret { };
 
+  git-secrets = callPackage ./git-secrets { };
+
   git-stree = callPackage ./git-stree { };
 
   git2cl = callPackage ./git2cl { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
index ac4d2e474b2..14026df8185 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
@@ -10,20 +10,25 @@ in stdenv.mkDerivation {
   src = fetchFromGitHub {
     inherit repo;
     owner = "awslabs";
-    rev = "v${version}";
+    rev = "${version}";
     sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg";
   };
 
-  buildInputs = [ makeWrapper ];
+  buildInputs = [ makeWrapper git];
 
+  # buildPhase = ''
+  #  make man # TODO: need rst2man.py
+  # '';
+  
   installPhase = ''
     install -D git-secrets $out/bin/git-secrets
 
     wrapProgram $out/bin/git-secrets \
       --prefix PATH : "${lib.makeBinPath [ git ]}"
 
-    mkdir $out/share
-    cp -r man $out/share
+    # TODO: see above note on rst2man.py
+    # mkdir $out/share
+    # cp -r man $out/share
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a37de17c696..9811f33c310 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15969,7 +15969,7 @@ with pkgs;
 
   gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});
 
-  inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret transcrypt git-crypt;
+  inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt;
 
   gitMinimal = git.override {
     withManual = false;
-- 
GitLab


From f039bf9abc91ec812f66126dc54a05d8a84a95f2 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 5 May 2018 00:22:18 +0200
Subject: [PATCH 0146/1085] panamax: remove packages, module and test

was broken and depends on (deprecated) fleet
packages: panamax_api, panamax_ui
---
 nixos/modules/misc/ids.nix                    |   4 +-
 nixos/modules/module-list.nix                 |   1 -
 nixos/modules/services/cluster/panamax.nix    | 156 ----
 nixos/release.nix                             |   1 -
 nixos/tests/panamax.nix                       |  21 -
 .../networking/cluster/panamax/api/Gemfile    |  23 -
 .../cluster/panamax/api/Gemfile.lock          | 164 ----
 .../cluster/panamax/api/default.nix           |  74 --
 .../networking/cluster/panamax/api/gemset.nix | 568 -------------
 .../networking/cluster/panamax/ui/Gemfile     |  31 -
 .../cluster/panamax/ui/Gemfile.lock           | 226 -----
 .../networking/cluster/panamax/ui/default.nix |  72 --
 .../networking/cluster/panamax/ui/gemset.nix  | 789 ------------------
 pkgs/top-level/all-packages.nix               |   3 -
 14 files changed, 2 insertions(+), 2131 deletions(-)
 delete mode 100644 nixos/modules/services/cluster/panamax.nix
 delete mode 100644 nixos/tests/panamax.nix
 delete mode 100644 pkgs/applications/networking/cluster/panamax/api/Gemfile
 delete mode 100644 pkgs/applications/networking/cluster/panamax/api/Gemfile.lock
 delete mode 100644 pkgs/applications/networking/cluster/panamax/api/default.nix
 delete mode 100644 pkgs/applications/networking/cluster/panamax/api/gemset.nix
 delete mode 100644 pkgs/applications/networking/cluster/panamax/ui/Gemfile
 delete mode 100644 pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock
 delete mode 100644 pkgs/applications/networking/cluster/panamax/ui/default.nix
 delete mode 100644 pkgs/applications/networking/cluster/panamax/ui/gemset.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0ed820a32ac..7a538210d10 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -190,7 +190,7 @@
       cadvisor = 167;
       nylon = 168;
       apache-kafka = 169;
-      panamax = 170;
+      #panamax = 170; # unused
       exim = 172;
       #fleet = 173; # unused
       #input = 174; # unused
@@ -473,7 +473,7 @@
       #chronos = 164; # unused
       gitlab = 165;
       nylon = 168;
-      panamax = 170;
+      #panamax = 170; # unused
       exim = 172;
       fleet = 173;
       input = 174;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 505c5497d36..6f6a81bbda8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -174,7 +174,6 @@
   ./services/cluster/kubernetes/default.nix
   ./services/cluster/kubernetes/dns.nix
   ./services/cluster/kubernetes/dashboard.nix
-  ./services/cluster/panamax.nix
   ./services/computing/boinc/client.nix
   ./services/computing/torque/server.nix
   ./services/computing/torque/mom.nix
diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix
deleted file mode 100644
index 4475e8d8c24..00000000000
--- a/nixos/modules/services/cluster/panamax.nix
+++ /dev/null
@@ -1,156 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.panamax;
-
-  panamax_api = pkgs.panamax_api.override { dataDir = cfg.dataDir + "/api"; };
-  panamax_ui = pkgs.panamax_ui.override { dataDir = cfg.dataDir + "/ui"; };
-
-in {
-
-  ##### Interface
-  options.services.panamax = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to enable Panamax service.
-      '';
-    };
-
-    UIPort = mkOption {
-      type = types.int;
-      default = 8888;
-      description = ''
-        Panamax UI listening port.
-      '';
-    };
-
-    APIPort = mkOption {
-      type = types.int;
-      default = 3000;
-      description = ''
-        Panamax UI listening port.
-      '';
-    };
-
-    dataDir = mkOption {
-      type = types.str;
-      default = "/var/lib/panamax";
-      description = ''
-        Data dir for Panamax.
-      '';
-    };
-
-    fleetctlEndpoint = mkOption {
-      type = types.str;
-      default = "http://127.0.0.1:2379";
-      description = ''
-        Panamax fleetctl endpoint.
-      '';
-    };
-
-    journalEndpoint = mkOption {
-      type = types.str;
-      default = "http://127.0.0.1:19531";
-      description = ''
-        Panamax journal endpoint.
-      '';
-    };
-
-    secretKey = mkOption {
-      type = types.str;
-      default = "SomethingVeryLong.";
-      description = ''
-        Panamax secret key (do change this).
-      '';
-    };
-
-  };
-
-  ##### Implementation
-  config = mkIf cfg.enable {
-    systemd.services.panamax-api = {
-      description = "Panamax API";
-
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "fleet.service" "etcd.service" "docker.service" ];
-
-      path = [ panamax_api ];
-      environment = {
-        RAILS_ENV = "production";
-        JOURNAL_ENDPOINT = cfg.journalEndpoint;
-        FLEETCTL_ENDPOINT = cfg.fleetctlEndpoint;
-        PANAMAX_DATABASE_PATH = "${cfg.dataDir}/api/db/mnt/db.sqlite3";
-      };
-
-      preStart = ''
-        rm -rf ${cfg.dataDir}/state/tmp
-        mkdir -p ${cfg.dataDir}/api/{db/mnt,state/log,state/tmp}
-        ln -sf ${panamax_api}/share/panamax-api/_db/{schema.rb,seeds.rb,migrate} ${cfg.dataDir}/api/db/
-
-        if [ ! -f ${cfg.dataDir}/.created ]; then
-          bundle exec rake db:setup
-          bundle exec rake db:seed
-          bundle exec rake panamax:templates:load || true
-          touch ${cfg.dataDir}/.created
-        else
-          bundle exec rake db:migrate
-        fi
-      '';
-
-      serviceConfig = {
-        ExecStart = "${panamax_api}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.APIPort}";
-        User = "panamax";
-        Group = "panamax";
-      };
-    };
-
-    systemd.services.panamax-ui = {
-      description = "Panamax UI";
-
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "panamax_api.service" ];
-
-      path = [ panamax_ui ];
-      environment = {
-        RAILS_ENV = "production";
-        JOURNAL_ENDPOINT = cfg.journalEndpoint;
-        PMX_API_PORT_3000_TCP_ADDR = "localhost";
-        PMX_API_PORT_3000_TCP_PORT = toString cfg.APIPort;
-        SECRET_KEY_BASE = cfg.secretKey;
-      };
-
-      preStart = ''
-        mkdir -p ${cfg.dataDir}/ui/state/{log,tmp}
-        chown -R panamax:panamax ${cfg.dataDir}
-      '';
-
-      serviceConfig = {
-        ExecStart = "${panamax_ui}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.UIPort}";
-        User = "panamax";
-        Group = "panamax";
-        PermissionsStartOnly = true;
-      };
-    };
-
-    users.extraUsers.panamax =
-    { uid = config.ids.uids.panamax;
-      description = "Panamax user";
-      createHome = true;
-      home = cfg.dataDir;
-      extraGroups = [ "docker" ];
-    };
-
-    services.journald.enableHttpGateway = mkDefault true;
-    services.fleet.enable = mkDefault true;
-    services.cadvisor.enable = mkDefault true;
-    services.cadvisor.port = mkDefault 3002;
-    virtualisation.docker.enable = mkDefault true;
-
-    environment.systemPackages = [ panamax_api panamax_ui ];
-    users.extraGroups.panamax.gid = config.ids.gids.panamax;
-  };
-}
diff --git a/nixos/release.nix b/nixos/release.nix
index 5b6640f1d3c..ebe23ebed02 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -360,7 +360,6 @@ in rec {
   tests.openldap = callTest tests/openldap.nix {};
   tests.owncloud = callTest tests/owncloud.nix {};
   tests.pam-oath-login = callTest tests/pam-oath-login.nix {};
-  #tests.panamax = callTestOnMatchingSystems ["x86_64-linux"] tests/panamax.nix {};
   tests.peerflix = callTest tests/peerflix.nix {};
   tests.php-pcre = callTest tests/php-pcre.nix {};
   tests.postgresql = callSubTests tests/postgresql.nix {};
diff --git a/nixos/tests/panamax.nix b/nixos/tests/panamax.nix
deleted file mode 100644
index 088aa79f8c6..00000000000
--- a/nixos/tests/panamax.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "panamax";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ offline ];
-  };
-
-  machine = { config, pkgs, ... }: {
-    services.panamax.enable = true;
-  };
-
-  testScript =
-    ''
-      startAll;
-      $machine->waitForUnit("panamax-api.service");
-      $machine->waitForUnit("panamax-ui.service");
-      $machine->waitForOpenPort(3000);
-      $machine->waitForOpenPort(8888);
-      $machine->succeed("curl --fail http://localhost:8888/ > /dev/null");
-      $machine->shutdown;
-    '';
-})
diff --git a/pkgs/applications/networking/cluster/panamax/api/Gemfile b/pkgs/applications/networking/cluster/panamax/api/Gemfile
deleted file mode 100644
index 82085aa6db0..00000000000
--- a/pkgs/applications/networking/cluster/panamax/api/Gemfile
+++ /dev/null
@@ -1,23 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '4.1.7'
-gem 'puma', '2.8.2'
-gem 'sqlite3', '1.3.9'
-gem 'faraday_middleware', '0.9.0'
-gem 'docker-api', '1.13.0', require: 'docker'
-gem 'fleet-api', '0.6.0', require: 'fleet'
-gem 'active_model_serializers', '0.9.0'
-gem 'octokit', '3.2.0'
-gem 'kmts', '2.0.1'
-
-group :test, :development do
-  gem 'rspec-rails'
-  gem 'its'
-end
-
-group :test do
-  gem 'coveralls', '0.7.0'
-  gem 'shoulda-matchers', '2.6.1'
-  gem 'database_cleaner', '1.3.0'
-  gem 'webmock', '1.20.0'
-end
diff --git a/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock
deleted file mode 100644
index 597c691700a..00000000000
--- a/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock
+++ /dev/null
@@ -1,164 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    active_model_serializers (0.9.0)
-      activemodel (>= 3.2)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
-      builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
-      arel (~> 5.0.0)
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    archive-tar-minitar (0.5.2)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    database_cleaner (1.3.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    docker-api (1.13.0)
-      archive-tar-minitar
-      excon (>= 0.37.0)
-      json
-    erubis (2.7.0)
-    excon (0.37.0)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    fleet-api (0.6.0)
-      faraday (= 0.8.9)
-      faraday_middleware (= 0.9.0)
-    hike (1.2.3)
-    i18n (0.7.0)
-    its (0.2.0)
-      rspec-core
-    json (1.8.1)
-    kmts (2.0.1)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
-    minitest (5.5.1)
-    multi_json (1.10.1)
-    multipart-post (1.2.0)
-    octokit (3.2.0)
-      sawyer (~> 0.5.3)
-    puma (2.8.2)
-      rack (>= 1.1, < 2.0)
-    rack (1.5.2)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.1.7)
-      actionmailer (= 4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      activemodel (= 4.1.7)
-      activerecord (= 4.1.7)
-      activesupport (= 4.1.7)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.7)
-      sprockets-rails (~> 2.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    safe_yaml (1.0.4)
-    sawyer (0.5.4)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    shoulda-matchers (2.6.1)
-      activesupport (>= 3.0.0)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.9)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tins (1.3.0)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    webmock (1.20.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_model_serializers (= 0.9.0)
-  coveralls (= 0.7.0)
-  database_cleaner (= 1.3.0)
-  docker-api (= 1.13.0)
-  faraday_middleware (= 0.9.0)
-  fleet-api (= 0.6.0)
-  its
-  kmts (= 2.0.1)
-  octokit (= 3.2.0)
-  puma (= 2.8.2)
-  rails (= 4.1.7)
-  rspec-rails
-  shoulda-matchers (= 2.6.1)
-  sqlite3 (= 1.3.9)
-  webmock (= 1.20.0)
diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix
deleted file mode 100644
index 1c2e2ccac27..00000000000
--- a/pkgs/applications/networking/cluster/panamax/api/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler
-, ruby, libxslt, libxml2, sqlite, openssl, docker
-, dataDir ? "/var/lib/panamax-api" }@args:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "panamax-api-${version}";
-  version = "0.2.16";
-
-  env = bundlerEnv {
-    name = "panamax-api-gems-${version}";
-    inherit ruby;
-    gemdir = ./.;
-  };
-
-  bundler = args.bundler.override { inherit ruby; };
-
-  database_yml = builtins.toFile "database.yml" ''
-    production:
-      adapter: sqlite3
-      database: <%= ENV["PANAMAX_DATABASE_PATH"] || "${dataDir}/db/mnt/db.sqlite3" %>
-      timeout: 5000
-  '';
-
-  src = fetchgit {
-    rev = "refs/tags/v${version}";
-    url = "git://github.com/CenturyLinkLabs/panamax-api";
-    sha256 = "0dqg0fbmy5cgjh0ql8yqlybhjyyrslgghjrc24wjhd1rghjn2qi6";
-  };
-
-  buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ];
-
-  setSourceRoot = ''
-    mkdir -p $out/share
-    cp -R panamax-api $out/share/panamax-api
-    export sourceRoot="$out/share/panamax-api"
-  '';
-
-  postPatch = ''
-    find . -type f -exec sed -e 's|/usr/bin/docker|${docker}/bin/docker|g' -i "{}" \;
-  '';
-
-  configurePhase = ''
-    export HOME=$PWD
-    export GEM_HOME=${env}/${env.ruby.gemPath}
-    export RAILS_ENV=production
-
-    ln -sf ${database_yml} config/database.yml
-  '';
-
-  installPhase = ''
-    rm -rf log tmp
-    mv ./db ./_db
-    ln -sf ${dataDir}/{db,state/log,state/tmp} .
-
-    mkdir -p $out/bin
-    makeWrapper bin/bundle "$out/bin/bundle" \
-      --run "cd $out/share/panamax-api" \
-      --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \
-      --prefix "HOME" : "$out/share/panamax-api" \
-      --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \
-      --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}"
-  '';
-
-  meta = with stdenv.lib; {
-    broken = true; # needs ruby 2.1
-    homepage = https://github.com/CenturyLinkLabs/panamax-api;
-    description = "The API behind The Panamax UI";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ matejc offline ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/cluster/panamax/api/gemset.nix b/pkgs/applications/networking/cluster/panamax/api/gemset.nix
deleted file mode 100644
index 8182543a2bb..00000000000
--- a/pkgs/applications/networking/cluster/panamax/api/gemset.nix
+++ /dev/null
@@ -1,568 +0,0 @@
-{
-  "actionmailer" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "0qjv5akjbpgd4cx518k522mssvc3y3nki65hi6fj5nbzi7a6rwq5";
-    };
-    dependencies = [
-      "actionpack"
-      "actionview"
-      "mail"
-    ];
-  };
-  "actionpack" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "07y1ny00h69xklq260smyl5md052f617gqrzkyw5sxafs5z25zax";
-    };
-    dependencies = [
-      "actionview"
-      "activesupport"
-      "rack"
-      "rack-test"
-    ];
-  };
-  "actionview" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "06sp37gfpn2jn7j6vlpp1y6vfi5kig60vyvixrjhyz0g4vgm13ax";
-    };
-    dependencies = [
-      "activesupport"
-      "builder"
-      "erubis"
-    ];
-  };
-  "active_model_serializers" = {
-    version = "0.9.0";
-    source = {
-      type = "gem";
-      sha256 = "1ws3gx3wwlm17w7k0agwzmcmww6627lvqaqm828lzm3g1xqilkkl";
-    };
-    dependencies = [
-      "activemodel"
-    ];
-  };
-  "activemodel" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "0rlqzz25l7vsphgkilg80kmk20d9h357awi27ax6zzb9klkqh0jr";
-    };
-    dependencies = [
-      "activesupport"
-      "builder"
-    ];
-  };
-  "activerecord" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "0j4r0m32mjbwmz9gs8brln35jzr1cn7h585ggj0w0f1ai4hjsby5";
-    };
-    dependencies = [
-      "activemodel"
-      "activesupport"
-      "arel"
-    ];
-  };
-  "activesupport" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "13i3mz66d5kp5y39gjwmcfqv0wb6mxm5k1nnz40wvd38dsf7n3bs";
-    };
-    dependencies = [
-      "i18n"
-      "json"
-      "minitest"
-      "thread_safe"
-      "tzinfo"
-    ];
-  };
-  "addressable" = {
-    version = "2.3.6";
-    source = {
-      type = "gem";
-      sha256 = "137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8";
-    };
-  };
-  "archive-tar-minitar" = {
-    version = "0.5.2";
-    source = {
-      type = "gem";
-      sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig";
-    };
-  };
-  "arel" = {
-    version = "5.0.1.20140414130214";
-    source = {
-      type = "gem";
-      sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9";
-    };
-  };
-  "builder" = {
-    version = "3.2.2";
-    source = {
-      type = "gem";
-      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
-    };
-  };
-  "coveralls" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4";
-    };
-    dependencies = [
-      "multi_json"
-      "rest-client"
-      "simplecov"
-      "term-ansicolor"
-      "thor"
-    ];
-  };
-  "crack" = {
-    version = "0.4.2";
-    source = {
-      type = "gem";
-      sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a";
-    };
-    dependencies = [
-      "safe_yaml"
-    ];
-  };
-  "database_cleaner" = {
-    version = "1.3.0";
-    source = {
-      type = "gem";
-      sha256 = "19w25yda684pg29bggq26wy4lpyjvzscwg2hx3hmmmpysiwfnxgn";
-    };
-  };
-  "diff-lcs" = {
-    version = "1.2.5";
-    source = {
-      type = "gem";
-      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
-    };
-  };
-  "docile" = {
-    version = "1.1.5";
-    source = {
-      type = "gem";
-      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
-    };
-  };
-  "docker-api" = {
-    version = "1.13.0";
-    source = {
-      type = "gem";
-      sha256 = "1rara27gn7lxaf12dqkx8s1clssg10jndfcy4wz2fv6ms1i1lnp6";
-    };
-    dependencies = [
-      "archive-tar-minitar"
-      "excon"
-      "json"
-    ];
-  };
-  "erubis" = {
-    version = "2.7.0";
-    source = {
-      type = "gem";
-      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
-    };
-  };
-  "excon" = {
-    version = "0.37.0";
-    source = {
-      type = "gem";
-      sha256 = "05x7asmsq5m419n1lhzk9bic02gwng4cqmrcqsfnd6kmkwm8csv2";
-    };
-  };
-  "faraday" = {
-    version = "0.8.9";
-    source = {
-      type = "gem";
-      sha256 = "17d79fsgx0xwh0mfxyz5pbr435qlw79phlfvifc546w2axdkp718";
-    };
-    dependencies = [
-      "multipart-post"
-    ];
-  };
-  "faraday_middleware" = {
-    version = "0.9.0";
-    source = {
-      type = "gem";
-      sha256 = "1kwvi2sdxd6j764a7q5iir73dw2v6816zx3l8cgfv0wr2m47icq2";
-    };
-    dependencies = [
-      "faraday"
-    ];
-  };
-  "fleet-api" = {
-    version = "0.6.0";
-    source = {
-      type = "gem";
-      sha256 = "0136mzc0fxp6mzh38n6xbg87cw9g9vq1nrlr3ylazbflvmlxgan6";
-    };
-    dependencies = [
-      "faraday"
-      "faraday_middleware"
-    ];
-  };
-  "hike" = {
-    version = "1.2.3";
-    source = {
-      type = "gem";
-      sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm";
-    };
-  };
-  "i18n" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
-    };
-  };
-  "its" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g";
-    };
-    dependencies = [
-      "rspec-core"
-    ];
-  };
-  "json" = {
-    version = "1.8.1";
-    source = {
-      type = "gem";
-      sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn";
-    };
-  };
-  "kmts" = {
-    version = "2.0.1";
-    source = {
-      type = "gem";
-      sha256 = "1wk680q443lg35a25am6i8xawf16iqg5xnq1m8xd2gib4dsy1d8v";
-    };
-  };
-  "mail" = {
-    version = "2.6.3";
-    source = {
-      type = "gem";
-      sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
-    };
-    dependencies = [
-      "mime-types"
-    ];
-  };
-  "mime-types" = {
-    version = "2.4.3";
-    source = {
-      type = "gem";
-      sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq";
-    };
-  };
-  "minitest" = {
-    version = "5.5.1";
-    source = {
-      type = "gem";
-      sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn";
-    };
-  };
-  "multi_json" = {
-    version = "1.10.1";
-    source = {
-      type = "gem";
-      sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c";
-    };
-  };
-  "multipart-post" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc";
-    };
-  };
-  "octokit" = {
-    version = "3.2.0";
-    source = {
-      type = "gem";
-      sha256 = "07ll3x1hv72zssb4hkdw56xg3xk6x4fch4yf38zljvbh388r11ng";
-    };
-    dependencies = [
-      "sawyer"
-    ];
-  };
-  "puma" = {
-    version = "2.8.2";
-    source = {
-      type = "gem";
-      sha256 = "1l57fmf8vyxfjv7ab5znq0k339cym5ghnm5xxfvd1simjp73db0k";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rack" = {
-    version = "1.5.2";
-    source = {
-      type = "gem";
-      sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6";
-    };
-  };
-  "rack-test" = {
-    version = "0.6.3";
-    source = {
-      type = "gem";
-      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rails" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "059mpljplmhfz8rr4hk40q67fllcpsy809m4mwwbkm8qwif2z5r0";
-    };
-    dependencies = [
-      "actionmailer"
-      "actionpack"
-      "actionview"
-      "activemodel"
-      "activerecord"
-      "activesupport"
-      "railties"
-      "sprockets-rails"
-    ];
-  };
-  "railties" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "1n08h0rgj0aq5lvslnih6lvqz9wadpz6nnb25i4qhp37fhhyz9yz";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "rake"
-      "thor"
-    ];
-  };
-  "rake" = {
-    version = "10.4.0";
-    source = {
-      type = "gem";
-      sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8";
-    };
-  };
-  "rest-client" = {
-    version = "1.6.7";
-    source = {
-      type = "gem";
-      sha256 = "0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853";
-    };
-    dependencies = [
-      "mime-types"
-    ];
-  };
-  "rspec-core" = {
-    version = "3.1.7";
-    source = {
-      type = "gem";
-      sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9";
-    };
-    dependencies = [
-      "rspec-support"
-    ];
-  };
-  "rspec-expectations" = {
-    version = "3.1.2";
-    source = {
-      type = "gem";
-      sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh";
-    };
-    dependencies = [
-      "diff-lcs"
-      "rspec-support"
-    ];
-  };
-  "rspec-mocks" = {
-    version = "3.1.3";
-    source = {
-      type = "gem";
-      sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr";
-    };
-    dependencies = [
-      "rspec-support"
-    ];
-  };
-  "rspec-rails" = {
-    version = "3.1.0";
-    source = {
-      type = "gem";
-      sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "railties"
-      "rspec-core"
-      "rspec-expectations"
-      "rspec-mocks"
-      "rspec-support"
-    ];
-  };
-  "rspec-support" = {
-    version = "3.1.2";
-    source = {
-      type = "gem";
-      sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb";
-    };
-  };
-  "safe_yaml" = {
-    version = "1.0.4";
-    source = {
-      type = "gem";
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-    };
-  };
-  "sawyer" = {
-    version = "0.5.4";
-    source = {
-      type = "gem";
-      sha256 = "01kl4zpf0gaacnkra5nikrzfpwj8f10hsvgyzm7z2s1mz4iipx2v";
-    };
-    dependencies = [
-      "addressable"
-      "faraday"
-    ];
-  };
-  "shoulda-matchers" = {
-    version = "2.6.1";
-    source = {
-      type = "gem";
-      sha256 = "1p3jhvd4dsj6d7nbmvnqhqhpmb8pnr05pi7jv9ajwqcys8140mc1";
-    };
-    dependencies = [
-      "activesupport"
-    ];
-  };
-  "simplecov" = {
-    version = "0.9.1";
-    source = {
-      type = "gem";
-      sha256 = "06hylxlalaxxldpbaqa54gc52wxdff0fixdvjyzr6i4ygxwzr7yf";
-    };
-    dependencies = [
-      "docile"
-      "multi_json"
-      "simplecov-html"
-    ];
-  };
-  "simplecov-html" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9";
-    };
-  };
-  "sprockets" = {
-    version = "2.12.3";
-    source = {
-      type = "gem";
-      sha256 = "1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2";
-    };
-    dependencies = [
-      "hike"
-      "multi_json"
-      "rack"
-      "tilt"
-    ];
-  };
-  "sprockets-rails" = {
-    version = "2.2.4";
-    source = {
-      type = "gem";
-      sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "sprockets"
-    ];
-  };
-  "sqlite3" = {
-    version = "1.3.9";
-    source = {
-      type = "gem";
-      sha256 = "07m6a6flmyyi0rkg0j7x1a9861zngwjnximfh95cli2zzd57914r";
-    };
-  };
-  "term-ansicolor" = {
-    version = "1.3.0";
-    source = {
-      type = "gem";
-      sha256 = "1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b";
-    };
-    dependencies = [
-      "tins"
-    ];
-  };
-  "thor" = {
-    version = "0.19.1";
-    source = {
-      type = "gem";
-      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
-    };
-  };
-  "thread_safe" = {
-    version = "0.3.4";
-    source = {
-      type = "gem";
-      sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n";
-    };
-  };
-  "tilt" = {
-    version = "1.4.1";
-    source = {
-      type = "gem";
-      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
-    };
-  };
-  "tins" = {
-    version = "1.3.0";
-    source = {
-      type = "gem";
-      sha256 = "1yxa5kyp9mw4w866wlg7c32ingzqxnzh3ir9yf06pwpkmq3mrbdi";
-    };
-  };
-  "tzinfo" = {
-    version = "1.2.2";
-    source = {
-      type = "gem";
-      sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
-    };
-    dependencies = [
-      "thread_safe"
-    ];
-  };
-  "webmock" = {
-    version = "1.20.0";
-    source = {
-      type = "gem";
-      sha256 = "0bl5v0xzcj24lx7xpsnywv3liqnqb5lfxysmmfb2fgi0n8586i6m";
-    };
-    dependencies = [
-      "addressable"
-      "crack"
-    ];
-  };
-}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile b/pkgs/applications/networking/cluster/panamax/ui/Gemfile
deleted file mode 100644
index 6f7dc59d04d..00000000000
--- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile
+++ /dev/null
@@ -1,31 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '4.1.7'
-gem 'puma', '2.8.2'
-gem 'sass', '3.3.9'
-gem 'therubyracer', '0.12.1', platforms: :ruby
-gem 'haml', '4.0.5'
-gem 'uglifier', '2.5.1'
-gem 'ctl_base_ui'
-gem 'activeresource', '4.0.0'
-gem 'kramdown', '1.4.0'
-gem 'zeroclipboard-rails'
-
-
-group :test, :development do
-  gem 'rspec-rails'
-  gem 'its'
-  gem 'capybara'
-  gem 'teaspoon'
-  gem 'phantomjs'
-  gem 'dotenv-rails', '0.11.1'
-  gem 'pry'
-  gem 'pry-byebug'
-  gem 'pry-stack_explorer'
-end
-
-group :test do
-  gem 'webmock'
-  gem 'sinatra', '1.4.5'
-  gem 'coveralls', '0.7.0'
-end
diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock
deleted file mode 100644
index b273595bbb0..00000000000
--- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock
+++ /dev/null
@@ -1,226 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
-      builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
-      arel (~> 5.0.0)
-    activeresource (4.0.0)
-      activemodel (~> 4.0)
-      activesupport (~> 4.0)
-      rails-observers (~> 0.1.1)
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    arel (5.0.1.20140414130214)
-    binding_of_caller (0.7.2)
-      debug_inspector (>= 0.0.1)
-    builder (3.2.2)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    coderay (1.1.0)
-    columnize (0.8.9)
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    ctl_base_ui (0.0.5)
-      haml (~> 4.0)
-      jquery-rails (~> 3.1)
-      jquery-ui-rails (~> 4.2)
-      rails (~> 4.1)
-      sass (~> 3.3)
-    debug_inspector (0.0.2)
-    debugger-linecache (1.2.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    dotenv (0.11.1)
-      dotenv-deployment (~> 0.0.2)
-    dotenv-deployment (0.0.2)
-    dotenv-rails (0.11.1)
-      dotenv (= 0.11.1)
-    erubis (2.7.0)
-    execjs (2.2.2)
-    haml (4.0.5)
-      tilt
-    hike (1.2.3)
-    i18n (0.7.0)
-    its (0.2.0)
-      rspec-core
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.2.1)
-      railties (>= 3.2.16)
-    json (1.8.2)
-    kramdown (1.4.0)
-    libv8 (3.16.14.11)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    method_source (0.8.2)
-    mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.5.1)
-    multi_json (1.10.1)
-    netrc (0.8.0)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    phantomjs (1.9.7.1)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (2.0.0)
-      byebug (~> 3.4)
-      pry (~> 0.10)
-    pry-stack_explorer (0.4.9.1)
-      binding_of_caller (>= 0.7)
-      pry (>= 0.9.11)
-    puma (2.8.2)
-      rack (>= 1.1, < 2.0)
-    rack (1.5.2)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.1.7)
-      actionmailer (= 4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      activemodel (= 4.1.7)
-      activerecord (= 4.1.7)
-      activesupport (= 4.1.7)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.7)
-      sprockets-rails (~> 2.0)
-    rails-observers (0.1.2)
-      activemodel (~> 4.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.0)
-    ref (1.0.5)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    safe_yaml (1.0.4)
-    sass (3.3.9)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    slop (3.6.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    teaspoon (0.8.0)
-      railties (>= 3.2.5, < 5)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    therubyracer (0.12.1)
-      libv8 (~> 3.16.14.0)
-      ref
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tins (1.3.3)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    uglifier (2.5.1)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    webmock (1.20.4)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-    zeroclipboard-rails (0.1.0)
-      railties (>= 3.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activeresource (= 4.0.0)
-  capybara
-  coveralls (= 0.7.0)
-  ctl_base_ui
-  dotenv-rails (= 0.11.1)
-  haml (= 4.0.5)
-  its
-  kramdown (= 1.4.0)
-  phantomjs
-  pry
-  pry-byebug
-  pry-stack_explorer
-  puma (= 2.8.2)
-  rails (= 4.1.7)
-  rspec-rails
-  sass (= 3.3.9)
-  sinatra (= 1.4.5)
-  teaspoon
-  therubyracer (= 0.12.1)
-  uglifier (= 2.5.1)
-  webmock
-  zeroclipboard-rails
diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix
deleted file mode 100644
index 2f60942f014..00000000000
--- a/pkgs/applications/networking/cluster/panamax/ui/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler
-, ruby, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}@args:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "panamax-ui-${version}";
-  version = "0.2.14";
-
-  env = bundlerEnv {
-    name = "panamax-ui-gems-${version}";
-    inherit ruby;
-    gemdir = ./.;
-  };
-
-  bundler = args.bundler.override { inherit ruby; };
-
-  src = fetchgit {
-    rev = "refs/tags/v${version}";
-    url = "git://github.com/CenturyLinkLabs/panamax-ui";
-    sha256 = "01k0h0rjqp5arvwxm2xpfxjsag5qw0qqlg7hx4v8f6jsyc4wmjfl";
-  };
-
-  buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ];
-
-  setSourceRoot = ''
-    mkdir -p $out/share
-    cp -R panamax-ui $out/share/panamax-ui
-    export sourceRoot="$out/share/panamax-ui"
-  '';
-
-  postPatch = ''
-    find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Journal|NixOS Journal|g' -i "{}" \;
-    find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Local|NixOS Local|g' -i "{}" \;
-    find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Host|NixOS Host|g' -i "{}" \;
-    sed -e 's|CoreOS Local|NixOS Local|g' -i "spec/features/manage_application_spec.rb"
-    # fix libv8 dependency
-    substituteInPlace Gemfile.lock --replace "3.16.14.7" "3.16.14.11"
-  '';
-
-  configurePhase = ''
-    export HOME=$PWD
-    export GEM_HOME=${env}/${env.ruby.gemPath}
-  '';
-
-  buildPhase = ''
-    rm -f ./bin/*
-    bundle exec rake rails:update:bin
-  '';
-
-  installPhase = ''
-    rm -rf log tmp db
-    ln -sf ${dataDir}/{db,state/log,state/tmp} .
-
-    mkdir -p $out/bin
-    makeWrapper bin/bundle "$out/bin/bundle" \
-      --run "cd $out/share/panamax-ui" \
-      --prefix "PATH" : "$out/share/panamax-ui/bin:${env.ruby}/bin:$PATH" \
-      --prefix "HOME" : "$out/share/panamax-ui" \
-      --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \
-      --prefix "GEM_PATH" : "$out/share/panamax-ui:${bundler}/${env.ruby.gemPath}"
-  '';
-
-  meta = with stdenv.lib; {
-    broken = true; # needs ruby 2.1
-    homepage = https://github.com/CenturyLinkLabs/panamax-ui;
-    description = "The Web GUI for Panamax";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ matejc offline ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix
deleted file mode 100644
index b41b482edb7..00000000000
--- a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix
+++ /dev/null
@@ -1,789 +0,0 @@
-{
-  "actionmailer" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "0qjv5akjbpgd4cx518k522mssvc3y3nki65hi6fj5nbzi7a6rwq5";
-    };
-    dependencies = [
-      "actionpack"
-      "actionview"
-      "mail"
-    ];
-  };
-  "actionpack" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "07y1ny00h69xklq260smyl5md052f617gqrzkyw5sxafs5z25zax";
-    };
-    dependencies = [
-      "actionview"
-      "activesupport"
-      "rack"
-      "rack-test"
-    ];
-  };
-  "actionview" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "06sp37gfpn2jn7j6vlpp1y6vfi5kig60vyvixrjhyz0g4vgm13ax";
-    };
-    dependencies = [
-      "activesupport"
-      "builder"
-      "erubis"
-    ];
-  };
-  "activemodel" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "0rlqzz25l7vsphgkilg80kmk20d9h357awi27ax6zzb9klkqh0jr";
-    };
-    dependencies = [
-      "activesupport"
-      "builder"
-    ];
-  };
-  "activerecord" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "0j4r0m32mjbwmz9gs8brln35jzr1cn7h585ggj0w0f1ai4hjsby5";
-    };
-    dependencies = [
-      "activemodel"
-      "activesupport"
-      "arel"
-    ];
-  };
-  "activeresource" = {
-    version = "4.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0fc5igjijyjzsl9q5kybkdzhc92zv8wsv0ifb0y90i632jx6d4jq";
-    };
-    dependencies = [
-      "activemodel"
-      "activesupport"
-      "rails-observers"
-    ];
-  };
-  "activesupport" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "13i3mz66d5kp5y39gjwmcfqv0wb6mxm5k1nnz40wvd38dsf7n3bs";
-    };
-    dependencies = [
-      "i18n"
-      "json"
-      "minitest"
-      "thread_safe"
-      "tzinfo"
-    ];
-  };
-  "addressable" = {
-    version = "2.3.6";
-    source = {
-      type = "gem";
-      sha256 = "137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8";
-    };
-  };
-  "arel" = {
-    version = "5.0.1.20140414130214";
-    source = {
-      type = "gem";
-      sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9";
-    };
-  };
-  "binding_of_caller" = {
-    version = "0.7.2";
-    source = {
-      type = "gem";
-      sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk";
-    };
-    dependencies = [
-      "debug_inspector"
-    ];
-  };
-  "builder" = {
-    version = "3.2.2";
-    source = {
-      type = "gem";
-      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
-    };
-  };
-  "byebug" = {
-    version = "3.5.1";
-    source = {
-      type = "gem";
-      sha256 = "0ldc2r0b316rrn2fgdgiznskj9gb0q9n60243laq7nqw9na8wdan";
-    };
-    dependencies = [
-      "columnize"
-      "debugger-linecache"
-      "slop"
-    ];
-  };
-  "capybara" = {
-    version = "2.4.4";
-    source = {
-      type = "gem";
-      sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f";
-    };
-    dependencies = [
-      "mime-types"
-      "nokogiri"
-      "rack"
-      "rack-test"
-      "xpath"
-    ];
-  };
-  "coderay" = {
-    version = "1.1.0";
-    source = {
-      type = "gem";
-      sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s";
-    };
-  };
-  "columnize" = {
-    version = "0.8.9";
-    source = {
-      type = "gem";
-      sha256 = "1f3azq8pvdaaclljanwhab78hdw40k908ma2cwk59qzj4hvf7mip";
-    };
-  };
-  "coveralls" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4";
-    };
-    dependencies = [
-      "multi_json"
-      "rest-client"
-      "simplecov"
-      "term-ansicolor"
-      "thor"
-    ];
-  };
-  "crack" = {
-    version = "0.4.2";
-    source = {
-      type = "gem";
-      sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a";
-    };
-    dependencies = [
-      "safe_yaml"
-    ];
-  };
-  "ctl_base_ui" = {
-    version = "0.0.5";
-    source = {
-      type = "gem";
-      sha256 = "1pji85xmddgld5lqx52zxi5r2kx6rsjwkqlr26bp62xb29r10x57";
-    };
-    dependencies = [
-      "haml"
-      "jquery-rails"
-      "jquery-ui-rails"
-      "rails"
-      "sass"
-    ];
-  };
-  "debug_inspector" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m";
-    };
-  };
-  "debugger-linecache" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "0iwyx190fd5vfwj1gzr8pg3m374kqqix4g4fc4qw29sp54d3fpdz";
-    };
-  };
-  "diff-lcs" = {
-    version = "1.2.5";
-    source = {
-      type = "gem";
-      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
-    };
-  };
-  "docile" = {
-    version = "1.1.5";
-    source = {
-      type = "gem";
-      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
-    };
-  };
-  "dotenv" = {
-    version = "0.11.1";
-    source = {
-      type = "gem";
-      sha256 = "09z0y0d6bks7i0sqvd8szfqj9i1kkj01anzly7shi83b3gxhrq9m";
-    };
-    dependencies = [
-      "dotenv-deployment"
-    ];
-  };
-  "dotenv-deployment" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "1ad66jq9a09qq1js8wsyil97018s7y6x0vzji0dy34gh65sbjz8c";
-    };
-  };
-  "dotenv-rails" = {
-    version = "0.11.1";
-    source = {
-      type = "gem";
-      sha256 = "0r6hif0i1lipbi7mkxx7wa5clsn65n6wyd9jry262cx396lsfrqy";
-    };
-    dependencies = [
-      "dotenv"
-    ];
-  };
-  "erubis" = {
-    version = "2.7.0";
-    source = {
-      type = "gem";
-      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
-    };
-  };
-  "execjs" = {
-    version = "2.2.2";
-    source = {
-      type = "gem";
-      sha256 = "05m41mnxn4b2p133qzbz5cy9cc5rn57aa0pp2943hxmzbk379z1f";
-    };
-  };
-  "haml" = {
-    version = "4.0.5";
-    source = {
-      type = "gem";
-      sha256 = "1xmzb0k5q271090crzmv7dbw8ss4289bzxklrc0fhw6pw3kcvc85";
-    };
-    dependencies = [
-      "tilt"
-    ];
-  };
-  "hike" = {
-    version = "1.2.3";
-    source = {
-      type = "gem";
-      sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm";
-    };
-  };
-  "i18n" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
-    };
-  };
-  "its" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g";
-    };
-    dependencies = [
-      "rspec-core"
-    ];
-  };
-  "jquery-rails" = {
-    version = "3.1.2";
-    source = {
-      type = "gem";
-      sha256 = "0h5a565i3l2mbd221m6mz9d1nr53pz19i9qxv08qr1dv0yx2pr3y";
-    };
-    dependencies = [
-      "railties"
-      "thor"
-    ];
-  };
-  "jquery-ui-rails" = {
-    version = "4.2.1";
-    source = {
-      type = "gem";
-      sha256 = "1garrnqwh35acj2pp4sp6fpm2g881h23y644lzbic2qmcrq9wd2v";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-  "json" = {
-    version = "1.8.2";
-    source = {
-      type = "gem";
-      sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5";
-    };
-  };
-  "kramdown" = {
-    version = "1.4.0";
-    source = {
-      type = "gem";
-      sha256 = "001vy0ymiwbvkdbb9wpqmswv6imliv7xim00gq6rlk0chnbiaq80";
-    };
-  };
-  libv8 = {
-    version = "3.16.14.11";
-    source = {
-      type = "gem";
-      sha256 = "000vbiy78wk5r1f6p7qncab8ldg7qw5pjz7bchn3lw700gpaacxp";
-    };
-  };
-  "mail" = {
-    version = "2.6.3";
-    source = {
-      type = "gem";
-      sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
-    };
-    dependencies = [
-      "mime-types"
-    ];
-  };
-  "method_source" = {
-    version = "0.8.2";
-    source = {
-      type = "gem";
-      sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2";
-    };
-  };
-  "mime-types" = {
-    version = "2.4.3";
-    source = {
-      type = "gem";
-      sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq";
-    };
-  };
-  "mini_portile" = {
-    version = "0.6.1";
-    source = {
-      type = "gem";
-      sha256 = "07gah4k84sar9d850v9gip9b323pw74vwwndh3bbzxpw5iiwsd3l";
-    };
-  };
-  "minitest" = {
-    version = "5.5.1";
-    source = {
-      type = "gem";
-      sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn";
-    };
-  };
-  "multi_json" = {
-    version = "1.10.1";
-    source = {
-      type = "gem";
-      sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c";
-    };
-  };
-  "netrc" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "1j4jbdvd19kq34xiqx1yqb4wmcywyrlaky8hrh09c1hz3c0v5dkb";
-    };
-  };
-  "nokogiri" = {
-    version = "1.6.5";
-    source = {
-      type = "gem";
-      sha256 = "1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l";
-    };
-    dependencies = [
-      "mini_portile"
-    ];
-  };
-  "phantomjs" = {
-    version = "1.9.7.1";
-    source = {
-      type = "gem";
-      sha256 = "14as0yzwbzvshbp1f8igjxcdxc5vbjgh0jhdvy393il084inlrl7";
-    };
-  };
-  "pry" = {
-    version = "0.10.1";
-    source = {
-      type = "gem";
-      sha256 = "1j0r5fm0wvdwzbh6d6apnp7c0n150hpm9zxpm5xvcgfqr36jaj8z";
-    };
-    dependencies = [
-      "coderay"
-      "method_source"
-      "slop"
-    ];
-  };
-  "pry-byebug" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "17b6720ci9345wkzj369ydyj6hdlg2krd26zivpd4dvaijszzgzq";
-    };
-    dependencies = [
-      "byebug"
-      "pry"
-    ];
-  };
-  "pry-stack_explorer" = {
-    version = "0.4.9.1";
-    source = {
-      type = "gem";
-      sha256 = "1828jqcfdr9nk86n15ky199vf33cfz51wkpv6kx230g0dsh9r85z";
-    };
-    dependencies = [
-      "binding_of_caller"
-      "pry"
-    ];
-  };
-  "puma" = {
-    version = "2.8.2";
-    source = {
-      type = "gem";
-      sha256 = "1l57fmf8vyxfjv7ab5znq0k339cym5ghnm5xxfvd1simjp73db0k";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rack" = {
-    version = "1.5.2";
-    source = {
-      type = "gem";
-      sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6";
-    };
-  };
-  "rack-protection" = {
-    version = "1.5.3";
-    source = {
-      type = "gem";
-      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rack-test" = {
-    version = "0.6.3";
-    source = {
-      type = "gem";
-      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rails" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "059mpljplmhfz8rr4hk40q67fllcpsy809m4mwwbkm8qwif2z5r0";
-    };
-    dependencies = [
-      "actionmailer"
-      "actionpack"
-      "actionview"
-      "activemodel"
-      "activerecord"
-      "activesupport"
-      "railties"
-      "sprockets-rails"
-    ];
-  };
-  "rails-observers" = {
-    version = "0.1.2";
-    source = {
-      type = "gem";
-      sha256 = "1lsw19jzmvipvrfy2z04hi7r29dvkfc43h43vs67x6lsj9rxwwcy";
-    };
-    dependencies = [
-      "activemodel"
-    ];
-  };
-  "railties" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "1n08h0rgj0aq5lvslnih6lvqz9wadpz6nnb25i4qhp37fhhyz9yz";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "rake"
-      "thor"
-    ];
-  };
-  "rake" = {
-    version = "10.4.0";
-    source = {
-      type = "gem";
-      sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8";
-    };
-  };
-  "ref" = {
-    version = "1.0.5";
-    source = {
-      type = "gem";
-      sha256 = "19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la";
-    };
-  };
-  "rest-client" = {
-    version = "1.7.2";
-    source = {
-      type = "gem";
-      sha256 = "0h8c0prfi2v5p8iim3wm60xc4yripc13nqwq601bfl85k4gf25i0";
-    };
-    dependencies = [
-      "mime-types"
-      "netrc"
-    ];
-  };
-  "rspec-core" = {
-    version = "3.1.7";
-    source = {
-      type = "gem";
-      sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9";
-    };
-    dependencies = [
-      "rspec-support"
-    ];
-  };
-  "rspec-expectations" = {
-    version = "3.1.2";
-    source = {
-      type = "gem";
-      sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh";
-    };
-    dependencies = [
-      "diff-lcs"
-      "rspec-support"
-    ];
-  };
-  "rspec-mocks" = {
-    version = "3.1.3";
-    source = {
-      type = "gem";
-      sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr";
-    };
-    dependencies = [
-      "rspec-support"
-    ];
-  };
-  "rspec-rails" = {
-    version = "3.1.0";
-    source = {
-      type = "gem";
-      sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "railties"
-      "rspec-core"
-      "rspec-expectations"
-      "rspec-mocks"
-      "rspec-support"
-    ];
-  };
-  "rspec-support" = {
-    version = "3.1.2";
-    source = {
-      type = "gem";
-      sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb";
-    };
-  };
-  "safe_yaml" = {
-    version = "1.0.4";
-    source = {
-      type = "gem";
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-    };
-  };
-  "sass" = {
-    version = "3.3.9";
-    source = {
-      type = "gem";
-      sha256 = "0k19vj73283i907z4wfkc9qdska2b19z7ps6lcr5s4qzwis1zkmz";
-    };
-  };
-  "simplecov" = {
-    version = "0.9.1";
-    source = {
-      type = "gem";
-      sha256 = "06hylxlalaxxldpbaqa54gc52wxdff0fixdvjyzr6i4ygxwzr7yf";
-    };
-    dependencies = [
-      "docile"
-      "multi_json"
-      "simplecov-html"
-    ];
-  };
-  "simplecov-html" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9";
-    };
-  };
-  "sinatra" = {
-    version = "1.4.5";
-    source = {
-      type = "gem";
-      sha256 = "0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s";
-    };
-    dependencies = [
-      "rack"
-      "rack-protection"
-      "tilt"
-    ];
-  };
-  "slop" = {
-    version = "3.6.0";
-    source = {
-      type = "gem";
-      sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
-    };
-  };
-  "sprockets" = {
-    version = "2.12.3";
-    source = {
-      type = "gem";
-      sha256 = "1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2";
-    };
-    dependencies = [
-      "hike"
-      "multi_json"
-      "rack"
-      "tilt"
-    ];
-  };
-  "sprockets-rails" = {
-    version = "2.2.4";
-    source = {
-      type = "gem";
-      sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "sprockets"
-    ];
-  };
-  "teaspoon" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "1j3brbm9cv5km9d9wzb6q2b3cvc6m254z48h7h77z1w6c5wr0p3z";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-  "term-ansicolor" = {
-    version = "1.3.0";
-    source = {
-      type = "gem";
-      sha256 = "1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b";
-    };
-    dependencies = [
-      "tins"
-    ];
-  };
-  "therubyracer" = {
-    version = "0.12.1";
-    source = {
-      type = "gem";
-      sha256 = "106fqimqyaalh7p6czbl5m2j69z8gv7cm10mjb8bbb2p2vlmqmi6";
-    };
-    dependencies = [
-      "libv8"
-      "ref"
-    ];
-  };
-  "thor" = {
-    version = "0.19.1";
-    source = {
-      type = "gem";
-      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
-    };
-  };
-  "thread_safe" = {
-    version = "0.3.4";
-    source = {
-      type = "gem";
-      sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n";
-    };
-  };
-  "tilt" = {
-    version = "1.4.1";
-    source = {
-      type = "gem";
-      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
-    };
-  };
-  "tins" = {
-    version = "1.3.3";
-    source = {
-      type = "gem";
-      sha256 = "14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna";
-    };
-  };
-  "tzinfo" = {
-    version = "1.2.2";
-    source = {
-      type = "gem";
-      sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
-    };
-    dependencies = [
-      "thread_safe"
-    ];
-  };
-  "uglifier" = {
-    version = "2.5.1";
-    source = {
-      type = "gem";
-      sha256 = "1vihq309mzv9a2i0s8v4imrn1g2kj8z0vr88q3i5b657c4kxzfp0";
-    };
-    dependencies = [
-      "execjs"
-      "json"
-    ];
-  };
-  "webmock" = {
-    version = "1.20.4";
-    source = {
-      type = "gem";
-      sha256 = "01cz13ybxbbvkpl21bcfv0p9ir8m2zcplx93ps01ma54p25z4mxr";
-    };
-    dependencies = [
-      "addressable"
-      "crack"
-    ];
-  };
-  "xpath" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w";
-    };
-    dependencies = [
-      "nokogiri"
-    ];
-  };
-  "zeroclipboard-rails" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "00ixal0a0mxaqsyzp06c6zz4qdwqydy1qv4n7hbyqfhbmsdalcfc";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a405901f74..f8d319d0237 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17008,9 +17008,6 @@ with pkgs;
 
   p4v = libsForQt5.callPackage ../applications/version-management/p4v { };
 
-  panamax_api = callPackage ../applications/networking/cluster/panamax/api { };
-  panamax_ui = callPackage ../applications/networking/cluster/panamax/ui { };
-
   partio = callPackage ../development/libraries/partio {};
 
   pcmanfm = callPackage ../applications/misc/pcmanfm { };
-- 
GitLab


From c3eefe801a55586445125d49f159c1c0c5e76f76 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 5 May 2018 00:09:43 +0200
Subject: [PATCH 0147/1085] fleet: remove package, module, test

deprecated and unmaintained upstream
---
 nixos/modules/misc/ids.nix               |   2 +-
 nixos/modules/module-list.nix            |   1 -
 nixos/modules/services/cluster/fleet.nix | 150 -----------------------
 nixos/release.nix                        |   1 -
 nixos/tests/fleet.nix                    |  76 ------------
 pkgs/servers/fleet/default.nix           |  37 ------
 pkgs/top-level/all-packages.nix          |   2 -
 7 files changed, 1 insertion(+), 268 deletions(-)
 delete mode 100644 nixos/modules/services/cluster/fleet.nix
 delete mode 100644 nixos/tests/fleet.nix
 delete mode 100644 pkgs/servers/fleet/default.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 7a538210d10..7c0750c1a32 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -475,7 +475,7 @@
       nylon = 168;
       #panamax = 170; # unused
       exim = 172;
-      fleet = 173;
+      #fleet = 173; # unused
       input = 174;
       sddm = 175;
       tss = 176;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6f6a81bbda8..33191de14c4 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -170,7 +170,6 @@
   ./services/backup/rsnapshot.nix
   ./services/backup/tarsnap.nix
   ./services/backup/znapzend.nix
-  ./services/cluster/fleet.nix
   ./services/cluster/kubernetes/default.nix
   ./services/cluster/kubernetes/dns.nix
   ./services/cluster/kubernetes/dashboard.nix
diff --git a/nixos/modules/services/cluster/fleet.nix b/nixos/modules/services/cluster/fleet.nix
deleted file mode 100644
index ec03be39594..00000000000
--- a/nixos/modules/services/cluster/fleet.nix
+++ /dev/null
@@ -1,150 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.fleet;
-
-in {
-
-  ##### Interface
-  options.services.fleet = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to enable fleet service.
-      '';
-    };
-
-    listen = mkOption {
-      type = types.listOf types.str;
-      default = [ "/var/run/fleet.sock" ];
-      example = [ "/var/run/fleet.sock" "127.0.0.1:49153" ];
-      description = ''
-        Fleet listening addresses.
-      '';
-    };
-
-    etcdServers = mkOption {
-      type = types.listOf types.str;
-      default = [ "http://127.0.0.1:2379" ];
-      description = ''
-        Fleet list of etcd endpoints to use.
-      '';
-    };
-
-    publicIp = mkOption {
-      type = types.nullOr types.str;
-      default = "";
-      description = ''
-        Fleet IP address that should be published with the local Machine's
-        state and any socket information. If not set, fleetd will attempt
-        to detect the IP it should publish based on the machine's IP
-        routing information.
-      '';
-    };
-
-    etcdCafile = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        Fleet TLS ca file when SSL certificate authentication is enabled
-        in etcd endpoints.
-      '';
-    };
-
-    etcdKeyfile = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        Fleet TLS key file when SSL certificate authentication is enabled
-        in etcd endpoints.
-      '';
-    };
-
-    etcdCertfile = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        Fleet TLS cert file when SSL certificate authentication is enabled
-        in etcd endpoints.
-      '';
-    };
-
-    metadata = mkOption {
-      type = types.attrsOf types.str;
-      default = {};
-      apply = attrs: concatMapStringsSep "," (n: "${n}=${attrs."${n}"}") (attrNames attrs);
-      example = literalExample ''
-        {
-          region = "us-west";
-          az = "us-west-1";
-        }
-      '';
-      description = ''
-        Key/value pairs that are published with the local to the fleet registry.
-        This data can be used directly by a client of fleet to make scheduling decisions.
-      '';
-    };
-
-    extraConfig = mkOption {
-      type = types.attrsOf types.str;
-      apply = mapAttrs' (n: v: nameValuePair ("FLEET_" + n) v);
-      default = {};
-      example = literalExample ''
-        {
-          VERBOSITY = 1;
-          ETCD_REQUEST_TIMEOUT = "2.0";
-          AGENT_TTL = "40s";
-        }
-      '';
-      description = ''
-        Fleet extra config. See
-        <link xlink:href="https://github.com/coreos/fleet/blob/master/Documentation/deployment-and-configuration.md"/>
-        for configuration options.
-      '';
-    };
-
-  };
-
-  ##### Implementation
-  config = mkIf cfg.enable {
-    systemd.services.fleet = {
-      description = "Fleet Init System Daemon";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "fleet.socket" "etcd.service" "docker.service" ];
-      requires = [ "fleet.socket" ];
-      environment = {
-        FLEET_ETCD_SERVERS = concatStringsSep "," cfg.etcdServers;
-        FLEET_PUBLIC_IP = cfg.publicIp;
-        FLEET_ETCD_CAFILE = cfg.etcdCafile;
-        FLEET_ETCD_KEYFILE = cfg.etcdKeyfile;
-        FLEET_ETCD_CERTFILE = cfg.etcdCertfile;
-        FLEET_METADATA = cfg.metadata;
-      } // cfg.extraConfig;
-      serviceConfig = {
-        ExecStart = "${pkgs.fleet}/bin/fleetd";
-        Group = "fleet";
-      };
-    };
-
-    systemd.sockets.fleet = {
-      description = "Fleet Socket for the API";
-      wantedBy = [ "sockets.target" ];
-      listenStreams = cfg.listen;
-      socketConfig = {
-        ListenStream = "/var/run/fleet.sock";
-        SocketMode = "0660";
-        SocketUser = "root";
-        SocketGroup = "fleet";
-      };
-    };
-
-    services.etcd.enable = mkDefault true;
-    virtualisation.docker.enable = mkDefault true;
-
-    environment.systemPackages = [ pkgs.fleet ];
-    users.extraGroups.fleet.gid = config.ids.gids.fleet;
-  };
-}
diff --git a/nixos/release.nix b/nixos/release.nix
index ebe23ebed02..55b4f19b868 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -284,7 +284,6 @@ in rec {
   tests.ferm = callTest tests/ferm.nix {};
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
-  tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {};
   tests.fwupd = callTest tests/fwupd.nix {};
   #tests.gitlab = callTest tests/gitlab.nix {};
   tests.gitolite = callTest tests/gitolite.nix {};
diff --git a/nixos/tests/fleet.nix b/nixos/tests/fleet.nix
deleted file mode 100644
index 67c95446526..00000000000
--- a/nixos/tests/fleet.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : rec {
-  name = "simple";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ offline ];
-  };
-
-  nodes = {
-    node1 =
-      { config, pkgs, ... }:
-        {
-          services = {
-            etcd = {
-              enable = true;
-              listenPeerUrls = ["http://0.0.0.0:7001"];
-              initialAdvertisePeerUrls = ["http://node1:7001"];
-              initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"];
-            };
-         };
-
-          services.fleet = {
-            enable = true;
-            metadata.name = "node1";
-          };
-
-          networking.firewall.allowedTCPPorts = [ 7001 ];
-        };
-
-    node2 =
-      { config, pkgs, ... }:
-        {
-          services = {
-            etcd = {
-              enable = true;
-              listenPeerUrls = ["http://0.0.0.0:7001"];
-              initialAdvertisePeerUrls = ["http://node2:7001"];
-              initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"];
-            };
-           };
-
-          services.fleet = {
-            enable = true;
-            metadata.name = "node2";
-          };
-
-          networking.firewall.allowedTCPPorts = [ 7001 ];
-        };
-  };
-
-  service = builtins.toFile "hello.service" ''
-    [Unit]
-    Description=Hello World
-
-    [Service]
-    ExecStart=/bin/sh -c "while true; do echo \"Hello, world\"; /var/run/current-system/sw/bin/sleep 1; done"
-
-    [X-Fleet]
-    MachineMetadata=name=node2
-  '';
-
-  testScript =
-    ''
-      startAll;
-      $node1->waitForUnit("fleet.service");
-      $node2->waitForUnit("fleet.service");
-
-      $node2->waitUntilSucceeds("fleetctl list-machines | grep node1");
-      $node1->waitUntilSucceeds("fleetctl list-machines | grep node2");
-
-      $node1->succeed("cp ${service} hello.service && fleetctl submit hello.service");
-      $node1->succeed("fleetctl list-unit-files | grep hello");
-      $node1->succeed("fleetctl start hello.service");
-      $node1->waitUntilSucceeds("fleetctl list-units | grep running");
-      $node1->succeed("fleetctl stop hello.service");
-      $node1->succeed("fleetctl destroy hello.service");
-    '';
-})
diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix
deleted file mode 100644
index 98daab253b3..00000000000
--- a/pkgs/servers/fleet/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, lib, go, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  name = "fleet-${version}";
-  version = "1.0.0";
-
-  src = fetchFromGitHub {
-    owner = "coreos";
-    repo = "fleet";
-    rev = "v${version}";
-    sha256 = "0j48ajz19aqfzv9iyznnn39aw51y1nqcl270grmvi5cbqycmrfm0";
-  };
-
-  buildInputs = [ go ];
-
-  buildPhase = ''
-    patchShebangs build
-    ./build
-  '';
-
-  installPhase = ''
-    mkdir -p $out
-    mv bin $out
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A distributed init system";
-    homepage = https://coreos.com/using-coreos/clustering/;
-    license = licenses.asl20;
-    maintainers = with maintainers; [
-      cstrahan
-      jgeerds
-      offline
-    ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8d319d0237..3d2e488f146 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12407,8 +12407,6 @@ with pkgs;
   firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; };
   firebirdSuper = callPackage ../servers/firebird { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; };
 
-  fleet = callPackage ../servers/fleet { };
-
   foswiki = callPackage ../servers/foswiki { };
 
   frab = callPackage ../servers/web-apps/frab { };
-- 
GitLab


From 841a5553cb411577b5421701b41530e0981d5d82 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 5 May 2018 00:29:01 +0200
Subject: [PATCH 0148/1085] baresip: switch to GStreamer 1.0

---
 .../instant-messengers/baresip/default.nix           | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 538e9a3786b..eff33643ebc 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,6 +1,5 @@
-{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig
-, cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad
-, gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
+{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1
+, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
 , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
 }:
 stdenv.mkDerivation rec {
@@ -11,11 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "02bf4fwirf3b7h3cr1jqm0xsjzza4fi9kg88424js2l0xywwzpgf";
   };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [zlib openssl libre librem
-    cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good
+  buildInputs = [zlib openssl libre librem cairo mpg123
     alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
     ccache libvpx
-    ];
+  ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]);
   makeFlags = [
     "LIBRE_MK=${libre}/share/re/re.mk"
     "LIBRE_INC=${libre}/include/re"
@@ -26,7 +24,7 @@ stdenv.mkDerivation rec {
     "CCACHE_DISABLE=1"
 
     "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1"
-    "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1"  "USE_GSM=1" "USE_GST=1"
+    "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1"  "USE_GSM=1" "USE_GST1=1"
     "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1"
     "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1"
     "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1"
-- 
GitLab


From 97ca2f5d58cd96e9d27975c78d3801ef168ac093 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 4 May 2018 22:34:27 +0000
Subject: [PATCH 0149/1085] vscode: 1.22.2 -> 1.23.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 5c10f6fb3bb..41d4c114c75 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.22.2";
+  version = "1.23.0";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "17iqqg6vdccbl1k4k2ks3kkgg7619j6qdvca4k27pjfqm17mvw5n";
-    "x86_64-linux" = "1ng2jhhaghsf7a2dmrimazh817jh0ag88whija179ywgrg3i6xam";
-    "x86_64-darwin" = "083hizigzxm45hcy6yqwznj9ibqdaxg2xv8rsyas4ig9x55irrcj";
+    "i686-linux" = "1nyrcgnf18752n3i7xaq6gpb2k4wsfzk671kxg6za4ycrriw1f5l";
+    "x86_64-linux" = "1mkxyavzav522sl3fjn2hdlbj0bkdl3hagqiw9i6h8wgkxcvsszy";
+    "x86_64-darwin" = "123ggzssd5qd80jxar2pf5g2n2473pd2j8pfjyir1c7xkaqji2w6";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
-- 
GitLab


From 3bd1fcc4ad8c3223636b66fd2e647b12bd46c8dd Mon Sep 17 00:00:00 2001
From: Wei Tang <hi@that.world>
Date: Sat, 5 May 2018 09:16:19 +0800
Subject: [PATCH 0150/1085] parity-ui: init at 0.1.1

---
 pkgs/applications/altcoins/default.nix        |  1 +
 .../altcoins/parity-ui/default.nix            | 50 +++++++++++++++++++
 pkgs/applications/altcoins/parity-ui/env.nix  | 19 +++++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 71 insertions(+)
 create mode 100644 pkgs/applications/altcoins/parity-ui/default.nix
 create mode 100644 pkgs/applications/altcoins/parity-ui/env.nix

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index c58178e3edb..fa704b59659 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -86,4 +86,5 @@ rec {
 
   parity = callPackage ./parity { };
   parity-beta = callPackage ./parity/beta.nix { };
+  parity-ui = callPackage ./parity-ui { };
 }
diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix
new file mode 100644
index 00000000000..56a95b6d596
--- /dev/null
+++ b/pkgs/applications/altcoins/parity-ui/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, pkgs, fetchurl, lib, makeWrapper, nodePackages }:
+
+let
+
+uiEnv = pkgs.callPackage ./env.nix { };
+
+in stdenv.mkDerivation rec {
+  name = "parity-ui-${version}";
+  version = "0.1.1";
+
+  src = fetchurl {
+    url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
+    sha256 = "1jym6q63m5f4xm06dxiiabhbqnr0hysf2d3swysncs5hg6w00lh3";
+    name = "${name}.deb";
+  };
+
+  nativeBuildInputs = [ makeWrapper nodePackages.asar ];
+
+  buildCommand = ''
+    mkdir -p $out/usr/
+    ar p $src data.tar.xz | tar -C $out -xJ .
+    substituteInPlace $out/usr/share/applications/parity-ui.desktop \
+      --replace "/opt/Parity UI" $out/bin
+    mv $out/usr/* $out/
+    mv "$out/opt/Parity UI" $out/share/parity-ui
+    rm -r $out/usr/
+    rm -r $out/opt/
+
+    fixupPhase
+
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" \
+      $out/share/parity-ui/parity-ui
+
+    find $out/share/parity-ui -name "*.node" -exec patchelf --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" {} \;
+
+    paxmark m $out/share/parity-ui/parity-ui
+
+    mkdir -p $out/bin
+    ln -s $out/share/parity-ui/parity-ui $out/bin/parity-ui
+  '';
+
+  meta = with stdenv.lib; {
+    description = "UI for Parity. Fast, light, robust Ethereum implementation";
+    homepage = http://parity.io;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.sorpaas ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix
new file mode 100644
index 00000000000..a273bf33d10
--- /dev/null
+++ b/pkgs/applications/altcoins/parity-ui/env.nix
@@ -0,0 +1,19 @@
+{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
+, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
+, nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }:
+
+let
+  packages = [
+    stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
+    fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss
+    xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
+    xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
+    xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
+    xorg.libxcb libsecret gnome3.gconf
+  ];
+
+  libPathNative = lib.makeLibraryPath packages;
+  libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
+  libPath = "${libPathNative}:${libPath64}";
+
+in { inherit packages libPath; }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24b33231f77..189e00ae398 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14883,6 +14883,7 @@ with pkgs;
 
   parity = self.altcoins.parity;
   parity-beta = self.altcoins.parity-beta;
+  parity-ui = self.altcoins.parity-ui;
 
   stellar-core = self.altcoins.stellar-core;
 
-- 
GitLab


From 5146fad639a8a6f4b4136216aa37c62d31e20053 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Thu, 3 May 2018 02:13:09 -0400
Subject: [PATCH 0151/1085] vscode-extension-ms-vscode-cpptools: 0.12.3 ->
 0.16.1

---
 .../vscode-extensions/cpptools/default.nix    |  45 ++---
 .../cpptools/missing_elf_deps.sh              |  52 ++++++
 .../package-activation-events-0-16-1.json     |  22 +++
 .../cpptools/update_helper.sh                 | 168 ++++++++++++++++++
 .../vscode-cpptools-0-12-3-package-json.patch |  82 ---------
 5 files changed, 259 insertions(+), 110 deletions(-)
 create mode 100755 pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh
 create mode 100644 pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json
 create mode 100755 pkgs/misc/vscode-extensions/cpptools/update_helper.sh
 delete mode 100644 pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch

diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index c537aa8a1f9..c29611c0c66 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchurl, vscode-utils, unzip, dos2unix, mono46, clang-tools, writeScript
-, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. 
+{ stdenv, lib, fetchurl, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript
+, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise.
 }:
 
 assert gdbUseFixed -> null != gdb;
@@ -33,13 +33,11 @@ let
   langComponentBinaries = stdenv.mkDerivation {
     name = "cpptools-language-component-binaries";
 
-    src = fetchurl {
-      url = https://download.visualstudio.microsoft.com/download/pr/11151953/d3cc8b654bffb8a2f3896d101f3c3155/Bin_Linux.zip;
-      sha256 = "12qbxsrdc73cqjb84xdck1xafzhfkcyn6bqbpcy1bxxr3b7hxbii";
+    src = fetchzip {
+      url = https://download.visualstudio.microsoft.com/download/pr/11991016/8a81aa8f89aac452956b0e4c68e6620b/Bin_Linux.zip;
+      sha256 = "0ma59fxfldbgh6ijlvfbs3hnl4g0cnw5gs6286zdrp065n763sv4";
     };
 
-    buildInputs = [ unzip ];
-
     patchPhase = ''
       elfInterpreter="${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2"
       patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.Extension.linux
@@ -53,13 +51,6 @@ let
     '';
   };
 
-  cpptoolsJsonFile = fetchurl {
-    url = https://download.visualstudio.microsoft.com/download/pr/11070848/7b97d6724d52cae8377c61bb4601c989/cpptools.json;
-    sha256 = "124f091aic92rzbg2vg831y22zr5wi056c1kh775djqs3qv31ja6";
-  };
-
-
-
   openDebugAD7Script = writeScript "OpenDebugAD7" ''
     #!${stdenv.shell}
     BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)"
@@ -76,23 +67,24 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "cpptools";
     publisher = "ms-vscode";
-    version = "0.12.3";
-    sha256 = "1dcqy54n1w29xhbvxscd41hdrbdwar6g12zx02f6kh2f1kw34z5z";
+    version = "0.16.1";
+    sha256 = "0m4cam8sf3zwp8ss1dii908g7rc8b9l6pry0dglg0rmf45pkiaj3";
   };
 
   buildInputs = [
-    dos2unix
+    jq
   ];
 
-  prePatch = ''
-    dos2unix package.json      
-  '';
+  postPatch = ''
+    mv ./package.json ./package_ori.json
 
-  patches = [
-    ./vscode-cpptools-0-12-3-package-json.patch
-  ];
+    # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime.
+    # 2. Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`.
+    cat ./package_ori.json | \
+      jq --slurpfile actEvts ${./package-activation-events-0-16-1.json} '(.activationEvents) = $actEvts[0]' | \
+      jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \
+      ./package.json
 
-  postPatch = ''
     # Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`.
     substituteInPlace "./package.json" \
       --replace "\"default\": \"/usr/bin/gdb\"" "\"default\": \"${gdbDefaultsTo}\""
@@ -103,9 +95,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     # Move unused files out of the way.
     mv ./debugAdapters/bin/OpenDebugAD7.exe.config ./debugAdapters/bin/OpenDebugAD7.exe.config.unused
 
-    # Bring the `cpptools.json` file at the root of the package, same as the extension would do.
-    cp -p "${cpptoolsJsonFile}" "./cpptools.json"
-
     # Combining the language component binaries as part of our package.
     find "${langComponentBinaries}/bin" -mindepth 1 -maxdepth 1 | xargs cp -p -t "./bin"
 
@@ -121,7 +110,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     meta = with stdenv.lib; {
       license = licenses.unfree;
       maintainers = [ maintainers.jraygauthier ];
-      # A 32 bit linux would also be possible with some effort (specific download of binaries + 
+      # A 32 bit linux would also be possible with some effort (specific download of binaries +
       # patching of the elf files with 32 bit interpreter).
       platforms = [ "x86_64-linux" ];
     };
diff --git a/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh b/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh
new file mode 100755
index 00000000000..f5eb08d78a5
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -p coreutils -i bash
+
+scriptDir=$(cd "`dirname "$0"`"; pwd)
+echo "scriptDir='$scriptDir'"
+
+function get_pkg_out() {
+  local pkg="$1"
+  local suffix="${2:-}"
+  local nixExp="with (import <nixpkgs> {}); ${pkg}"
+  echo "$(nix-build -E "$nixExp" --no-out-link)${suffix}"
+}
+
+interpreter="$(get_pkg_out "stdenv.glibc" "/lib/ld-linux-x86-64.so.2")"
+echo "interpreter='$interpreter'"
+
+# For clangformat dep on 'libtinfo.so.5'.
+ncursesLibDir="$(get_pkg_out "ncurses5.out" "/lib")"
+echo "ncursesLibDir='$ncursesLibDir'"
+
+# For clanformat dep on 'libstdc++.so.6'.
+stdcppLibDir="$(get_pkg_out "stdenv.cc.cc.lib" "/lib")"
+echo "stdcppLibDir='$stdcppLibDir'"
+
+# For clangformat dep on 'libz.so.1'.
+zlibLibDir="$(get_pkg_out "zlib.out" "/lib")"
+echo "zlibLibDir='$zlibLibDir'"
+
+function patchelf_mono() {
+  local exe="$1"
+  patchelf --set-interpreter "$interpreter" "$exe"
+}
+
+function patchelf_clangformat() {
+  local exe="$1"
+  patchelf --set-interpreter "$interpreter" "$exe"
+  local rpath="$ncursesLibDir:$stdcppLibDir:$zlibLibDir"
+  patchelf --set-rpath "$rpath" "$exe"
+}
+
+function print_nix_version_clangtools() {
+  nixClangToolsBin="$(get_pkg_out "clang-tools" "/bin")"
+  echo "nixClangToolsBin='$nixClangToolsBin'"
+  $nixClangToolsBin/clang-format --version
+}
+
+function print_nix_version_mono() {
+  nixMonoBin="$(get_pkg_out "mono" "/bin")"
+  echo "nixMonoBin='$nixMonoBin'"
+  $nixMonoBin/mono --version
+}
+
diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json
new file mode 100644
index 00000000000..3a12a8bc047
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json
@@ -0,0 +1,22 @@
+[
+"onLanguage:cpp",
+"onLanguage:c",
+"onCommand:extension.pickNativeProcess",
+"onCommand:extension.pickRemoteNativeProcess",
+"onCommand:C_Cpp.ConfigurationEdit",
+"onCommand:C_Cpp.ConfigurationSelect",
+"onCommand:C_Cpp.SwitchHeaderSource",
+"onCommand:C_Cpp.Navigate",
+"onCommand:C_Cpp.GoToDeclaration",
+"onCommand:C_Cpp.PeekDeclaration",
+"onCommand:C_Cpp.ToggleErrorSquiggles",
+"onCommand:C_Cpp.ToggleIncludeFallback",
+"onCommand:C_Cpp.ToggleDimInactiveRegions",
+"onCommand:C_Cpp.ShowReleaseNotes",
+"onCommand:C_Cpp.ResetDatabase",
+"onCommand:C_Cpp.PauseParsing",
+"onCommand:C_Cpp.ResumeParsing",
+"onCommand:C_Cpp.ShowParsingCommands",
+"onCommand:C_Cpp.TakeSurvey",
+"onDebug"
+]
\ No newline at end of file
diff --git a/pkgs/misc/vscode-extensions/cpptools/update_helper.sh b/pkgs/misc/vscode-extensions/cpptools/update_helper.sh
new file mode 100755
index 00000000000..00ef7755324
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/cpptools/update_helper.sh
@@ -0,0 +1,168 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -p coreutils -p jq -p unzip -i bash
+set -euo pipefail
+
+#
+# A little script to help maintaining this package. It will:
+#
+#  -  download the specified version of the extension to the store and print its url, packed store path and hash
+#  -  unpack the extension, bring it to the store and print its store path and hash
+#  -  fetch its runtimes dependencies from the 'package.json' file using the 'jq' utility, unpack those to the store
+#     and print its url store path and hash
+#  -  patch elf of the binaries that got a nix replacement
+#  -  bring the patched version to the store
+#  -  run their '--version' and call 'ldd'
+#  -  print the version of the runtime deps nix replacements.
+#
+# TODO: Print to a properly formated nix file all the required information to fetch everything (extension + runtime deps).
+# TODO: Print x86 and maybe darwin runtime dependencies.
+#
+
+scriptDir=$(cd "`dirname "$0"`"; pwd)
+echo "scriptDir='$scriptDir'"
+
+extPublisher="vscode"
+extName="cpptools"
+defaultExtVersion="0.16.1"
+extVersion="${1:-$defaultExtVersion}"
+
+echo
+echo "------------- Downloading extension ---------------"
+
+extZipStoreName="${extPublisher}-${extName}.zip"
+extUrl="https://ms-vscode.gallery.vsassets.io/_apis/public/gallery/publisher/ms-vscode/extension/cpptools/${extVersion}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage"
+echo "extUrl='$extUrl'"
+storePathWithSha=$(nix-prefetch-url --name "$extZipStoreName" --print-path "$extUrl" 2> /dev/null)
+
+cpptoolsZipStorePath="$(echo "$storePathWithSha" | tail -n1)"
+cpptoolsZipSha256="$(echo "$storePathWithSha" | head -n1)"
+echo "cpptoolsZipStorePath='$cpptoolsZipStorePath'"
+echo "cpptoolsZipSha256='$cpptoolsZipSha256'"
+
+
+extStoreName="${extPublisher}-${extName}"
+
+
+function rm_tmpdir() {
+  #echo "Removing \`tmpDir='$tmpDir'\`"
+  rm -rf -- "$tmpDir"
+  unset tmpDir
+  trap - INT TERM HUP EXIT
+}
+function make_trapped_tmpdir() {
+  tmpDir=$(mktemp -d)
+  trap rm_tmpdir INT TERM HUP EXIT
+}
+
+echo
+echo "------------- Unpacked extension ---------------"
+
+make_trapped_tmpdir
+unzip -q -d "$tmpDir" "$cpptoolsZipStorePath"
+
+cpptoolsStorePath="$(nix add-to-store -n "$extStoreName" "$tmpDir")"
+cpptoolsSha256="$(nix hash-path --base32 --type sha512 "$cpptoolsStorePath")"
+echo "cpptoolsStorePath='$cpptoolsStorePath'"
+echo "cpptoolsSha256='$cpptoolsSha256'"
+
+rm_tmpdir
+
+storePathWithSha=$(nix-prefetch-url --print-path "file://${cpptoolsStorePath}/extension/package.json" 2> /dev/null)
+
+extPackageJSONStorePath="$(echo "$storePathWithSha" | tail -n1)"
+extPackageJSONSha256="$(echo "$storePathWithSha" | head -n1)"
+echo "extPackageJSONStorePath='$extPackageJSONStorePath'"
+echo "extPackageJSONSha256='$extPackageJSONSha256'"
+
+print_runtime_dep() {
+
+  local outName="$1"
+  local extPackageJSONStorePath="$2"
+  local depDesc="$3"
+
+  local urlRaw=$(cat "$extPackageJSONStorePath" | jq -r --arg desc "$depDesc" '.runtimeDependencies[] | select(.description == $desc) | .url')
+  local url=$(echo $urlRaw | xargs curl -Ls -o /dev/null -w %{url_effective})
+
+  local urlRawVarStr="${outName}_urlRaw='$urlRaw'"
+  local urlVarStr="${outName}_url='$url'"
+  echo "$urlRawVarStr"
+  echo "$urlVarStr"
+
+  local storePathWithSha="$(nix-prefetch-url --unpack --print-path "$url" 2> /dev/null)"
+
+  local storePath="$(echo "$storePathWithSha" | tail -n1)"
+  local sha256="$(echo "$storePathWithSha" | head -n1)"
+
+  local sha256VarStr="${outName}_sha256='$sha256'"
+  local storePathVarStr="${outName}_storePath='$storePath'"
+  echo "$sha256VarStr"
+  echo "$storePathVarStr"
+
+  eval "$urlRawVarStr"
+  eval "$urlVarStr"
+  eval "$sha256VarStr"
+  eval "$storePathVarStr"
+}
+
+echo
+echo "------------- Runtime dependencies ---------------"
+
+print_runtime_dep "langComponentBinaries" "$extPackageJSONStorePath" "C/C++ language components (Linux / x86_64)"
+print_runtime_dep "monoRuntimeBinaries" "$extPackageJSONStorePath" "Mono Runtime (Linux / x86_64)"
+print_runtime_dep "clanFormatBinaries" "$extPackageJSONStorePath" "ClangFormat (Linux / x86_64)"
+
+
+echo
+echo "------------- Runtime deps missing elf deps ---------------"
+
+source "$scriptDir/missing_elf_deps.sh"
+
+echo
+echo "------------- Runtime dep mono ---------------"
+
+make_trapped_tmpdir
+find "$monoRuntimeBinaries_storePath" -mindepth 1 -maxdepth 1 | xargs -d '\n' cp -rp -t "$tmpDir"
+chmod -R a+rwx "$tmpDir"
+
+ls -la "$tmpDir/debugAdapters"
+
+patchelf_mono "$tmpDir/debugAdapters/mono.linux-x86_64"
+
+chmod a+x "$tmpDir/debugAdapters/mono.linux-x86_64"
+ldd "$tmpDir/debugAdapters/mono.linux-x86_64"
+"$tmpDir/debugAdapters/mono.linux-x86_64" --version
+
+monoRuntimeBinariesPatched_storePath="$(nix add-to-store -n "monoRuntimeBinariesPatched" "$tmpDir")"
+echo "monoRuntimeBinariesPatched_storePath='$monoRuntimeBinariesPatched_storePath'"
+
+rm_tmpdir
+
+
+echo
+echo "------------- Runtime dep clang ---------------"
+make_trapped_tmpdir
+find "$clanFormatBinaries_storePath" -mindepth 1 -maxdepth 1 | xargs -d '\n' cp -rp -t "$tmpDir"
+chmod -R a+rwx "$tmpDir"
+
+ls -la "$tmpDir/bin"
+
+patchelf_clangformat "$tmpDir/bin/clang-format"
+
+chmod a+x "$tmpDir/bin/clang-format"
+ldd "$tmpDir/bin/clang-format"
+"$tmpDir/bin/clang-format" --version
+
+
+clanFormatBinariesPatched_storePath="$(nix add-to-store -n "clanFormatBinariesPatched" "$tmpDir")"
+echo "clanFormatBinariesPatched_storePath='$clanFormatBinariesPatched_storePath'"
+
+rm_tmpdir
+
+echo
+echo "------------- Nix mono ---------------"
+print_nix_version_clangtools
+
+echo
+echo "------------- Nix mono ---------------"
+print_nix_version_mono
+
diff --git a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch b/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch
deleted file mode 100644
index 1873963f460..00000000000
--- a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/package.json b/package.json
-index 518e839..1c17c35 100644
---- a/package.json
-+++ b/package.json
-@@ -37,7 +37,26 @@
-     "Linters"
-   ],
-   "activationEvents": [
--    "*"
-+    "onLanguage:cpp",
-+    "onLanguage:c",
-+    "onCommand:extension.pickNativeProcess",
-+    "onCommand:extension.pickRemoteNativeProcess",
-+    "onCommand:extension.provideInitialConfigurations_cppvsdbg",
-+    "onCommand:extension.provideInitialConfigurations_cppdbg",
-+    "onCommand:C_Cpp.ConfigurationEdit",
-+    "onCommand:C_Cpp.ConfigurationSelect",
-+    "onCommand:C_Cpp.SwitchHeaderSource",
-+    "onCommand:C_Cpp.UnloadLanguageServer",
-+    "onCommand:C_Cpp.Navigate",
-+    "onCommand:C_Cpp.GoToDeclaration",
-+    "onCommand:C_Cpp.PeekDeclaration",
-+    "onCommand:C_Cpp.ToggleErrorSquiggles",
-+    "onCommand:C_Cpp.ToggleIncludeFallback",
-+    "onCommand:C_Cpp.ShowReleaseNotes",
-+    "onCommand:C_Cpp.ResetDatabase",
-+    "workspaceContains:.vscode/c_cpp_properties.json",
-+    "onDebug:cppdbg",
-+    "onDebug:cppvsdbg"
-   ],
-   "main": "./out/src/main",
-   "contributes": {
-@@ -281,8 +300,7 @@
-             "cpp"
-           ]
-         },
--        "runtime": "node",
--        "program": "./out/src/Debugger/Proxy/debugProxy.js",
-+        "program": "./debugAdapters/OpenDebugAD7",
-         "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
-         "variables": {
-           "pickProcess": "extension.pickNativeProcess",
-@@ -722,7 +740,29 @@
-               }
-             }
-           }
--        }
-+        },
-+        "configurationSnippets": [
-+          {
-+            "label": "C/C++: (gdb) Launch",
-+            "description": "Launch with gdb.",
-+            "bodyText": "{\n\t\"name\": \"(gdb) Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t    {\n\t        \"description\": \"Enable pretty-printing for gdb\",\n\t        \"text\": \"-enable-pretty-printing\",\n\t        \"ignoreFailures\": true\n\t    }\n\t]\n}"
-+          },
-+          {
-+            "label": "C/C++: (gdb) Attach",
-+            "description": "Attach with gdb.",
-+            "bodyText": "{ \n\t\"name\": \"(gdb) Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickProcess}\",\n\t\"MIMode\": \"gdb\"\n}"
-+          },
-+          {
-+            "label": "C/C++: (gdb) Pipe Launch",
-+            "description": "Pipe Launch with gdb.",
-+            "bodyText": "{\n\t\"name\": \"(gdb) Pipe Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t    {\n\t        \"description\": \"Enable pretty-printing for gdb\",\n\t        \"text\": \"-enable-pretty-printing\",\n\t        \"ignoreFailures\": true\n\t    }\n\t]\n}"
-+          },
-+          {
-+            "label": "C/C++: (gdb) Pipe Attach",
-+            "description": "Pipe Attach with gdb.",
-+            "bodyText": "{\n\t\"name\": \"(gdb) Pipe Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickRemoteProcess}\",\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\"\n}"
-+          }
-+        ]
-       },
-       {
-         "type": "cppvsdbg",
-@@ -741,7 +781,7 @@
-         "variables": {
-           "pickProcess": "extension.pickNativeProcess"
-         },
--        "initialConfigurations": "extension.provideInitialConfigurations_cppvsdbg",
-+        "initialConfigurations": "",
-         "configurationAttributes": {
-           "launch": {
-             "required": [
-- 
GitLab


From c580919791d5eacde29a457030f69f09187dc2a4 Mon Sep 17 00:00:00 2001
From: Richard DW Redcroft <Richard@mythreed.com>
Date: Sat, 5 May 2018 06:29:03 +0100
Subject: [PATCH 0152/1085] houdini: 16.5.405 -> 16.5.439

* Update version 16.5.439

Update to version to 16.5.439 (current prod build)

* Update runtime.nix

forgot to update sha256
---
 pkgs/applications/misc/houdini/runtime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 097386547f5..7477e5c0af2 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -29,11 +29,11 @@ let
   license_dir = "~/.config/houdini";
 in
 stdenv.mkDerivation rec {
-  version = "16.5.405";
+  version = "16.5.439";
   name = "houdini-runtime-${version}";
   src = requireFile rec {
     name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz";
-    sha256 = "14i0kzv881jqd5z9jshri1fxxi3pkxdmi5l4p2b51c9i3apsxmw6";
+    sha256 = "7e483072a0e6e751a93f2a2f968cccb2d95559c61106ffeb344c95975704321b";
     message = ''
       This nix expression requires that ${name} is already part of the store.
       Download it from https://sidefx.com and add it to the nix store with:
-- 
GitLab


From 21b926003d50f2f2365f234b9a0bf911607287d2 Mon Sep 17 00:00:00 2001
From: bricewge <brice.wge@gmail.com>
Date: Sat, 5 May 2018 07:29:44 +0200
Subject: [PATCH 0153/1085] sshguard: service creates /var/lib/sshguard

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

diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix
index 7f09e8893c4..137c3d61018 100644
--- a/nixos/modules/services/security/sshguard.nix
+++ b/nixos/modules/services/security/sshguard.nix
@@ -133,6 +133,7 @@ in {
             ReadOnlyDirectories = "/";
             ReadWriteDirectories = "/run/sshguard /var/lib/sshguard";
             RuntimeDirectory = "sshguard";
+            StateDirectory = "sshguard";
             CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW";
          };
       };
-- 
GitLab


From 9f1da665876cdd4f68750a2241d2bd5fc203f275 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 5 May 2018 08:33:20 +0300
Subject: [PATCH 0154/1085] ndppd module: init (#35533)

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/networking/ndppd.nix   | 47 +++++++++++++++++++
 .../applications/networking/ndppd/default.nix | 19 +++++++-
 3 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/services/networking/ndppd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 26804d3682d..cb4c0917678 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -515,6 +515,7 @@
   ./services/networking/murmur.nix
   ./services/networking/namecoind.nix
   ./services/networking/nat.nix
+  ./services/networking/ndppd.nix
   ./services/networking/networkmanager.nix
   ./services/networking/nftables.nix
   ./services/networking/ngircd.nix
diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix
new file mode 100644
index 00000000000..1d6c48dd8d3
--- /dev/null
+++ b/nixos/modules/services/networking/ndppd.nix
@@ -0,0 +1,47 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.ndppd;
+
+  configFile = pkgs.runCommand "ndppd.conf" {} ''
+    substitute ${pkgs.ndppd}/etc/ndppd.conf $out \
+      --replace eth0 ${cfg.interface} \
+      --replace 1111:: ${cfg.network}
+  '';
+in {
+  options = {
+    services.ndppd = {
+      enable = mkEnableOption "daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces";
+      interface = mkOption {
+        type = types.string;
+        default = "eth0";
+        example = "ens3";
+        description = "Interface which is on link-level with router.";
+      };
+      network = mkOption {
+        type = types.string;
+        default = "1111::";
+        example = "2001:DB8::/32";
+        description = "Network that we proxy.";
+      };
+      configFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = "Path to configuration file.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.packages = [ pkgs.ndppd ];
+    environment.etc."ndppd.conf".source = if (cfg.configFile != null) then cfg.configFile else configFile;
+    systemd.services.ndppd = {
+      serviceConfig.RuntimeDirectory = [ "ndppd" ];
+      wantedBy = [ "multi-user.target" ];
+    };
+  };
+
+  meta.maintainers = with maintainers; [ gnidorah ];
+}
diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix
index 5314d3668eb..a5eb9021048 100644
--- a/pkgs/applications/networking/ndppd/default.nix
+++ b/pkgs/applications/networking/ndppd/default.nix
@@ -1,6 +1,11 @@
-{ stdenv, fetchFromGitHub, gzip, ... }:
+{ stdenv, fetchFromGitHub, fetchurl, gzip, ... }:
 
-stdenv.mkDerivation rec {
+let
+  serviceFile = fetchurl {
+    url = "https://raw.githubusercontent.com/DanielAdolfsson/ndppd/f37e8eb33dc68b3385ecba9b36a5efd92755580f/ndppd.service";
+    sha256 = "1zf54pzjfj9j9gr48075njqrgad4myd3dqmhvzxmjy4gjy9ixmyh";
+  };
+in stdenv.mkDerivation rec {
   name = "ndppd-${version}";
   version = "0.2.5";
 
@@ -19,6 +24,16 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace /bin/gzip ${gzip}/bin/gzip
   '';
 
+  postInstall = ''
+    mkdir -p $out/etc
+    cp ndppd.conf-dist $out/etc/ndppd.conf
+
+    mkdir -p $out/lib/systemd/system
+    # service file needed for our module is not in release yet
+    substitute ${serviceFile} $out/lib/systemd/system/ndppd.service \
+      --replace /usr/sbin/ndppd $out/sbin/ndppd
+  '';
+
   meta = {
     description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces";
     homepage = https://github.com/DanielAdolfsson/ndppd;
-- 
GitLab


From 34a71a80b8fb74cb07b7239845a667172e0d374f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 5 May 2018 01:29:39 -0500
Subject: [PATCH 0155/1085] foundationdb: rename jar file to match upstream

And don't install the fdb_java.so file: it's already included inside of
the jar itself.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/foundationdb/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index b1745dd5371..5ebb510be46 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -56,14 +56,12 @@ let
           mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb
 
           cp -v ./lib/libfdb_c.so     $lib/lib
-          cp -v ./lib/libfdb_java.so  $lib/lib
-
           cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so
 
           cp -v ./bindings/c/foundationdb/fdb_c.h           $dev/include/foundationdb
           cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb
 
-          cp -v ./bindings/java/foundationdb-client.jar     $lib/share/java
+          cp -v ./bindings/java/foundationdb-client.jar     $lib/share/java/fdb-java.jar
 
           for x in fdbbackup fdbcli fdbserver fdbmonitor; do
             cp -v "./bin/$x" $out/bin;
-- 
GitLab


From b79d1e803154cc29debedb7ed4c1aa3de05e2af5 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Sat, 5 May 2018 02:32:09 -0400
Subject: [PATCH 0156/1085] platformio: add git to chroot so it is usable by
 platformio command

---
 pkgs/development/arduino/platformio/chrootenv.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix
index f46e705fb90..ae68e84ab1c 100644
--- a/pkgs/development/arduino/platformio/chrootenv.nix
+++ b/pkgs/development/arduino/platformio/chrootenv.nix
@@ -20,6 +20,7 @@ let
       };
     in (with pkgs; [
       zlib
+      git
     ]) ++ (with python.pkgs; [
       python
       setuptools
-- 
GitLab


From d25607c79db9fca7f1c8696b792e376b42fb2ecb Mon Sep 17 00:00:00 2001
From: Unknown <iulian.meghea@gmail.com>
Date: Sat, 5 May 2018 11:22:23 +0300
Subject: [PATCH 0157/1085] Fix pci_get_bus_and_slot removed in kernel 4.17

---
 .../virtualization/virtualbox/default.nix      |  4 +---
 .../virtualization/virtualbox/kernpcidev.patch | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/virtualization/virtualbox/kernpcidev.patch

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index ca0520f32a8..d09a30f98a7 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -94,9 +94,7 @@ in stdenv.mkDerivation {
 
   patches =
      optional enableHardening ./hardened.patch
-  ++ [ ./qtx11extras.patch ];
-
-
+  ++ [ ./qtx11extras.patch ./kernpcidev.patch ];
 
   postPatch = ''
     sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
diff --git a/pkgs/applications/virtualization/virtualbox/kernpcidev.patch b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch
new file mode 100644
index 00000000000..5192227d7d0
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch
@@ -0,0 +1,18 @@
+diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+index b8019f7..b7d2e39 100644
+--- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
++++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+@@ -73,8 +73,11 @@ MODULE_LICENSE("GPL");
+ MODULE_VERSION(VBOX_VERSION_STRING);
+ #endif
+ 
+-
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
++# define PCI_DEV_GET(v,d,p)            pci_get_device(v,d,p)
++# define PCI_DEV_PUT(x)                pci_dev_put(x)
++# define PCI_DEV_GET_SLOT(bus, devfn)  pci_get_domain_bus_and_slot(0, bus, devfn)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+ # define PCI_DEV_GET(v,d,p)            pci_get_device(v,d,p)
+ # define PCI_DEV_PUT(x)                pci_dev_put(x)
+ # define PCI_DEV_GET_SLOT(bus, devfn)  pci_get_bus_and_slot(bus, devfn)
-- 
GitLab


From 43650115e34ea610e53f718d9e02de7222ac0ba2 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 5 May 2018 15:41:28 +0700
Subject: [PATCH 0158/1085] nixos/documentation: Correct use of lib.optional

lib.optional returns a singleton or an empty list. Therefore the
argument does not need to be wrapped in a list.
An alternative patch could have used lib.optionals but seems like no
more elements are going to be added to the optional list.
---
 nixos/modules/misc/documentation.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 2e426c01708..b482a5a6752 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -75,20 +75,20 @@ let cfg = config.documentation; in
     (mkIf cfg.man.enable {
       environment.systemPackages = [ pkgs.man-db ];
       environment.pathsToLink = [ "/share/man" ];
-      environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable [ "devman" ];
+      environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman";
     })
 
     (mkIf cfg.info.enable {
       environment.systemPackages = [ pkgs.texinfoInteractive ];
       environment.pathsToLink = [ "/share/info" ];
-      environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable [ "devinfo" ];
+      environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable "devinfo";
     })
 
     (mkIf cfg.doc.enable {
       # TODO(@oxij): put it here and remove from profiles?
       # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox?
       environment.pathsToLink = [ "/share/doc" ];
-      environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable [ "devdoc" ];
+      environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc";
     })
 
   ]);
-- 
GitLab


From 3cce9b107a7531c52e8b85bba33ec396d2fefda6 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sat, 5 May 2018 19:53:40 +1000
Subject: [PATCH 0159/1085] nix-pin: 0.2.2 -> 0.3.0

---
 pkgs/tools/package-management/nix-pin/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index bb3a1faa0c3..6f109cd9f41 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -1,20 +1,22 @@
-{ pkgs, stdenv, fetchFromGitHub, mypy, python3 }:
+{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }:
 let self = stdenv.mkDerivation rec {
   name = "nix-pin-${version}";
-  version = "0.2.2";
+  version = "0.3.0";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-pin";
-    rev = "version-0.2.2";
-    sha256 = "1kw43kzy4m6lnnif51r2a8i4vcgr7d4vqb1c75p7pk2b9y3jwxsz";
+    rev = "version-0.3.0";
+    sha256 = "1kq50v8m8y1wji63b7y3wh6nv3ahvdxvvbsb07day2zzf5ysy8kj";
   };
-  buildInputs = [ python3 mypy ];
+  buildInputs = [ python3 mypy makeWrapper ];
   buildPhase = ''
     mypy bin/*
   '';
   installPhase = ''
     mkdir "$out"
     cp -r bin share "$out"
+    wrapProgram $out/bin/nix-pin \
+      --prefix PATH : "${lib.makeBinPath [ nix git ]}"
   '';
   passthru =
     let
-- 
GitLab


From edbf4b0eb2c3c8788451f50bbe4e9170267e50e2 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sat, 5 May 2018 11:37:37 +0200
Subject: [PATCH 0160/1085] powerline-rs: init at 0.1.6

---
 maintainers/maintainer-list.nix          |  5 +++++
 pkgs/tools/misc/powerline-rs/default.nix | 25 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/misc/powerline-rs/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4b584e6a115..9369a76688c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1740,6 +1740,11 @@
     github = "jdagilliland";
     name = "Jason Gilliland";
   };
+  jD91mZM2 = {
+    email = "me@krake.one";
+    github = "jD91mZM2";
+    name = "jD91mZM2";
+  };
   jefdaj = {
     email = "jefdaj@gmail.com";
     github = "jefdaj";
diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
new file mode 100644
index 00000000000..1a386a9f619
--- /dev/null
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -0,0 +1,25 @@
+{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, libgit2, openssl_1_1_0, libssh2, libzip }:
+rustPlatform.buildRustPackage rec {
+  name = "powerline-rs-${version}";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner = "jD91mZM2";
+    repo = "powerline-rs";
+    rev = version;
+
+    sha256 = "11rhirnk8zh4vf00df9cgy9vw5h8n7kgnhjbjbnlpl9i6wal9nvl";
+  };
+
+  cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
+
+  nativeBuildInputs = [ pkgconfig file perl cmake ];
+  buildInputs = [ libgit2 ];
+  propagatedBuildInputs = [ openssl_1_1_0 libssh2 libzip ];
+
+  meta = with lib; {
+    description = "powerline-shell rewritten in Rust, inspired by powerline-go";
+    maintainers = with maintainers; [ jD91mZM2 ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24b33231f77..ffed1c356f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14574,6 +14574,8 @@ with pkgs;
 
   powerline-go = callPackage ../tools/misc/powerline-go { };
 
+  powerline-rs = callPackage ../tools/misc/powerline-rs { };
+
   profont = callPackage ../data/fonts/profont { };
 
   proggyfonts = callPackage ../data/fonts/proggyfonts { };
-- 
GitLab


From 9f31a4d622ad760fd33223297acec4ba8bb84347 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 7 Jan 2018 17:54:08 +0200
Subject: [PATCH 0161/1085] nano-wallet: init at 12.1

---
 .../altcoins/nano-wallet/CMakeLists.txt.patch | 13 +++++
 .../altcoins/nano-wallet/default.nix          | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 72 insertions(+)
 create mode 100644 pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch
 create mode 100644 pkgs/applications/altcoins/nano-wallet/default.nix

diff --git a/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch b/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch
new file mode 100644
index 00000000000..5bbec1d39be
--- /dev/null
+++ b/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b43f02f6..4470abbf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -119,7 +119,7 @@ endif (RAIBLOCKS_SECURE_RPC)
+ 
+ include_directories (${CMAKE_SOURCE_DIR})
+ 
+-set(Boost_USE_STATIC_LIBS        ON)
++add_definitions(-DBOOST_LOG_DYN_LINK)
+ set(Boost_USE_MULTITHREADED      ON)
+ 
+ if (BOOST_CUSTOM)
diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
new file mode 100644
index 00000000000..8c4722bd991
--- /dev/null
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -0,0 +1,57 @@
+{lib, pkgs, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}:
+
+stdenv.mkDerivation rec {
+
+  name = "nano-wallet-${version}";
+  version = "12.1";
+
+  src = fetchFromGitHub {
+    owner = "nanocurrency";
+    repo = "raiblocks";
+    rev = "V${version}";
+    sha256 = "10ng7qn6y31s2bjahmpivw2plx90ljjjzb87j3l7zmppsjd2iq03";
+    fetchSubmodules = true;
+  };
+
+  # Use a patch to force dynamic linking
+  patches = [
+    ./CMakeLists.txt.patch
+  ];
+
+  cmakeFlags = let
+    options = {
+      BOOST_ROOT = "${boost}";
+      Boost_USE_STATIC_LIBS = "OFF";
+      RAIBLOCKS_GUI = "ON";
+      RAIBLOCKS_TEST = "ON";
+      Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5";
+      Qt5Core_DIR = "${qtbase.dev}/lib/cmake/Qt5Core";
+      Qt5Gui_INCLUDE_DIRS = "${qtbase.dev}/include/QtGui";
+      Qt5Widgets_INCLUDE_DIRS = "${qtbase.dev}/include/QtWidgets";
+    };
+    optionToFlag = name: value: "-D${name}=${value}";
+  in lib.mapAttrsToList optionToFlag options;
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ boost libGL qtbase ];
+
+  buildPhase = ''
+    make nano_wallet
+  '';
+
+  checkPhase = ''
+    ./core_test
+  '';
+
+  meta = {
+    inherit version;
+    description = "Wallet for Nano cryptocurrency";
+    homepage = https://nano.org/en/wallet/;
+    license = lib.licenses.bsd2;
+    # Fails on Darwin. See:
+    # https://github.com/NixOS/nixpkgs/pull/39295#issuecomment-386800962
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ jluttine ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 849a90cd6f9..0d4a7b893bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3846,6 +3846,8 @@ with pkgs;
 
   namazu = callPackage ../tools/text/namazu { };
 
+  nano-wallet = libsForQt5.callPackage ../applications/altcoins/nano-wallet { };
+
   nasty = callPackage ../tools/security/nasty { };
 
   nat-traverse = callPackage ../tools/networking/nat-traverse { };
-- 
GitLab


From 4feaecc23de45b37a3ca1f4b886b951d0be6d8f1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 3 May 2018 13:56:23 +0200
Subject: [PATCH 0162/1085] evolution-data-server: fix SSL support on non-GNOME
 platforms

---
 .../core/evolution-data-server/default.nix       | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 01891ad8247..2e87c4a44a1 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,6 +1,6 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf, gobjectIntrospection
+{ fetchurl, stdenv, pkgconfig, gnome3, python3, gobjectIntrospection
 , intltool, libsoup, libxml2, libsecret, icu, sqlite
-, p11-kit, db, nspr, nss, libical, gperf, makeWrapper
+, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking
 , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
 
 stdenv.mkDerivation rec {
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    cmake ninja pkgconfig intltool python3 gperf makeWrapper gobjectIntrospection vala
+    cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection vala
   ];
   buildInputs = with gnome3; [
     glib libsoup libxml2 gtk gnome-online-accounts
     gcr p11-kit libgweather libgdata libaccounts-glib json-glib
-    icu sqlite kerberos openldap webkitgtk
+    icu sqlite kerberos openldap webkitgtk glib-networking
   ];
 
   propagatedBuildInputs = [ libsecret nss nspr libical db ];
@@ -36,14 +36,6 @@ stdenv.mkDerivation rec {
     cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags"
   '';
 
-  preFixup = ''
-    for f in $(find $out/libexec/ -type f -executable); do
-      wrapProgram "$f" \
-        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-        --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
-    done
-  '';
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "evolution-data-server";
-- 
GitLab


From 8e18b7c409600faf9b60685944a00fb1bb4f1c3f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 5 May 2018 15:24:03 +0200
Subject: [PATCH 0163/1085] sublime: re-introduce accidentally removed
 attribute

---
 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 849a90cd6f9..aa84c64e8dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17948,6 +17948,8 @@ with pkgs;
     inherit sbcl lispPackages;
   };
 
+  sublime = callPackage ../applications/editors/sublime/2 { };
+
   sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { });
 
   sublime3 = sublime3Packages.sublime3;
-- 
GitLab


From 558c8a280fe7cec13c728c44fdbc3c92861fa9db Mon Sep 17 00:00:00 2001
From: Bernard Fortz <bernard.fortz@gmail.com>
Date: Sat, 5 May 2018 15:26:44 +0200
Subject: [PATCH 0164/1085] eid-mw: 4.1.19 -> 4.3.7

Urgent version bump as tax season is coming and 4.1.19 is not compatible
with firefox anymore.
---
 pkgs/tools/security/eid-mw/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index a11b70917c8..02e5e77c33e 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.1.19";
+  version = "4.3.7";
 
   src = fetchFromGitHub {
     sha256 = "191c74kxfrfb894v8y4vi2iygyffjy9jjq5fj7cnnddgwai5n3c5";
@@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
       and remove all ~/.pki and/or /etc/pki directories no longer needed.
     '';
     platforms = platforms.linux;
+    maintainers = with maintainers; [ bfortz ];
   };
 }
-- 
GitLab


From c462aa070659925c449750a1921e00b9cae7fbf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Sat, 5 May 2018 16:46:27 +0200
Subject: [PATCH 0165/1085] maria-db: Fix mariadb_config include path.

Fixes #39984.

Co-authored-by: Ekaitz Zarraga <ekaitz.zarraga@protonmail.com>
---
 pkgs/servers/sql/mariadb/default.nix             |  2 +-
 pkgs/servers/sql/mariadb/include-dirs-path.patch | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/sql/mariadb/include-dirs-path.patch

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index a9de5508371..170cc6c84a6 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -34,7 +34,7 @@ common = rec { # attributes common to both builds
     sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
   '';
 
-  patches = [ ./cmake-includedir.patch ]
+  patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ]
     ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch;
 
   cmakeFlags = [
diff --git a/pkgs/servers/sql/mariadb/include-dirs-path.patch b/pkgs/servers/sql/mariadb/include-dirs-path.patch
new file mode 100644
index 00000000000..8d468cf546a
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/include-dirs-path.patch
@@ -0,0 +1,13 @@
+diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in
+index 45d2f4e..e5666db 100644
+--- a/libmariadb/mariadb_config/mariadb_config.c.in
++++ b/libmariadb/mariadb_config/mariadb_config.c.in
+@@ -5,7 +5,7 @@
+ 
+ static char *mariadb_progname;
+ 
+-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
++#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql"
+ #define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@"
+ #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
+ #define CFLAGS  INCLUDE
-- 
GitLab


From 0c4f72c377ff0042aafe9d083692c8b15bdde70a Mon Sep 17 00:00:00 2001
From: Bernard Fortz <bernard.fortz@gmail.com>
Date: Sat, 5 May 2018 17:48:36 +0200
Subject: [PATCH 0166/1085] eid-mw: 4.1.19 -> 4.4.1

Urgent version bump as tax season is coming and 4.1.19 is not compatible
with firefox anymore.

eid-viewer was merged upstream with eid-mw, so it is included here now.
---
 pkgs/tools/security/eid-mw/default.nix     | 17 ++++++---
 pkgs/tools/security/eid-viewer/default.nix | 42 ----------------------
 pkgs/top-level/all-packages.nix            |  2 --
 3 files changed, 13 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/tools/security/eid-viewer/default.nix

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 02e5e77c33e..39090a19582 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -1,20 +1,29 @@
 { stdenv, fetchFromGitHub
 , autoreconfHook, pkgconfig
-, gtk3, nssTools, pcsclite }:
+, gtk3, nssTools, pcsclite
+, libxml2, libproxy 
+, openssl, curl }:
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.3.7";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
-    sha256 = "191c74kxfrfb894v8y4vi2iygyffjy9jjq5fj7cnnddgwai5n3c5";
+    sha256 = "0an7xgj5rzl75kq6qfrmm886v639hhlh7c9yfs8iihc47wghpma8"; 
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ gtk3 pcsclite ];
+  buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ];
+  preConfigure = ''
+    mkdir openssl
+    ln -s ${openssl.out}/lib openssl
+    ln -s ${openssl.bin}/bin openssl
+    ln -s ${openssl.dev}/include openssl
+    export SSL_PREFIX=$(realpath openssl)
+    '';
 
   postPatch = ''
     sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix
deleted file mode 100644
index 10cc314fe1d..00000000000
--- a/pkgs/tools/security/eid-viewer/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, jre, pcsclite }:
-
-stdenv.mkDerivation rec {
-  name = "eid-viewer-${version}";
-  version = "4.1.9";
-
-  src = fetchurl {
-    url = "https://downloads.services.belgium.be/eid/eid-viewer-${version}-v${version}.src.tar.gz";
-    sha256 = "0bq9jl4kl97j0dfhz4crcb1wqhn420z5vpg510zadvrmqjhy1x4g";
-  };
-
-  buildInputs = [ jre pcsclite ];
-  nativeBuildInputs = [ makeWrapper ];
-
-  unpackPhase = "tar -xzf ${src} --strip-components=1";
-
-  preConfigure = ''
-    substituteInPlace eid-viewer.sh.in --replace "exec java" "exec ${jre}/bin/java"
-  '';
-
-  postInstall = ''
-    wrapProgram $out/bin/eid-viewer --suffix LD_LIBRARY_PATH : ${pcsclite}/lib
-    cat >> $out/share/applications/eid-viewer.desktop << EOF
-    # eid-viewer creates XML without a header, making it "plain text":
-    MimeType=application/xml;text/xml;text/plain
-    EOF
-  '';
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "Belgian electronic identity card (eID) viewer";
-    homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
-    license = licenses.lgpl3;
-    longDescription = ''
-      A simple, graphical Java application to view, print and save data from
-      Belgian electronic identity cards. Independent of the eid-mw package,
-      which is required to actually use your eID for authentication or signing.
-    '';
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 849a90cd6f9..608f6097a2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2108,8 +2108,6 @@ with pkgs;
 
   eid-mw = callPackage ../tools/security/eid-mw { };
 
-  eid-viewer = callPackage ../tools/security/eid-viewer { };
-
   mcrcon = callPackage ../tools/networking/mcrcon {};
 
   tealdeer = callPackage ../tools/misc/tealdeer/default.nix { };
-- 
GitLab


From bc828721ed4ac138d791de47469a40e39046fb4a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 5 May 2018 19:02:50 +0300
Subject: [PATCH 0167/1085] nixos/lib/make-ext4-fs: Add a sanity check

I ended up with a corrupted image with the debugfs contraption once, and
given I couldn't reproduce the problem I suppose that happens if the
filesystem of the builder runs out of space.

At least in this instance fsck could detect it, so let's add it as a
sanity check.
---
 nixos/lib/make-ext4-fs.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index 986d80ff1b9..4095d9c6d00 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -14,7 +14,7 @@ in
 pkgs.stdenv.mkDerivation {
   name = "ext4-fs.img";
 
-  nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl];
+  nativeBuildInputs = with pkgs; [e2fsprogs.bin libfaketime perl];
 
   buildCommand =
     ''
@@ -83,5 +83,12 @@ pkgs.stdenv.mkDerivation {
         echo "--- Failed to create EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---"
         return 1
       fi
+
+      # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build.
+      if ! fsck.ext4 -n -f $out; then
+        echo "--- Fsck failed for EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---"
+        cat errorlog
+        return 1
+      fi
     '';
 }
-- 
GitLab


From c6a82cc40c3092a056768415c25ba6d93cbfde27 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Fri, 4 May 2018 20:56:43 -0400
Subject: [PATCH 0168/1085] liferea: 1.12.2 -> 1.12.3

New patch release. Changelog at
https://github.com/lwindolf/liferea/releases/tag/v1.12.3.
---
 pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 0b8a584fc6a..74d59c05ec9 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,13 +6,13 @@
 
 let
   pname = "liferea";
-  version = "1.12.2";
+  version = "1.12.3";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "18mz1drp6axvjbr9jdw3i0ijl3l2m191198p4c93qnm7g96ldh15";
+    sha256 = "0wm2c8qrgnadq63fivai53xm7vl05wgxc0nk39jcriscdikzqpcg";
   };
 
   nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];
-- 
GitLab


From 7ac652df4b151f62b9627522a11c3937fb137603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 3 May 2018 17:06:37 +0100
Subject: [PATCH 0169/1085] john: disable aarch64

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

diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index 7552b21ed33..e55e97656f6 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     homepage = https://github.com/magnumripper/JohnTheRipper/;
     maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
+    platforms = [ "x86_64-linux" "x86_64-darwin"];
   };
 }
-- 
GitLab


From b53182b437eaed25c24ba29aaf14d492674e457d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sat, 5 May 2018 20:37:37 +0200
Subject: [PATCH 0170/1085] plasma5: 5.12.4 -> 5.12.5

---
 pkgs/desktops/plasma-5/fetch.sh |   2 +-
 pkgs/desktops/plasma-5/srcs.nix | 352 ++++++++++++++++----------------
 2 files changed, 177 insertions(+), 177 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 117401b0eab..c73598f03d0 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.12.4/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.5/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index df031ba0627..cc1fdb88920 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,355 +3,355 @@
 
 {
   bluedevil = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/bluedevil-5.12.4.tar.xz";
-      sha256 = "1gr7zrs2h3xk6rc16wqh2fx40q6q2vm5nwk2fy9r6z639wyxhk2x";
-      name = "bluedevil-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/bluedevil-5.12.5.tar.xz";
+      sha256 = "0rjxvvg64g4panri4f09fgm571igdijfh92jp616pcqw8v1xqp2a";
+      name = "bluedevil-5.12.5.tar.xz";
     };
   };
   breeze = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/breeze-5.12.4.tar.xz";
-      sha256 = "12baji960mfkb9ynkhz6c2a76m8fwx4kvzwifwn40sxqv5m857w7";
-      name = "breeze-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/breeze-5.12.5.tar.xz";
+      sha256 = "1xxgyq3lhliv6p54akgpclficbcs2xdv15a92jkl8a2s9wbisk3n";
+      name = "breeze-5.12.5.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/breeze-grub-5.12.4.tar.xz";
-      sha256 = "0jnpwznhfml9mshx9zl9wsi8s6ygfplfw4bycq1r9gyxzlcm9zvs";
-      name = "breeze-grub-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/breeze-grub-5.12.5.tar.xz";
+      sha256 = "1w9f2xm4abqcqk2pdb7hi7d4hd1krkhrs9j3zlncxahfvf67ljad";
+      name = "breeze-grub-5.12.5.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/breeze-gtk-5.12.4.tar.xz";
-      sha256 = "183pj18ldhql845xd2lvd4klp6m2xiiaszprw83n7048s9b0bk4c";
-      name = "breeze-gtk-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/breeze-gtk-5.12.5.tar.xz";
+      sha256 = "0040z43r69kk8l90mvkk8xxzhaw35xm7z2w097sp8xd053y3pdqd";
+      name = "breeze-gtk-5.12.5.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/breeze-plymouth-5.12.4.tar.xz";
-      sha256 = "1apv2jqcjmsfvj4xi736vqsly57wwzxv088hsqcryv3l4v4qkyfr";
-      name = "breeze-plymouth-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/breeze-plymouth-5.12.5.tar.xz";
+      sha256 = "15204zqk81rwmdq07jzaiv2aninbbgqmg76dhzcz43lckjfhczq9";
+      name = "breeze-plymouth-5.12.5.tar.xz";
     };
   };
   discover = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/discover-5.12.4.tar.xz";
-      sha256 = "1gyddpafis1yfhh1dz0zvjca8pxnq5z0xvwfbmyh062xmhfy66wq";
-      name = "discover-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/discover-5.12.5.tar.xz";
+      sha256 = "02fjs016825l35gc173mblii2x9ys5cisqw8niyyvllsls4rp27m";
+      name = "discover-5.12.5.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/drkonqi-5.12.4.tar.xz";
-      sha256 = "0ijrhd689w6pg4biikfv7w6h5hwfjmsp7wcbpd2dq0xwjp3vnyb6";
-      name = "drkonqi-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/drkonqi-5.12.5.tar.xz";
+      sha256 = "0av0rqgc5a9c8lvpdphp3ifw56qc10qkbjhajlslagxswys73cfq";
+      name = "drkonqi-5.12.5.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kactivitymanagerd-5.12.4.tar.xz";
-      sha256 = "1llni6dz8014r8gaihnaxg0nn6ihjvqy7bfyigfda6iz5gwfbpcg";
-      name = "kactivitymanagerd-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kactivitymanagerd-5.12.5.tar.xz";
+      sha256 = "1mpldy47fklm9d91wjj734yw3j3pkfrj377b9c5d8l07agwnk2j1";
+      name = "kactivitymanagerd-5.12.5.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kde-cli-tools-5.12.4.tar.xz";
-      sha256 = "0w6iz9rqi9b6vy18jxksah5lr44211dhfgaxccm0gmggqpiqm5wb";
-      name = "kde-cli-tools-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kde-cli-tools-5.12.5.tar.xz";
+      sha256 = "0gs0d9p2x3q6pvjj6l7f9xq741rfqgzhbxwvz1s3cx385b85lplh";
+      name = "kde-cli-tools-5.12.5.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kdecoration-5.12.4.tar.xz";
-      sha256 = "0njs3b05hvm5s04cfn56dc98yc8sw52hwlclx0qf1hqcsjmm8bnj";
-      name = "kdecoration-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kdecoration-5.12.5.tar.xz";
+      sha256 = "0qd5pqm3s1wcmy49mry2plzivg6dhmdp521yahx0mmlk2bssxc3d";
+      name = "kdecoration-5.12.5.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kde-gtk-config-5.12.4.tar.xz";
-      sha256 = "00j2279z4b9qknip4rpaliwpwv25g3d6j9s0ajs151x94cl18wd6";
-      name = "kde-gtk-config-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kde-gtk-config-5.12.5.tar.xz";
+      sha256 = "1p5vpk85v50dkm787ljf77xa7f25lamxf5jn2qc31r8dnlc25dnh";
+      name = "kde-gtk-config-5.12.5.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kdeplasma-addons-5.12.4.tar.xz";
-      sha256 = "0ggvxmsj4r25sjaap377i6ap2qkdhjqwslcjym9bcyys1lldbcg5";
-      name = "kdeplasma-addons-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kdeplasma-addons-5.12.5.tar.xz";
+      sha256 = "1339sapqi0b6pzbsdyhpfssrvfg9sfc3amlfijxsn63swkjvbw2s";
+      name = "kdeplasma-addons-5.12.5.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kgamma5-5.12.4.tar.xz";
-      sha256 = "1v19ay77vv8y37pxqainkrlh0lpajwxgx4xxra84gzd8g7l4zs0h";
-      name = "kgamma5-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kgamma5-5.12.5.tar.xz";
+      sha256 = "0p4x8vzjngw7xxnnviiqw89lzs23nrq007211dprnfzgay9c571c";
+      name = "kgamma5-5.12.5.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/khotkeys-5.12.4.tar.xz";
-      sha256 = "1lj8axpimh34vbpgwnfhkh3f7njmqy7jihqk51vkq7ngcy1bmd6f";
-      name = "khotkeys-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/khotkeys-5.12.5.tar.xz";
+      sha256 = "1yivh10g66h9dmnabnxx1i26rpg8wf9ibpmc7jcmh7j4h5q0lkzg";
+      name = "khotkeys-5.12.5.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kinfocenter-5.12.4.tar.xz";
-      sha256 = "0dgybc8xa5lxgmw3nxfh5y085921qm5x6aw0233mwx3zj4v6nsj3";
-      name = "kinfocenter-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kinfocenter-5.12.5.tar.xz";
+      sha256 = "1g42hk49fjg4rvgvy5phshk8mna3idh55gn4cy1w0q2rl8f0y6b5";
+      name = "kinfocenter-5.12.5.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kmenuedit-5.12.4.tar.xz";
-      sha256 = "063509xbvpk2n86anpl2kcsb1v4zvx6ycwl1ppyjhgg4jim9p099";
-      name = "kmenuedit-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kmenuedit-5.12.5.tar.xz";
+      sha256 = "0vbq2s1ibqna19njw421ai4qwq4apww74qcfgk7gwd6p75k37lkw";
+      name = "kmenuedit-5.12.5.tar.xz";
     };
   };
   kscreen = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kscreen-5.12.4.tar.xz";
-      sha256 = "1pix8gfvgig5phvcqjc7yqvn1pgmdn6l8g56n06pijicrpksq315";
-      name = "kscreen-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kscreen-5.12.5.tar.xz";
+      sha256 = "1cscy7vimznwy29qr0x11wqxlxcwxvybdhw703mj44bq1szw8s0l";
+      name = "kscreen-5.12.5.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kscreenlocker-5.12.4.tar.xz";
-      sha256 = "187c6azmbcfs5w18f450f75hikpvh3lhz7qn8zb93kfm65yvjz1m";
-      name = "kscreenlocker-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kscreenlocker-5.12.5.tar.xz";
+      sha256 = "08l8knfvhrd3h8z70xq1jiq02bg56jdddxx0ml6jbd8ja9r1svdq";
+      name = "kscreenlocker-5.12.5.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/ksshaskpass-5.12.4.tar.xz";
-      sha256 = "0k405qp8ji84gd7h3lsyfhsya7z55kw2klj9a0ld9z5r7jpr95z5";
-      name = "ksshaskpass-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/ksshaskpass-5.12.5.tar.xz";
+      sha256 = "0vgqp09cfdlf22xxi0pdzdv0i4hrgvbfj3yrxrfqhfh9zlc3q6y4";
+      name = "ksshaskpass-5.12.5.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/ksysguard-5.12.4.tar.xz";
-      sha256 = "0svk5ggdbjqq9lg4ggwijy7nbwmn3mdkmvm1jqbd174myyd6hmwk";
-      name = "ksysguard-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/ksysguard-5.12.5.tar.xz";
+      sha256 = "11wh4skx3vjjrdfaa85a8ijdvsw3fnk02s1n9g6yv0c8h74q2nqv";
+      name = "ksysguard-5.12.5.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kwallet-pam-5.12.4.tar.xz";
-      sha256 = "058xxqkyyiwn34iwbmapk6bk6fi3l1g4vwbf125vc9pcbx6nqn2q";
-      name = "kwallet-pam-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kwallet-pam-5.12.5.tar.xz";
+      sha256 = "18pbsmc44pqbdylczqsx6cargzkkp4vcd44yk7mwjhniw8pi6x33";
+      name = "kwallet-pam-5.12.5.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kwayland-integration-5.12.4.tar.xz";
-      sha256 = "1lcz12iqisls2icv4jmgjndlamz2zlfyd9lbn6j2hizz7riybsla";
-      name = "kwayland-integration-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kwayland-integration-5.12.5.tar.xz";
+      sha256 = "05qcsqyw2n1hpdsiqjvg98i77kwgcdpsr0096nqr62pzf36bsqz3";
+      name = "kwayland-integration-5.12.5.tar.xz";
     };
   };
   kwin = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kwin-5.12.4.tar.xz";
-      sha256 = "0br27craalz6vqcv2g7jkskk0ia91hrir1wf1phm2lrnn4yadgf8";
-      name = "kwin-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kwin-5.12.5.tar.xz";
+      sha256 = "1mkmh90pl4pz1bb3n9zl6x6lxvr8xkj7r795qj70s9jxavl40fj3";
+      name = "kwin-5.12.5.tar.xz";
     };
   };
   kwrited = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kwrited-5.12.4.tar.xz";
-      sha256 = "0m2snmvyxfnmlhfpvghp3w6apmba7rna9xsp5szdzrxgrd92ibgy";
-      name = "kwrited-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kwrited-5.12.5.tar.xz";
+      sha256 = "0vvlkr4w4vwgkl9sili63cwlp0lsxlnzwfwmhpa5nrwcjgbyfbmz";
+      name = "kwrited-5.12.5.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/libkscreen-5.12.4.tar.xz";
-      sha256 = "1dq5mbz7vqz4dzgnpsxgmygnz00d7ziqs98qcdgfcbvkh0j4sqsr";
-      name = "libkscreen-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/libkscreen-5.12.5.tar.xz";
+      sha256 = "0hzdchkxlv5l3zx7lxzj0x44kn3086gxnhmas9w1n9b6qrf0sjb4";
+      name = "libkscreen-5.12.5.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/libksysguard-5.12.4.tar.xz";
-      sha256 = "09mqfr4dxiq4xs4ihrxvsa9wf8azmilpnl5jbi06pfw5bd1q6fpd";
-      name = "libksysguard-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/libksysguard-5.12.5.tar.xz";
+      sha256 = "0dbf3xx52xqyzaxvybmjra0z1lc3qcbb0aqmsga8rjj77bmj3kx9";
+      name = "libksysguard-5.12.5.tar.xz";
     };
   };
   milou = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/milou-5.12.4.tar.xz";
-      sha256 = "0v0m4a0idah99dvsmgng6kmlcqwpwh1rbd2j9ih7ka1xmlshdml7";
-      name = "milou-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/milou-5.12.5.tar.xz";
+      sha256 = "0v0zkwmh7rzqbgw1ypqz18bd3gn3x8iag0q9lrk6zzpd66j2r1fc";
+      name = "milou-5.12.5.tar.xz";
     };
   };
   oxygen = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/oxygen-5.12.4.tar.xz";
-      sha256 = "1k9kls7xzwb49gwjlhyxhg2jn9zh034csbdlz0pnq9h1yzwph4wa";
-      name = "oxygen-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/oxygen-5.12.5.tar.xz";
+      sha256 = "0336bkvn8mqrbswnhg87ah7k3w7i99c8rfpfvhw5qq3mm6jvbi4l";
+      name = "oxygen-5.12.5.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-desktop-5.12.4.tar.xz";
-      sha256 = "16g2vnbfd7nl61hfx7i6b3m0hms2aw4v85nbj8mf2i6csc1vzhmy";
-      name = "plasma-desktop-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-desktop-5.12.5.tar.xz";
+      sha256 = "0rm7j8n3yflzl6wpivmjsgrhc5arrnmzfg81arfs06gjdnvwnmd6";
+      name = "plasma-desktop-5.12.5.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-integration-5.12.4.tar.xz";
-      sha256 = "0qdyckmm52d0bf0062v103hy5szqqgfbh4z6h9bbjcz5l372aklb";
-      name = "plasma-integration-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-integration-5.12.5.tar.xz";
+      sha256 = "14iciz6zjxrvig58hpqa51cj5r949xq9xgqvs8glzldzg34928sm";
+      name = "plasma-integration-5.12.5.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-nm-5.12.4.tar.xz";
-      sha256 = "1mvj41hxd42wk8ja186vxv080igrdza6sqbgcajk48r2klybpfzj";
-      name = "plasma-nm-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-nm-5.12.5.tar.xz";
+      sha256 = "1awnd9gdciwrwyl2xs9h778fizhnbw8wm8ddbqr8050v7fkc7fs6";
+      name = "plasma-nm-5.12.5.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-pa-5.12.4.tar.xz";
-      sha256 = "1mngqa9957m45ij73xp3lzp19hmwwq9h40ig39mwh20gm5jrdw56";
-      name = "plasma-pa-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-pa-5.12.5.tar.xz";
+      sha256 = "13z9shlnprbjgqy1w8lf3brjcvmh76fpl0xv3q2r7kvcgm1ndjdd";
+      name = "plasma-pa-5.12.5.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-sdk-5.12.4.tar.xz";
-      sha256 = "1mw477p1z396gsbdx3m9cp0b2ljhqjw39grklg7l4cgrhiwrnjk2";
-      name = "plasma-sdk-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-sdk-5.12.5.tar.xz";
+      sha256 = "0rrwis63khq1b6shxrp5cj6dgz9lhrccs7752f7j73pi5fpmbz0g";
+      name = "plasma-sdk-5.12.5.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-tests-5.12.4.tar.xz";
-      sha256 = "13gq7mfimh4xd4f2vqaqri3f1v8nh7yixqppjip8s9mq3amf6xd9";
-      name = "plasma-tests-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-tests-5.12.5.tar.xz";
+      sha256 = "1rq8li7y3qf1ipyhy869lw3znmssf5grbh522qla4sn08d1lhxij";
+      name = "plasma-tests-5.12.5.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-vault-5.12.4.tar.xz";
-      sha256 = "022vqjra25v9bw9j14j0a5jl9r08iqvzd5zn0dhz6l4bj0amcd8n";
-      name = "plasma-vault-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-vault-5.12.5.tar.xz";
+      sha256 = "0zrwsqcpkssrfhy2xgg4y2k2w6l7vyn7mqani9lw18i13vp2fh1d";
+      name = "plasma-vault-5.12.5.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-5.12.4.tar.xz";
-      sha256 = "00n2i6hj0fqss69gmmdhf32sfybak3l1iw379ljc3l4k6b3kzmh7";
-      name = "plasma-workspace-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-5.12.5.tar.xz";
+      sha256 = "1vy5p22y6jckhm09171pjacdrndl7vak6grwvzg8bmhqk1ahzdwk";
+      name = "plasma-workspace-5.12.5.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-wallpapers-5.12.4.tar.xz";
-      sha256 = "1y2mqkql2nadq3npxjp5hr2vzq3i45b4xp7gzcjl9bb2wppmhv4j";
-      name = "plasma-workspace-wallpapers-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-wallpapers-5.12.5.tar.xz";
+      sha256 = "1p6kcakdw020pjwdfdhh1v8bha8r6j9934nid7vv7ldp388mq6a7";
+      name = "plasma-workspace-wallpapers-5.12.5.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plymouth-kcm-5.12.4.tar.xz";
-      sha256 = "1aakf2qrbnnv2n2rp57jql6nvl9i5mxpy0f4f5bjlqjxhzjlwwkn";
-      name = "plymouth-kcm-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plymouth-kcm-5.12.5.tar.xz";
+      sha256 = "1fv2b792d7bg5vdix823fks8capgbnda94fc8z91nsffa894p0i9";
+      name = "plymouth-kcm-5.12.5.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.12.4";
+    version = "1-5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/polkit-kde-agent-1-5.12.4.tar.xz";
-      sha256 = "0wwk1cr4mh2csjv0xrahzwyxyg8znd839zz518hfxdcv9a1rba2q";
-      name = "polkit-kde-agent-1-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/polkit-kde-agent-1-5.12.5.tar.xz";
+      sha256 = "01plpzhj2fc2i3hjqb75skmyiy9dg3mw2h1sxsl7hxmbvm9fv9if";
+      name = "polkit-kde-agent-1-5.12.5.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/powerdevil-5.12.4.tar.xz";
-      sha256 = "043k0zhab6nqa1kc09d9d8jg7j1sd7jy0zhrwb66lf29yc6iyahx";
-      name = "powerdevil-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/powerdevil-5.12.5.tar.xz";
+      sha256 = "07f3kqvfqgqpz50fk8dwyr5z1hylli0k4ndlcp5mkybiraz1rdjk";
+      name = "powerdevil-5.12.5.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/sddm-kcm-5.12.4.tar.xz";
-      sha256 = "0bm8h5r4nin0hx1nfqya1lxcp93745shk6ifqrizgzw1ldqqyah7";
-      name = "sddm-kcm-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/sddm-kcm-5.12.5.tar.xz";
+      sha256 = "13qqyvq7rk7h65krjaqgil2rxjj7073arxp4bij5g534ckpwkz3h";
+      name = "sddm-kcm-5.12.5.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/systemsettings-5.12.4.tar.xz";
-      sha256 = "0af2vqnlwxa7ldra78y0gwq1cra227q49ww7w1cnvgq0il7cav4a";
-      name = "systemsettings-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/systemsettings-5.12.5.tar.xz";
+      sha256 = "0ackzdyfmssq6lh9dranc8nv6bhk633zq1mixibqhswl3pz8n4h8";
+      name = "systemsettings-5.12.5.tar.xz";
     };
   };
   user-manager = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/user-manager-5.12.4.tar.xz";
-      sha256 = "1y144lw1a4q4pp9hw31lr806fpm1p397ibpbagcdr3xaka2z36lm";
-      name = "user-manager-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/user-manager-5.12.5.tar.xz";
+      sha256 = "1566scbw6f02gskwdc2kk6xcbbf7hq6jkz3ka1avkwmyi3xhh010";
+      name = "user-manager-5.12.5.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/xdg-desktop-portal-kde-5.12.4.tar.xz";
-      sha256 = "18b97mbyfqvf2ygwrggi5zvkv8a9givqjlyaqi184h8mgndn044c";
-      name = "xdg-desktop-portal-kde-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/xdg-desktop-portal-kde-5.12.5.tar.xz";
+      sha256 = "1rmjwjx7x481607vp0pjxsabbjhm7qfqa0ax4ciqqlv676hcr5cv";
+      name = "xdg-desktop-portal-kde-5.12.5.tar.xz";
     };
   };
 }
-- 
GitLab


From d84a06feca9b6d43df669610523665067a26d41d Mon Sep 17 00:00:00 2001
From: Bernard Fortz <bernard.fortz@gmail.com>
Date: Sat, 5 May 2018 21:00:06 +0200
Subject: [PATCH 0171/1085] eid-mw: 4.1.19 -> 4.4.1

Urgent version bump as tax season is coming and 4.1.19 is not compatible
with firefox anymore.

eid-viewer was merged upstream with eid-mw, so it is included here now.
---
 pkgs/tools/security/eid-mw/default.nix | 35 +++++++++++++++-----------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 39090a19582..eb886148674 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -2,7 +2,8 @@
 , autoreconfHook, pkgconfig
 , gtk3, nssTools, pcsclite
 , libxml2, libproxy 
-, openssl, curl }:
+, openssl, curl
+, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "Fedict";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
   buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ];
   preConfigure = ''
     mkdir openssl
@@ -31,39 +32,45 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-dialogs=yes" ];
 
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
   postInstall = ''
     install -D ${./eid-nssdb.in} $out/bin/eid-nssdb
     substituteInPlace $out/bin/eid-nssdb \
       --replace "modutil" "${nssTools}/bin/modutil"
 
-    # Only provides a useless "about-eid-mw.desktop" that segfaults anyway:
-    rm -r $out/share/applications $out/bin/about-eid-mw
+    rm $out/bin/about-eid-mw
+    wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" 
   '';
 
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "Belgian electronic identity card (eID) middleware";
     homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
     license = licenses.lgpl3;
     longDescription = ''
       Allows user authentication and digital signatures with Belgian ID cards.
-      Also requires a running pcscd service and compatible card reader.
+      Also requires a running pcscd service and compatible card reader. 
 
+      eid-viewer is also installed.
+
+      **TO FIX:** 
+      The procedure below did not work for me, I had to install the .so directly in firefox as instructed at
+      https://eid.belgium.be/en/log-eid#7507
+      and specify
+      /run/current-system/sw/lib/libbeidpkcs11.so
+      as the path to the module.
+
+      This package only installs the libraries. To use eIDs in Firefox or
+      Chromium, the eID Belgium add-on must be installed.
       This package only installs the libraries. To use eIDs in NSS-compatible
       browsers like Chrom{e,ium} or Firefox, each user must first execute:
-
         ~$ eid-nssdb add
-
       (Running the script once as root with the --system option enables eID
       support for all users, but will *not* work when using Chrom{e,ium}!)
-
       Before uninstalling this package, it is a very good idea to run
-
         ~$ eid-nssdb [--system] remove
-
       and remove all ~/.pki and/or /etc/pki directories no longer needed.
     '';
     platforms = platforms.linux;
-- 
GitLab


From bf65cf4d28da2715a6f113aee8d714111848946f Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Sat, 5 May 2018 22:31:21 +0200
Subject: [PATCH 0172/1085] skhd: 0.0.12 -> 0.0.14

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

diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index 24eb644e96f..3331084d807 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "skhd-${version}";
-  version = "0.0.12";
+  version = "0.0.14";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "skhd";
     rev = "v${version}";
-    sha256 = "09ihfd7cfqnfv095skn6rbrmjji61skwgg36b6s055fycrlbyp0h";
+    sha256 = "0kkmlka1hxsjdkx0ywkm48p9v1jhld26lfplls20n0hj97i5iwlz";
   };
 
   buildInputs = [ Carbon ];
-- 
GitLab


From 8143383aabbc1d8049c3c3984aa998c9a64b3f47 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Sun, 6 May 2018 01:42:32 +0300
Subject: [PATCH 0173/1085] zoom-us: update 2.0.106600.0904 -> 2.0.123200.0405,
 cleanup

Apart from version update:
- remove some packages from `LD_LIBRARY_PATH`. I haven't found any
references for them. Most of them were copypasted from AUR expression
- found an implicit reference to `pidof`, in my case this caused warnings
about mismatched Glibc version. I've found implicit reference to `sh` too,
with Glibc warning too, but I don't know how to fix this, and looks like it's
only a warning
---
 .../instant-messengers/zoom-us/default.nix    | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 03b4b980929..db32dd0c23e 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, system, makeWrapper, makeDesktopItem,
-  alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
-  libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }:
+  alsaLib, dbus, glib, fontconfig, freetype, libpulseaudio,
+  utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps }:
 
 let
 
-  version = "2.0.106600.0904";
+  version = "2.0.123200.0405";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "1dcr0rqgjingjqbqv37hqjhhwy8axnjyirrnmjk44b5xnh239w9s";
+      sha256 = "1ifwa2xf5mw1ll2j1f39qd7mpyxpc6xj3650dmlnxf525dsm573z";
     };
   };
 
@@ -17,25 +17,20 @@ in stdenv.mkDerivation {
 
   src = srcs.${system};
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   libPath = stdenv.lib.makeLibraryPath [
     alsaLib
-    dbus
+    expat
     glib
-    gstreamer
-    fontconfig
     freetype
     libpulseaudio
-    libxml2
-    libxslt
-    nspr
-    nss
+    zlib
+    dbus
+    fontconfig
     sqlite
     utillinux
-    zlib
     udev
-    expat
 
     xorg.libX11
     xorg.libSM
@@ -79,6 +74,7 @@ in stdenv.mkDerivation {
     makeWrapper $packagePath/zoom $out/bin/zoom-us \
         --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \
         --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \
+        --prefix PATH : "${procps}/bin" \
         --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 b21da3704499367621cc776bf49675687bb4c911 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 24 Apr 2018 15:28:31 +0200
Subject: [PATCH 0174/1085] nodePackages_8_x.three: Init at 0.92.0

---
 .../node-packages/node-packages-v6.nix        | 3639 ++++++++---------
 .../node-packages/node-packages-v8.json       |    1 +
 .../node-packages/node-packages-v8.nix        |  400 +-
 3 files changed, 1958 insertions(+), 2082 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index e5d9ff18eb0..e50628e014f 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -94,22 +94,31 @@ let
         sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4";
       };
     };
-    "@types/node-8.10.4" = {
+    "@types/node-10.0.4" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "8.10.4";
+      version = "10.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.10.4.tgz";
-        sha512 = "345l7fbkr415rdf3p0akk11k8shxibfl77crpj3wd3a8d4lbsdpylfzm8ihkg6wnj88gjpcwy4nw6vb2x58kwx15fbl09bz96dlrahn";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.0.4.tgz";
+        sha512 = "2zwjjfa4s706r0w45siwgzax5c8g5j3z79dkckwzgrzqxglj070ijv0m9g1ipc1y4kr7l0r9qia9yfxc9syw64hib8vh216cxk1las6";
       };
     };
-    "@types/node-9.6.2" = {
+    "@types/node-8.10.12" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "9.6.2";
+      version = "8.10.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz";
-        sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.10.12.tgz";
+        sha512 = "199k4d6vmwxd4bkmxmpszdvz6nxby7px5w2cw0yrhrp5clmxvsfc1xnwirjlpidfc4a76i6pzprmdkrpli8i454s909bx6z7wd584b9";
+      };
+    };
+    "@types/node-9.6.12" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "9.6.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-9.6.12.tgz";
+        sha512 = "2515a59dsfswy2l4i7hid0krh69mzz42byi55a12a0cz21masdmd3j0zc8aq7qyh2sm6lmhzbxy1n8vhb563ybjhiygavn9d24k77yr";
       };
     };
     "@types/request-2.47.0" = {
@@ -481,6 +490,15 @@ let
         sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
       };
     };
+    "adm-zip-0.4.9" = {
+      name = "adm-zip";
+      packageName = "adm-zip";
+      version = "0.4.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.9.tgz";
+        sha512 = "03k8g7lxi05n57v16vv32x32lkikh9qvv4pmkycrw52j3r031fkvns49z8wvfbj3rjj6vh712ahyfz5k3m5b9v832n9dz18f8kxljbs";
+      };
+    };
     "after-0.8.1" = {
       name = "after";
       packageName = "after";
@@ -616,13 +634,13 @@ let
         sha1 = "617997fc5f60576894c435f940d819e135b80762";
       };
     };
-    "ajv-keywords-3.1.0" = {
+    "ajv-keywords-3.2.0" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz";
-        sha1 = "ac2b27939c543e95d2c06e7f7f5c27be4aa543be";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz";
+        sha1 = "e86b819c602cf8821ad637413698f1dec021847a";
       };
     };
     "ajv-merge-patch-3.0.0" = {
@@ -1030,13 +1048,13 @@ let
         sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4";
       };
     };
-    "args-3.0.8" = {
+    "args-4.0.0" = {
       name = "args";
       packageName = "args";
-      version = "3.0.8";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/args/-/args-3.0.8.tgz";
-        sha512 = "26h2nssgwzgc9y1mywgjcx2rbbkxlpx23zj9gh81bayjr8522zi78rwrhpkkqwh7dwqx6mv8gphcx8zyv3vm8hxw5s89kjlzm66k7y9";
+        url = "https://registry.npmjs.org/args/-/args-4.0.0.tgz";
+        sha512 = "2xd628jhziygi9jr16ckq557189nw5lracgzcpv8ddvymc3mjxvqzffgp68wmgknw6ps7nliwwyismriv6z4snvn0xmm7kwbrafbgp1";
       };
     };
     "arr-diff-2.0.0" = {
@@ -1579,13 +1597,13 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "atob-2.1.0" = {
+    "atob-2.1.1" = {
       name = "atob";
       packageName = "atob";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz";
-        sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a";
+        url = "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz";
+        sha1 = "ae2d5a729477f289d60dd7f96a6314a22dd6c22a";
       };
     };
     "atomic-batcher-1.0.2" = {
@@ -1615,13 +1633,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.223.1" = {
+    "aws-sdk-2.233.1" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.223.1";
+      version = "2.233.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.223.1.tgz";
-        sha1 = "b264bf6407d7c74152f08b4a8fda8aad3a84baa4";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.233.1.tgz";
+        sha1 = "b4f541069a9f2781e9f73e1336ce81a9fc08bcf1";
       };
     };
     "aws-sign-0.2.0" = {
@@ -2038,13 +2056,13 @@ let
         sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b";
       };
     };
-    "babel-core-6.26.0" = {
+    "babel-core-6.26.3" = {
       name = "babel-core";
       packageName = "babel-core";
-      version = "6.26.0";
+      version = "6.26.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz";
-        sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8";
+        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz";
+        sha512 = "0617drz6fkpdpkl4snbfz7ivd296j19182m7x4klhqac60qr77wn8bkgpz696sscxykcv1n8cdv09pz7v9xq6s1k552fyp6w0p8ag7a";
       };
     };
     "babel-generator-6.26.1" = {
@@ -2236,13 +2254,13 @@ let
         sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f";
       };
     };
-    "bail-1.0.2" = {
+    "bail-1.0.3" = {
       name = "bail";
       packageName = "bail";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz";
-        sha1 = "f7d6c1731630a9f9f0d4d35ed1f962e2074a1764";
+        url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz";
+        sha512 = "1v31szd5dwn62xh8a9cy95yby0ibq9j9barzs03hxjr4vcjnwz1mgjdb9p4rqgymjm3f5zrxgrnqkjd9h9viykd56zfchsm66g04zym";
       };
     };
     "balanced-match-1.0.0" = {
@@ -2326,6 +2344,15 @@ let
         sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j";
       };
     };
+    "base64-js-1.3.0" = {
+      name = "base64-js";
+      packageName = "base64-js";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz";
+        sha512 = "2bvd1ja1kbighx0vm4ia3gqv15m70pldsx2igl37ayq11715w3g0vfmfq1yb8w80hlzblvszig3fr4sdhn8rr800lsaz8dg47zsziki";
+      };
+    };
     "base64-url-1.2.1" = {
       name = "base64-url";
       packageName = "base64-url";
@@ -2524,13 +2551,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "big-integer-1.6.27" = {
+    "big-integer-1.6.28" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.27";
+      version = "1.6.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.27.tgz";
-        sha512 = "2v5f59yjsa3hzwhk333s84nfl1x24w52h9hqpwbav0p5v5d5prkna0flw25ywccrrjziq3lylbl874qqikzljkyz2g6jjdqhlqhld9p";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.28.tgz";
+        sha512 = "3b56jaa0yvrl9p90c0phnhyh02sv9hxssl8y0nghv91ra8akrcdpxm55c1gf5w1is9991wm2g0wqcr4hm5ri9lmzwd8gc9d72pzg51q";
       };
     };
     "big.js-3.2.0" = {
@@ -2677,13 +2704,13 @@ let
         sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky";
       };
     };
-    "bittorrent-dht-8.2.0" = {
+    "bittorrent-dht-8.3.0" = {
       name = "bittorrent-dht";
       packageName = "bittorrent-dht";
-      version = "8.2.0";
+      version = "8.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.2.0.tgz";
-        sha512 = "291qfv5f3w3d7zcq9xyjplpnaaahy7mzj664w5g9w1zgiwv3dikl38r8wx0rdb3afsv5ih0ghrzc2r1k19c52axsagnpsc10hihlkii";
+        url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.3.0.tgz";
+        sha512 = "2p2fxhvwin4xnjdmbhrlwivx4a8pjzfn6mc5qxnxzl1q40xxp56wd6xrcxfq9viqjkvpc7g0j3dvgmvcywhgw41nvjyxi8pgm5v43kp";
       };
     };
     "bittorrent-peerid-1.2.0" = {
@@ -2695,13 +2722,13 @@ let
         sha1 = "9f675612f0e6afc6ef3450dfba51ff7238abf371";
       };
     };
-    "bittorrent-protocol-2.4.0" = {
+    "bittorrent-protocol-2.4.1" = {
       name = "bittorrent-protocol";
       packageName = "bittorrent-protocol";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.0.tgz";
-        sha512 = "3xggi5fxwkzkkgy3z7v5b9w7fk2bjan077b4s9rvqfp7cmnw6l96p36qlkqgp38rd57lzdlkay42dkqhcb8r7gzszp5598nviy0p4mb";
+        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.1.tgz";
+        sha512 = "0vx3k29q25mp4ind4745868n0hc7xcggwbj0hyqp0hfblfxpdwddv1gwdh0x0m9skja637bxvn2i1ssvqrc80qyjfy4asw63rpvg99m";
       };
     };
     "bittorrent-tracker-7.7.0" = {
@@ -2713,13 +2740,13 @@ let
         sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c";
       };
     };
-    "bittorrent-tracker-9.7.0" = {
+    "bittorrent-tracker-9.9.1" = {
       name = "bittorrent-tracker";
       packageName = "bittorrent-tracker";
-      version = "9.7.0";
+      version = "9.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.7.0.tgz";
-        sha512 = "06jp495xv047v5n3wclbga8laqmgjis5wjwhc7ggq2qx4xszp395mg2v0147p7v0ybpw5bpvdfhr1zp12barvn2lgj9f0c9iji4jr5r";
+        url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.9.1.tgz";
+        sha512 = "06yb4m1bbllq52hhm7cp5j35bd9my3rhlsgaycpv6g9iymxq0qr8bx9fmxr673i9m6nxvkbrjym7ykp9f8w674inpp3csplqf2apl1x";
       };
     };
     "bl-0.8.2" = {
@@ -3037,15 +3064,6 @@ let
         sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb";
       };
     };
-    "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";
-      };
-    };
     "boxen-1.3.0" = {
       name = "boxen";
       packageName = "boxen";
@@ -3190,15 +3208,6 @@ let
         sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9";
       };
     };
-    "browserify-14.5.0" = {
-      name = "browserify";
-      packageName = "browserify";
-      version = "14.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz";
-        sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0";
-      };
-    };
     "browserify-aes-1.2.0" = {
       name = "browserify-aes";
       packageName = "browserify-aes";
@@ -3217,22 +3226,22 @@ let
         sha1 = "96247e853f068fd6e0d45cc73f0bb2cd9778ef02";
       };
     };
-    "browserify-cipher-1.0.0" = {
+    "browserify-cipher-1.0.1" = {
       name = "browserify-cipher";
       packageName = "browserify-cipher";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz";
-        sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a";
+        url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz";
+        sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h";
       };
     };
-    "browserify-des-1.0.0" = {
+    "browserify-des-1.0.1" = {
       name = "browserify-des";
       packageName = "browserify-des";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz";
-        sha1 = "daa277717470922ed2fe18594118a175439721dd";
+        url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz";
+        sha512 = "35rl28vzg80fa81b0a7rdaj71zf0ymxxhlmdpisps4dlgvkazbxz47q9fnl1n9wnbq7ilk6vnbxa399zcwdjdz3i0lii1mpnyhh4bfg";
       };
     };
     "browserify-incremental-3.1.1" = {
@@ -3892,6 +3901,15 @@ let
         sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
       };
     };
+    "camelcase-5.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz";
+        sha512 = "2q57983k3n95gzbhqhc0cv6krvq7nd37h837xg6favqywdda14ha7k2xbdaryni3xzzm55pvi0adrl1fbgxypaxz1kvrifnm5kb1akx";
+      };
+    };
     "camelcase-keys-2.1.0" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -3973,13 +3991,13 @@ let
         sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa";
       };
     };
-    "ccount-1.0.2" = {
+    "ccount-1.0.3" = {
       name = "ccount";
       packageName = "ccount";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz";
-        sha1 = "53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89";
+        url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz";
+        sha512 = "2dqnm6wybhq4zcdf3x97zjibb5zvvcbq3p837sp61rk6wvbk3nqq4lpivvxgvgg4cgl346aqzkpwry1sl7l1yw7ab7d6wqi34h6vpr6";
       };
     };
     "center-align-0.1.3" = {
@@ -4072,31 +4090,49 @@ let
         sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4";
       };
     };
-    "character-entities-1.2.1" = {
+    "chalk-2.4.0" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz";
+        sha512 = "0bnfi1y6b0wl6wn93ykm3awxyjnsknai0hrnvvkxfvjrcsld722r3ljdac9zifvvg8vqd4pxlrhrc4r58yp0xxfxj2bpx18zv8z1gss";
+      };
+    };
+    "chalk-2.4.1" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz";
+        sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr";
+      };
+    };
+    "character-entities-1.2.2" = {
       name = "character-entities";
       packageName = "character-entities";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz";
-        sha1 = "f76871be5ef66ddb7f8f8e3478ecc374c27d6dca";
+        url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz";
+        sha512 = "30y1wgwpay9yfcz4l3wj9yslp751hch7vhing2f748qn8clk0im3f32xn25k57s6q94mkq0gnk6ga8icz3yzhm752vjq1p7mxghgjmh";
       };
     };
-    "character-entities-html4-1.1.1" = {
+    "character-entities-html4-1.1.2" = {
       name = "character-entities-html4";
       packageName = "character-entities-html4";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz";
-        sha1 = "359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50";
+        url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz";
+        sha512 = "0ikbsydxv9ap7im4i2l4nv5gqgilwwbbpxf8xgyknz3cv2jgp4285f0kdl0qcv1xbh9946a9wkcyd4b7mg5nzg0s5dyxnys571xg2mh";
       };
     };
-    "character-entities-legacy-1.1.1" = {
+    "character-entities-legacy-1.1.2" = {
       name = "character-entities-legacy";
       packageName = "character-entities-legacy";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz";
-        sha1 = "f40779df1a101872bb510a3d295e1fccf147202f";
+        url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz";
+        sha512 = "2ag1akl7wv9ysm4qkkrx8r59mj08xgnavah9hn79ggzknkb5hikn15fdgbcql4yln4a5kbi0b8xykwhy80vrarsbyfqapgdnmapdl7l";
       };
     };
     "character-parser-1.2.1" = {
@@ -4117,13 +4153,13 @@ let
         sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0";
       };
     };
-    "character-reference-invalid-1.1.1" = {
+    "character-reference-invalid-1.1.2" = {
       name = "character-reference-invalid";
       packageName = "character-reference-invalid";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz";
-        sha1 = "942835f750e4ec61a308e60c2ef8cc1011202efc";
+        url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz";
+        sha512 = "1wm395ypw8d7xpq3jffx9m3j24simj28sf9symc9pa94s8l04maqagcy79j62yngip7rvcg4c7zvvxx7hygw9r0k44jaayzwmqz33zc";
       };
     };
     "chardet-0.4.2" = {
@@ -4234,13 +4270,13 @@ let
         sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
       };
     };
-    "chrome-trace-event-0.1.2" = {
+    "chrome-trace-event-0.1.3" = {
       name = "chrome-trace-event";
       packageName = "chrome-trace-event";
-      version = "0.1.2";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.2.tgz";
-        sha1 = "90f36885d5345a50621332f0717b595883d5d982";
+        url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz";
+        sha512 = "3y9nwc7vk3r253x4yrz1ibinpd6xcfy75skh9i5s5gkh3c93sddvlp7dkr5fjs6aarr9n8cy0ck8zwfw10h4fqnw6p6ibgbj74xsfdj";
       };
     };
     "chromecast-player-0.2.3" = {
@@ -4333,13 +4369,13 @@ let
         sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji";
       };
     };
-    "circular-json-0.5.1" = {
+    "circular-json-0.5.3" = {
       name = "circular-json";
       packageName = "circular-json";
-      version = "0.5.1";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.1.tgz";
-        sha512 = "1myzlq58v42dc2b1i17rcmvj7529spwcqgzc7j2q663a7xkk4nhzqk6hpw20lvp99iaq0k0zg5p0jzf19n7p0vrg45hk160ai31qf2j";
+        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.3.tgz";
+        sha512 = "0gpz4w5khkmnx6wpsh9ccxkwc2cp9i4s9dgf2fi9dgq78ik42cld3sgil5lc3rkjvdp5fgv33c1b8pjvx3dw7kk3q3888ly54x4np32";
       };
     };
     "clarinet-0.11.0" = {
@@ -4540,15 +4576,6 @@ let
         sha512 = "0j60cwp5vpc7v13m0d5rgh6h5jf6yxnywfb1wgbdn7lalklrr5ncvfkkqk6xj7b046bl2jabfqifk3yl6agd93ixfmywif2xfc4hqyr";
       };
     };
-    "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";
-      };
-    };
     "cliui-2.1.0" = {
       name = "cliui";
       packageName = "cliui";
@@ -4567,13 +4594,13 @@ let
         sha1 = "120601537a916d29940f934da3b48d585a39213d";
       };
     };
-    "cliui-4.0.0" = {
+    "cliui-4.1.0" = {
       name = "cliui";
       packageName = "cliui";
-      version = "4.0.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz";
-        sha512 = "0mh539939k4z2nhj5h1m8kdr3bfy2f1kmdkss02cdbyabmpdkc6m22llyykymriahf54gpx6qg9v3vrs51gqgrrfhpsgbdndgjdd3cx";
+        url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz";
+        sha512 = "26knyxdavl3y7kq82vfa094ym3n05vy2h2j5srb9fhhy8l43l0kwlasah5i78jks77zqgc373hbf96xcxv6am042gpbw35x452vwlg0";
       };
     };
     "clivas-0.1.4" = {
@@ -4846,13 +4873,13 @@ let
         sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
       };
     };
-    "collapse-white-space-1.0.3" = {
+    "collapse-white-space-1.0.4" = {
       name = "collapse-white-space";
       packageName = "collapse-white-space";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz";
-        sha1 = "4b906f670e5a963a87b76b0e1689643341b6023c";
+        url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz";
+        sha512 = "0iifkywgm8zqn27w0maj5c1yarf294qm5qqcbsajafv8r5f9w02ss33qfngyp59mamv8h8yqx93xpsqnabzn0wnpssrx6qr0ns3bx31";
       };
     };
     "collection-visit-1.0.0" = {
@@ -4945,13 +4972,13 @@ let
         sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
       };
     };
-    "colors-1.2.1" = {
+    "colors-1.2.4" = {
       name = "colors";
       packageName = "colors";
-      version = "1.2.1";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz";
-        sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk";
+        url = "https://registry.npmjs.org/colors/-/colors-1.2.4.tgz";
+        sha512 = "1ch53w9md043zff52vsmh89qirws3x7n4zw88xxw0h98fjg71dsll3gh1b598a48xq98d15qpjb07g9ddjsfknrba0byp56fl3a53z9";
       };
     };
     "colour-0.7.1" = {
@@ -5630,13 +5657,13 @@ let
         sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f";
       };
     };
-    "conventional-changelog-1.1.23" = {
+    "conventional-changelog-1.1.24" = {
       name = "conventional-changelog";
       packageName = "conventional-changelog";
-      version = "1.1.23";
+      version = "1.1.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.23.tgz";
-        sha512 = "2775l94nr8rbnvhihkrwyszncc2g7z1kvbsqpbvni86h8072xvxngbba6yxzzw4dfs57ghklkh9l0ibjy17rl7ldrh6q9lpyd9xf8y8";
+        url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.24.tgz";
+        sha512 = "3ap10i691k1bd6kslyrxrlrcqzdgdv1mibnraknwvls1n1kcbw77w9d6sljjdan766bhx0md07gz6ihjwsk3s3vhiw7cqvqrd914ryr";
       };
     };
     "conventional-changelog-angular-1.6.6" = {
@@ -5657,13 +5684,13 @@ let
         sha512 = "3m1yhgjwbz0x993dfdw3g2n4svz4ym4k1snhg57iraw1418glgdwpz52j01300v8d1p6ldjjbrv7x3gqa08xcqq6inpkbhv2fmdk4zj";
       };
     };
-    "conventional-changelog-cli-1.3.21" = {
+    "conventional-changelog-cli-1.3.22" = {
       name = "conventional-changelog-cli";
       packageName = "conventional-changelog-cli";
-      version = "1.3.21";
+      version = "1.3.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.21.tgz";
-        sha512 = "1n93839r75vwj9fl4i3x3l06zc84kin92cp8nrlxksga9lqdpxc8b8i72wvi9jvwk0z6i29wisxdpiw6y7rrmdl13ch9f3k7jb43m9b";
+        url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz";
+        sha512 = "1kb6qrs4myjknqg4cpl530gxzbainsvhrzg6hm6xhdjhprby9flw28y92cbimq9cqpc6qq2bldzbnlxf1yzq5yhamwld3pijqhdsy56";
       };
     };
     "conventional-changelog-codemirror-0.3.8" = {
@@ -5675,22 +5702,22 @@ let
         sha512 = "24l71rg9rqfl9aa8fi3c1dc2iqxmdsh6ba8b9rwrrj7dg1gzfc5afw03rns5b1h6zld15942aqsjvwklwp6myzw3q1aakaps0m5jwfw";
       };
     };
-    "conventional-changelog-core-2.0.10" = {
+    "conventional-changelog-core-2.0.11" = {
       name = "conventional-changelog-core";
       packageName = "conventional-changelog-core";
-      version = "2.0.10";
+      version = "2.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.10.tgz";
-        sha512 = "19pvarpv78qfmlnsz11c8anrwfg1v04qmwrsrcnai8p3xmbzdyvp1znz9j23l0i6l26yabkd4b631wybnkgxr4qgwzgb9hvf8fhvz8l";
+        url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz";
+        sha512 = "13c6y0mi0wqrx2rklaiqn2dxy9bsn53fb0w1r7072y8fp2cbnwdvijn8b42qidrmzcbbpcgn4pcx05h9ghl3vak6izlcy3a37lw9x0y";
       };
     };
-    "conventional-changelog-ember-0.3.11" = {
+    "conventional-changelog-ember-0.3.12" = {
       name = "conventional-changelog-ember";
       packageName = "conventional-changelog-ember";
-      version = "0.3.11";
+      version = "0.3.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.11.tgz";
-        sha512 = "1pm9wncjsfizvxzf84fp9ywdfm0znj0af0h2012ylazva8iis7zp4vph9ymrnd87kfmdv5gk2s0nsq8gqm6vxh87vbdykg640zczf0j";
+        url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz";
+        sha512 = "2hi3q231r8izwb8863rcmm3craji5glcr8icm0ijxa8jdlanshghdb5pnqrqay09kjkaiff9qxpnggb4b1p8gazg2mb6vmkpc1p6qls";
       };
     };
     "conventional-changelog-eslint-1.0.9" = {
@@ -6143,13 +6170,13 @@ let
         sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4";
       };
     };
-    "create-ecdh-4.0.0" = {
+    "create-ecdh-4.0.1" = {
       name = "create-ecdh";
       packageName = "create-ecdh";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz";
-        sha1 = "888c723596cdf7612f6498233eebd7a35301737d";
+        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.1.tgz";
+        sha512 = "2whpg1253714sq60ayvsap6n3qdwa9l0zhdlxv2gz8frppds69w1q079pmf55qlygnc7ad499511xsbswy0a39asqcp9a0p1w5c56w9";
       };
     };
     "create-error-class-3.0.2" = {
@@ -6161,31 +6188,31 @@ let
         sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
       };
     };
-    "create-hash-1.1.3" = {
+    "create-hash-1.2.0" = {
       name = "create-hash";
       packageName = "create-hash";
-      version = "1.1.3";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz";
-        sha1 = "606042ac8b9262750f483caddab0f5819172d8fd";
+        url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz";
+        sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg";
       };
     };
-    "create-hmac-1.1.6" = {
+    "create-hmac-1.1.7" = {
       name = "create-hmac";
       packageName = "create-hmac";
-      version = "1.1.6";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz";
-        sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06";
+        url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz";
+        sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h";
       };
     };
-    "create-torrent-3.30.0" = {
+    "create-torrent-3.31.0" = {
       name = "create-torrent";
       packageName = "create-torrent";
-      version = "3.30.0";
+      version = "3.31.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.30.0.tgz";
-        sha512 = "15hphpabh12fwvjbaihwjr1sqzj6c4lzcms4jbyy0s2jk1rirrg3cb9743g2a8jw2ihz15yfw0dxqwnc6n5nixiazdg7hwaj8d5nfmi";
+        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.31.0.tgz";
+        sha512 = "1na322prpyqfv81davvqya3rs9pv99rsh611kvqfaps96izmysyw7ppfm3n8qj94y4z6ib8mjs591f6vhdx501v0nqv27pn09qbsfnh";
       };
     };
     "cron-1.3.0" = {
@@ -6638,13 +6665,13 @@ let
         sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad";
       };
     };
-    "dat-doctor-1.3.1" = {
+    "dat-doctor-1.4.0" = {
       name = "dat-doctor";
       packageName = "dat-doctor";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.3.1.tgz";
-        sha512 = "19cfxdik2pv94dbfsz4nm6a0v6vfx5s1isaagmsjrb44czbcl55sjj9nf1302hqc8ckijsdmlsrna02hb0mjzzhsy0m6c8r3cv0wabk";
+        url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz";
+        sha512 = "3ysgc2z0pjbka9617lqykw8c0bqbacgixd6j8nlcdi7sz7j94w2sl17mq3xaq7b6kr5wdngi64y584hj8baqgxw2aaavgvk96kff3fl";
       };
     };
     "dat-encoding-4.0.2" = {
@@ -6737,13 +6764,13 @@ let
         sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c";
       };
     };
-    "dat-swarm-defaults-1.0.0" = {
+    "dat-swarm-defaults-1.0.1" = {
       name = "dat-swarm-defaults";
       packageName = "dat-swarm-defaults";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.0.tgz";
-        sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354";
+        url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.1.tgz";
+        sha512 = "0kgq4nz4axx3kpfam6lxid88x5gx39gbk3kzcgmbhxld9vwl3469q58hkd2zjripg3955483j450yvszk1pwpn895adz62mn0xsarag";
       };
     };
     "data-uri-to-buffer-1.2.0" = {
@@ -6809,15 +6836,6 @@ let
         sha512 = "3fxpn11cnyqcz25h9krfrpnra9zi1zri0l4f42a89acybqgj6dyr6p0lskcjffahiwxxmmc0zvgalnlk2wa74b764cm7pd5si78884g";
       };
     };
-    "datland-swarm-defaults-1.0.2" = {
-      name = "datland-swarm-defaults";
-      packageName = "datland-swarm-defaults";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/datland-swarm-defaults/-/datland-swarm-defaults-1.0.2.tgz";
-        sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0";
-      };
-    };
     "debounce-1.1.0" = {
       name = "debounce";
       packageName = "debounce";
@@ -6944,6 +6962,15 @@ let
         sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9";
       };
     };
+    "decimal.js-10.0.0" = {
+      name = "decimal.js";
+      packageName = "decimal.js";
+      version = "10.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.0.0.tgz";
+        sha512 = "1zfwp3adsdq838zcpkpm59x7kdqny1lcdk04r7fw28zy3va4jpjkrkpyyz7ifnzazpks9ky9mjb2xdrkx07nzrh909nzasps0aplcm1";
+      };
+    };
     "decode-uri-component-0.2.0" = {
       name = "decode-uri-component";
       packageName = "decode-uri-component";
@@ -7079,6 +7106,15 @@ let
         sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
       };
     };
+    "deep-extend-0.5.1" = {
+      name = "deep-extend";
+      packageName = "deep-extend";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz";
+        sha512 = "3bzqm7nqgh7m8xjhl0q8jc0ccm9riymsfmy0144x6n2qy9v1gin2ww8s9wjlayk0xyzq9cz9pyar02yiv30mhqsj7rmw35ywrsc3jrp";
+      };
+    };
     "deep-is-0.1.3" = {
       name = "deep-is";
       packageName = "deep-is";
@@ -7457,13 +7493,13 @@ let
         sha1 = "31bb815881c975634c7f3907a5e789341e1560bc";
       };
     };
-    "diffie-hellman-5.0.2" = {
+    "diffie-hellman-5.0.3" = {
       name = "diffie-hellman";
       packageName = "diffie-hellman";
-      version = "5.0.2";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz";
-        sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
+        url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
+        sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj";
       };
     };
     "difflib-0.2.4" = {
@@ -7538,6 +7574,15 @@ let
         sha1 = "f805211dcac74f6bb3a4d5d5541ad783b1b67d22";
       };
     };
+    "dnd-page-scroll-0.0.4" = {
+      name = "dnd-page-scroll";
+      packageName = "dnd-page-scroll";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dnd-page-scroll/-/dnd-page-scroll-0.0.4.tgz";
+        sha512 = "29fmw2g96bpgniybrcvpic1s5bwffgrckiasf479q7lrgca1b8726rr6kwymwsg7d702dgnvii6fjl48pvsfs4jp2svk5mjj15x9y3f";
+      };
+    };
     "dns-discovery-5.6.1" = {
       name = "dns-discovery";
       packageName = "dns-discovery";
@@ -7925,13 +7970,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "duplexify-3.5.4" = {
+    "duplexify-3.6.0" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.5.4";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz";
-        sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7";
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz";
+        sha512 = "12hhn0igd7y8nmni0qd63wpc9w1fl5rgdh4d1mq65n6r00l7byh7fs5v6m6pd8xzwmnxhrxqrc1y5yh6hswbh2i9ic9la21if5w7vbw";
       };
     };
     "each-async-1.1.1" = {
@@ -8087,13 +8132,13 @@ let
         sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
       };
     };
-    "email-validator-1.1.1" = {
+    "email-validator-2.0.3" = {
       name = "email-validator";
       packageName = "email-validator";
-      version = "1.1.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/email-validator/-/email-validator-1.1.1.tgz";
-        sha512 = "3ydmy134p48c4zswbvjllak53h545dmzsz77bwpfxjf7aw510yyg4w58pazc2yz9agm93rphfgglrlj9cfkfdygcg1rbv0vj4jhjixy";
+        url = "https://registry.npmjs.org/email-validator/-/email-validator-2.0.3.tgz";
+        sha1 = "33e50d66f526b97cd72c17205aefaec79c8a2a1e";
       };
     };
     "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = {
@@ -8934,13 +8979,13 @@ let
         sha1 = "1c86991d816ad1e504750e73874224ecf3bec508";
       };
     };
-    "eventemitter3-3.0.1" = {
+    "eventemitter3-3.1.0" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
-      version = "3.0.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.1.tgz";
-        sha512 = "0c5685grn5npm90n22lw5hjz93ga3ffc3j6jk5rs4sz0w7ymwj942v3w94ikkgxpvxj7mfawsdrczwad0b7srbkynbwac7xvsxqzq20";
+        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz";
+        sha512 = "1q3lcjzcm6cva1avw6qkzynnk6rlcp0pblgxxliwry2z52rz9fy82wh630clfv12i64ygywca69hfbj3ki71hy1in94nqxzka32zwla";
       };
     };
     "events-1.1.1" = {
@@ -9690,13 +9735,13 @@ let
         sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695";
       };
     };
-    "filesize-3.6.0" = {
+    "filesize-3.6.1" = {
       name = "filesize";
       packageName = "filesize";
-      version = "3.6.0";
+      version = "3.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/filesize/-/filesize-3.6.0.tgz";
-        sha512 = "1vldkz70kikg8b3ac8l686hm1aplkwqmllm9lg32cvy50hqzcqhari8pl2c41zsvl3bpzzfv7v8db0j91c0qd9vx8wz4w2nhsv9d4w3";
+        url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz";
+        sha512 = "1rfby2136b86m318244b42lrcx9hc28vz71cv9i84cd5z7dd3cwvj1gx8mykbjh937yyi1h4q5kk3vhjcldc8pkd2f7iapszgbd3a7c";
       };
     };
     "filestream-4.1.3" = {
@@ -9726,15 +9771,6 @@ let
         sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7";
       };
     };
-    "filled-array-1.1.0" = {
-      name = "filled-array";
-      packageName = "filled-array";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
-        sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
-      };
-    };
     "filter-obj-1.1.0" = {
       name = "filter-obj";
       packageName = "filter-obj";
@@ -10365,6 +10401,15 @@ let
         sha512 = "13w7dc43h1mv5a43zps5rwsgvlgpd1pj8rwlhmp1fsbyddysv2zy6d8xyaf9hllnqx3ykw62yv1j5z1y79kvyi6hjgymn9cj2cwj61a";
       };
     };
+    "fs-constants-1.0.0" = {
+      name = "fs-constants";
+      packageName = "fs-constants";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz";
+        sha512 = "2iv1j05gzx1sgpckd597sdd2f5x54rgcib3rpwgf31050wqxn5h27map6cn9wk4vix393s4ws2xv6kgps5zfby2iirb2zw8hk1818yb";
+      };
+    };
     "fs-ext-0.6.0" = {
       name = "fs-ext";
       packageName = "fs-ext";
@@ -10500,13 +10545,13 @@ let
         sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja";
       };
     };
-    "fsevents-1.1.3" = {
+    "fsevents-1.2.3" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.1.3";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz";
-        sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz";
+        sha512 = "3nsv4z5qk2hhcrp6bng9bzpj4nsk0b41i363phlqfp69dq1p2x6a1g3y86z2j7aj4mfj88y1i1agkb1y0pg5c388223h394jqxppvjz";
       };
     };
     "fstream-0.1.31" = {
@@ -10734,6 +10779,15 @@ let
         sha1 = "122e161591e21ff4c52530305693f20e6393a398";
       };
     };
+    "get-stdin-6.0.0" = {
+      name = "get-stdin";
+      packageName = "get-stdin";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz";
+        sha512 = "3p9jcnfk7nqnw43xammn5v5z63nxrxgz675sn70q8sma9ick6wq2plbw8b9r5il5f8f9krdamp316rdxvwcm2j4jagvymrjmhfjv7lf";
+      };
+    };
     "get-stream-2.3.1" = {
       name = "get-stream";
       packageName = "get-stream";
@@ -11104,13 +11158,22 @@ let
         sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
       };
     };
-    "globals-11.4.0" = {
+    "global-tunnel-ng-2.1.1" = {
+      name = "global-tunnel-ng";
+      packageName = "global-tunnel-ng";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.1.1.tgz";
+        sha1 = "dab824432260b6dcb70d173b78288e2fa6e0b880";
+      };
+    };
+    "globals-11.5.0" = {
       name = "globals";
       packageName = "globals";
-      version = "11.4.0";
+      version = "11.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz";
-        sha512 = "0fgjya5jfxjd8gzgpnpig973bbplfq2i5fkfpi5lxyjsi3988wq3by19ka2ql2j4a80l9bk5g5brq4vvd2hr61ak79pzwm5z24ycb0g";
+        url = "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz";
+        sha512 = "0lyc1vv873r8cgcxlnj32p6nhdbdsjash1kv2cb1chvawmbr0m83kl565iwhvjd3dyz4ba3d3mr80wa21sqj8hv77knsxiw8bx9z345";
       };
     };
     "globals-9.18.0" = {
@@ -11176,15 +11239,6 @@ let
         sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca";
       };
     };
-    "got-5.7.1" = {
-      name = "got";
-      packageName = "got";
-      version = "5.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
-        sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
-      };
-    };
     "got-6.7.1" = {
       name = "got";
       packageName = "got";
@@ -11203,13 +11257,13 @@ let
         sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3";
       };
     };
-    "got-8.3.0" = {
+    "got-8.3.1" = {
       name = "got";
       packageName = "got";
-      version = "8.3.0";
+      version = "8.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-8.3.0.tgz";
-        sha512 = "2yzcsaq1ajn6bxgq2c4cmzbvysgdd88zypwa96yw57x2rb9gkbww5djfr8m8b1j0bal94khxaz98qjqjf9777ilh3c0l6w25pyp44wh";
+        url = "https://registry.npmjs.org/got/-/got-8.3.1.tgz";
+        sha512 = "3by57aak00z7wr6h4sax941f2q8mmvcvy815wxm3lzzdkm8l6i6hxbapxxqzsl0mayv96mmlcqnzkx3axzzwk9yx4wr16yqp7wxf8mn";
       };
     };
     "graceful-fs-1.2.3" = {
@@ -11626,15 +11680,6 @@ let
         sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0";
       };
     };
-    "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";
-      };
-    };
     "hash-base-3.0.4" = {
       name = "hash-base";
       packageName = "hash-base";
@@ -12004,13 +12049,13 @@ let
         sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430";
       };
     };
-    "http-parser-js-0.4.11" = {
+    "http-parser-js-0.4.12" = {
       name = "http-parser-js";
       packageName = "http-parser-js";
-      version = "0.4.11";
+      version = "0.4.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz";
-        sha512 = "1y4az74zgv7jy1cav126lbrbvfqv30p7v3ijmj91ychbg0337k71cwy2n5dvmdfvwhgv3vxxzw2ymxlbj6wh1wf6aycb313c0xpj920";
+        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.12.tgz";
+        sha1 = "b9cfbf4a2cf26f0fc34b10ca1489a27771e3474f";
       };
     };
     "http-proxy-1.0.2" = {
@@ -12031,6 +12076,15 @@ let
         sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742";
       };
     };
+    "http-proxy-1.17.0" = {
+      name = "http-proxy";
+      packageName = "http-proxy";
+      version = "1.17.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz";
+        sha512 = "3z80svhb9hi5fawc8za5qn75lybr53646gfsqm2hkqss4pr186pp7k6f5jnjgw7vrkgjy4yzvb34729q6kvrikn4xgq9gfdg7xsgajd";
+      };
+    };
     "http-proxy-agent-1.0.0" = {
       name = "http-proxy-agent";
       packageName = "http-proxy-agent";
@@ -12040,6 +12094,15 @@ let
         sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a";
       };
     };
+    "http-proxy-agent-2.1.0" = {
+      name = "http-proxy-agent";
+      packageName = "http-proxy-agent";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz";
+        sha512 = "21cixh55jg0m41bhn1xh9pydf31jq4ip5j525hprkimg376jjxms69raxfbsryi0mzhmgw84g1nb3paqznb1l2ajy0zhnkvnl2dn0db";
+      };
+    };
     "http-proxy-middleware-0.17.4" = {
       name = "http-proxy-middleware";
       packageName = "http-proxy-middleware";
@@ -12175,13 +12238,13 @@ let
         sha512 = "3bml62y8rmpga8wbcxfqm6izvc9xxlblx0vc08r778qa42jgw6fjif4i7f9bj2y98bz4xyimg5vfgch92j6i2l7zcwiq5za8l34cziw";
       };
     };
-    "hypercore-6.13.0" = {
+    "hypercore-6.14.0" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.13.0";
+      version = "6.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz";
-        sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.14.0.tgz";
+        sha512 = "3liw77yhvn3nlrczf9s30vvn4bxrn3glh65a2psy1va9pvcnjwx6wfh52v5l9qbd7zyp4q4nb7qrq0n3am7jwmz3dkb5fzvdnlwikkh";
       };
     };
     "hypercore-protocol-6.6.4" = {
@@ -12337,13 +12400,13 @@ let
         sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501";
       };
     };
-    "ignore-3.3.7" = {
+    "ignore-3.3.8" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.3.7";
+      version = "3.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz";
-        sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz";
+        sha512 = "1pcaabfvizn9sa1m16vdnp2rn54fhkmaw4ayj2vb1amgsjn9w7yw64ac4km7avly142z4gzsgyv8g3im9d1qirlpvg0r18h8k2pwj55";
       };
     };
     "ignore-by-default-1.0.1" = {
@@ -12598,15 +12661,6 @@ let
         sha1 = "dbd740cf6ca3b731296a63ce6f6d961851f336df";
       };
     };
-    "inquirer-1.0.3" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz";
-        sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0";
-      };
-    };
     "inquirer-1.2.3" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -12832,22 +12886,22 @@ let
         sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v";
       };
     };
-    "is-alphabetical-1.0.1" = {
+    "is-alphabetical-1.0.2" = {
       name = "is-alphabetical";
       packageName = "is-alphabetical";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz";
-        sha1 = "c77079cc91d4efac775be1034bf2d243f95e6f08";
+        url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz";
+        sha512 = "33gw3lnhmg5snnpbjafj2dnv8f55g5wqmssczl998knajppvmp85gwz712jbk0wcj14np1zmghm3j8lsh0xb6r20pf33k0y2vh4sk2p";
       };
     };
-    "is-alphanumerical-1.0.1" = {
+    "is-alphanumerical-1.0.2" = {
       name = "is-alphanumerical";
       packageName = "is-alphanumerical";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz";
-        sha1 = "dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b";
+        url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz";
+        sha512 = "2r2l14mwrzcvxayr6ib04k4apkpgcs7m41pnw51999y0nld0a8fjhwhvlw2arkda8hf9anc9ld3bxlxgn9psif9ha488x0797zx89x7";
       };
     };
     "is-arguments-1.0.2" = {
@@ -12958,13 +13012,13 @@ let
         sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
       };
     };
-    "is-decimal-1.0.1" = {
+    "is-decimal-1.0.2" = {
       name = "is-decimal";
       packageName = "is-decimal";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz";
-        sha1 = "f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82";
+        url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz";
+        sha512 = "1g028jya2ymjyzj2gwna1zpajbhhxh2xh2vsi8dp3zzn9a04sgs9vvbcb66gb439mzb95vfpyydhb2h09r7yzhkfbhijwl2cgpfa72d";
       };
     };
     "is-descriptor-0.1.6" = {
@@ -13129,13 +13183,13 @@ let
         sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0";
       };
     };
-    "is-hexadecimal-1.0.1" = {
+    "is-hexadecimal-1.0.2" = {
       name = "is-hexadecimal";
       packageName = "is-hexadecimal";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz";
-        sha1 = "6e084bbc92061fbb0971ec58b6ce6d404e24da69";
+        url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz";
+        sha512 = "3y2isd2s41r430x4v5hbln61sibalz4af6wp5alq3svvvsmnlg0bhyjjf8nzmcgvrc49hw8w3r32bisxc90r8ia6z65v98sgcdpzsvf";
       };
     };
     "is-installed-globally-0.1.0" = {
@@ -13795,6 +13849,24 @@ let
         sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06";
       };
     };
+    "jquery-3.3.1" = {
+      name = "jquery";
+      packageName = "jquery";
+      version = "3.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz";
+        sha512 = "0d5v4s4626l13llvp6hq5wlghysf7lmfxpp0x0ymvcrvikz2xmyrag81wxndb9fy48mx61gcdlbmdwln78s43givdwpmrk9dir5vfai";
+      };
+    };
+    "jquery-ui-1.12.1" = {
+      name = "jquery-ui";
+      packageName = "jquery-ui";
+      version = "1.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz";
+        sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51";
+      };
+    };
     "js-select-0.6.0" = {
       name = "js-select";
       packageName = "js-select";
@@ -14362,6 +14434,15 @@ let
         sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s";
       };
     };
+    "k-rpc-5.0.0" = {
+      name = "k-rpc";
+      packageName = "k-rpc";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/k-rpc/-/k-rpc-5.0.0.tgz";
+        sha512 = "3frk0pf1y988y12m54vkfa2anc0mg6p4yiq5ca8pkvwb56g8n9n58j7f4gh3rnjgw8xb5ib8gc54nmgk8mlsbjm6azf8c2z0ynzc8dw";
+      };
+    };
     "k-rpc-socket-1.8.0" = {
       name = "k-rpc-socket";
       packageName = "k-rpc-socket";
@@ -14543,13 +14624,13 @@ let
         sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6";
       };
     };
-    "knockout-3.5.0-beta" = {
+    "knockout-3.5.0-rc" = {
       name = "knockout";
       packageName = "knockout";
-      version = "3.5.0-beta";
+      version = "3.5.0-rc";
       src = fetchurl {
-        url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-beta.tgz";
-        sha512 = "2qh1bqb9lj7l92pwcrwmpcanbyn65rmni3swyv6hrphn7xbaw8mkir3w67sf4ardk1iqvz9waalq2wf2rgpvvblhva2n2hssq6as6yr";
+        url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc.tgz";
+        sha512 = "2nys4zw0rwz0601pzq748gvs8x78n570f2j00ggwakyhbzpdgm90ivscnaym52hf226isgqfdjikxr0nig0hbb28d1xf3s1kpks24vr";
       };
     };
     "kuduscript-1.0.16" = {
@@ -14588,15 +14669,6 @@ let
         sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
       };
     };
-    "latest-version-2.0.0" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
-        sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
-      };
-    };
     "latest-version-3.1.0" = {
       name = "latest-version";
       packageName = "latest-version";
@@ -14759,6 +14831,15 @@ let
         sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3";
       };
     };
+    "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";
+      };
+    };
     "levn-0.3.0" = {
       name = "levn";
       packageName = "levn";
@@ -14957,13 +15038,22 @@ let
         sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
       };
     };
-    "lockfile-1.0.3" = {
+    "lockfile-1.0.4" = {
       name = "lockfile";
       packageName = "lockfile";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz";
-        sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79";
+        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz";
+        sha512 = "1c3gz9fvn9lz8b2whpi7cifz94b28c4gglngjhlcsfgmgbv0093pdkb4865hv6f2dyypr32f7am9ajrhrbjzv3iw9hw2zni8k0d7xkj";
+      };
+    };
+    "locks-0.2.2" = {
+      name = "locks";
+      packageName = "locks";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locks/-/locks-0.2.2.tgz";
+        sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced";
       };
     };
     "lodash-1.0.2" = {
@@ -15029,6 +15119,15 @@ let
         sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432";
       };
     };
+    "lodash-4.17.10" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
+        sha512 = "1ba5b80jjzwrh9fbdk5ywv8sic0dynij21wgrfxsfjzwvwd7x1n6azdhdc0vjdxqmcpm0mhshd1k7n2ascxpz00z3p8a3k97mwg1s2i";
+      };
+    };
     "lodash-4.17.5" = {
       name = "lodash";
       packageName = "lodash";
@@ -15254,15 +15353,6 @@ let
         sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c";
       };
     };
-    "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.escape-3.2.0" = {
       name = "lodash.escape";
       packageName = "lodash.escape";
@@ -15506,6 +15596,15 @@ let
         sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805";
       };
     };
+    "lodash.set-4.3.2" = {
+      name = "lodash.set";
+      packageName = "lodash.set";
+      version = "4.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz";
+        sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23";
+      };
+    };
     "lodash.some-4.6.0" = {
       name = "lodash.some";
       packageName = "lodash.some";
@@ -15704,6 +15803,15 @@ let
         sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848";
       };
     };
+    "lossless-json-1.0.2" = {
+      name = "lossless-json";
+      packageName = "lossless-json";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.2.tgz";
+        sha512 = "2aa3jc0qwf051bd2qwy43qzyfhh8cnqd419qg8cscni65ancjabyrradx3m06r6k84b8r4fc58khm4n6bhk8bpmf282qln79kzpfvfp";
+      };
+    };
     "loud-rejection-1.6.0" = {
       name = "loud-rejection";
       packageName = "loud-rejection";
@@ -15776,6 +15884,15 @@ let
         sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08";
       };
     };
+    "lru-cache-2.2.4" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "2.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
+        sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d";
+      };
+    };
     "lru-cache-2.5.2" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -16118,13 +16235,13 @@ let
         sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
       };
     };
-    "mdn-data-1.1.0" = {
+    "mdn-data-1.1.2" = {
       name = "mdn-data";
       packageName = "mdn-data";
-      version = "1.1.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.0.tgz";
-        sha512 = "3av1cblh8aix05jyfib9mhm57qx8fnkxgxs2g493mdm4815pisrn8rzgf9yxjiww6psa619aa8l62xigrbwfcag741bgls227f82blc";
+        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.2.tgz";
+        sha512 = "3x1bk7zqpzy2m8cc3qv575crg71dgj4mb0vl7nq4g3y8bjl2hw0qv2c6ss1iss6gpdrslaif4yp7ggrf0ldiplmk2ld4p9yhmzsljhx";
       };
     };
     "mdns-js-0.5.0" = {
@@ -16172,13 +16289,13 @@ let
         sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
       };
     };
-    "mediasource-2.1.3" = {
+    "mediasource-2.2.0" = {
       name = "mediasource";
       packageName = "mediasource";
-      version = "2.1.3";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mediasource/-/mediasource-2.1.3.tgz";
-        sha1 = "27a9c1aac51bfb6eba96af2d13a84d0b2a8eac68";
+        url = "https://registry.npmjs.org/mediasource/-/mediasource-2.2.0.tgz";
+        sha512 = "2y4j45xwbrb5cd7b66ndvk5hqy18slbkcvji5krlcg07vpszsrvz732y2ih9li0wn9qh56rx5fz6qb3kdnx877b0snjxhgyj74jlicg";
       };
     };
     "mediawiki-title-0.6.5" = {
@@ -16271,13 +16388,13 @@ let
         sha1 = "72cb668b425228290abbfa856892587308a801fb";
       };
     };
-    "meow-4.0.0" = {
+    "meow-4.0.1" = {
       name = "meow";
       packageName = "meow";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz";
-        sha512 = "2rvzq4615rj5x6za96as8f2xx6zs8m8lzraql20fiv5kr03dm9cy3zqq93ccryl42j9mp2n846pmdpkkh79i15962pnxrppbmxf9vri";
+        url = "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz";
+        sha512 = "3y4j4aqwlphwsfw770c3x06m26vd7lx810g9q39qdg1gsl1hilx48qfig40d9h3i3nj4pc66w1qg6xsmd9g7fyg77darwsr7qf83i65";
       };
     };
     "merge-1.2.0" = {
@@ -16397,13 +16514,13 @@ let
         sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
       };
     };
-    "micro-9.1.0" = {
+    "micro-9.1.4" = {
       name = "micro";
       packageName = "micro";
-      version = "9.1.0";
+      version = "9.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/micro/-/micro-9.1.0.tgz";
-        sha512 = "232sjz2wv3xlfz5wf20jihj8avic507avydzwcf4d8zgy07ha9x3pqc6xkw0y8bjk8f8w30fmih38gsdvz7ph92c4kj4cxxfinph2nh";
+        url = "https://registry.npmjs.org/micro/-/micro-9.1.4.tgz";
+        sha512 = "0zajgsz4m4z0cbibs2vz4brzp6ihq647id9zq67lrcy6nkc9fzjc8fx4g1bsf6nnbjha22fi5sz7lmfq46qixcz807v1p5pjd13kr6r";
       };
     };
     "micro-compress-1.0.0" = {
@@ -16505,13 +16622,13 @@ let
         sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7";
       };
     };
-    "mime-2.2.2" = {
+    "mime-2.3.1" = {
       name = "mime";
       packageName = "mime";
-      version = "2.2.2";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.2.2.tgz";
-        sha512 = "2ahs0dpq95sf8rrpc024h6jqrvknjnj5v046k755kz6br3pr371y9j9df0srgfszdqviaw4fc6vgngbyik866272hmckw1qif1w7cq3";
+        url = "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz";
+        sha512 = "1xa7b4k7mp4apq8mvj7912m38gzbcbbddaa92lmbb9cbs08z0b2a4x3kds1sr86br6x6r19kygscf20ky6g6wyx313x1jb8qnajai9q";
       };
     };
     "mime-db-1.12.0" = {
@@ -16595,13 +16712,13 @@ let
         sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675";
       };
     };
-    "minimalistic-assert-1.0.0" = {
+    "minimalistic-assert-1.0.1" = {
       name = "minimalistic-assert";
       packageName = "minimalistic-assert";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
-        sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
+        url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
+        sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj";
       };
     };
     "minimalistic-crypto-utils-1.0.1" = {
@@ -16730,13 +16847,13 @@ let
         sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1";
       };
     };
-    "mirror-folder-2.1.1" = {
+    "mirror-folder-2.2.0" = {
       name = "mirror-folder";
       packageName = "mirror-folder";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz";
-        sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604";
+        url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.2.0.tgz";
+        sha512 = "3js8pwgmj4lzzi6nzl0wp021rhsnz31jpkkzdf35xzwm1l65m6ygjf4hz77vvy3dk2h5jb2d32nvzy26n3d5hswg3nb8s0rylvv510r";
       };
     };
     "mississippi-2.0.0" = {
@@ -16865,6 +16982,15 @@ let
         sha512 = "2zf8ycbhqnh9hc6zd3h5s1ii6bjg41z721ffg760j8i045vjjzpzzg542c02ylkic68p0skw1ss97lwphblcw8rip3ik29x9pglhq19";
       };
     };
+    "mold-source-map-0.4.0" = {
+      name = "mold-source-map";
+      packageName = "mold-source-map";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz";
+        sha1 = "cf67e0b31c47ab9badb5c9c25651862127bb8317";
+      };
+    };
     "moment-2.1.0" = {
       name = "moment";
       packageName = "moment";
@@ -16901,13 +17027,13 @@ let
         sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2";
       };
     };
-    "moment-2.22.0" = {
+    "moment-2.22.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.22.0";
+      version = "2.22.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.22.0.tgz";
-        sha512 = "1v5hxqrwy3yd5023aflf2r1nlkayx1sh9cjjyk3415lba199gkimbq72ba26j3rf2azc0zwhqcz86jh8garynvlh1zm6vr33w59fsyn";
+        url = "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz";
+        sha512 = "1hzs2jf69lrw76a4diywsl4451qpm3iavk8f324hgb6x3njb64bd77375kwv4ydllzc5cy1v1mabgciln7yhfd9avn7nvcy6i2n84mj";
       };
     };
     "moment-2.6.0" = {
@@ -16928,13 +17054,13 @@ let
         sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
       };
     };
-    "moment-timezone-0.5.14" = {
+    "moment-timezone-0.5.16" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.14";
+      version = "0.5.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz";
-        sha1 = "4eb38ff9538b80108ba467a458f3ed4268ccfcb1";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.16.tgz";
+        sha512 = "0vnhrg02rgwwa4zzdm7g9j3sd17j8vn30cjiflg86lac0k2fvfaixl7fwd1yx990yr6abq6zhk5gmaqx2vgz22a6akxld35dbvnbpg1";
       };
     };
     "mongodb-1.2.14" = {
@@ -16991,13 +17117,13 @@ let
         sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
       };
     };
-    "mp4-box-encoding-1.1.3" = {
+    "mp4-box-encoding-1.1.4" = {
       name = "mp4-box-encoding";
       packageName = "mp4-box-encoding";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.3.tgz";
-        sha512 = "0ma1r4wxwlnxb4xjmq6gga6m4ilsarrcvgj4yrjhngbh5l6gng87i4nakbkm4iqxbnchw75ybivhlfhx8bn4qm525qxirs7gh77i8c9";
+        url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.4.tgz";
+        sha512 = "2i0lx4lji8zy0xwa6bzhqp1wdsigp38jlm3k7h7k6k013j8bp5z0nwyvwkr79ax2f1cw2gp7i2vwx99w5swmwy95l8a6188rvq0v857";
       };
     };
     "mp4-stream-2.0.3" = {
@@ -17441,15 +17567,6 @@ let
         sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc";
       };
     };
-    "nan-2.3.5" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
-        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
-      };
-    };
     "nan-2.5.1" = {
       name = "nan";
       packageName = "nan";
@@ -17607,6 +17724,15 @@ let
         sha1 = "17b09581988979fddafe0201e931ba933c96cbb4";
       };
     };
+    "nconf-0.10.0" = {
+      name = "nconf";
+      packageName = "nconf";
+      version = "0.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nconf/-/nconf-0.10.0.tgz";
+        sha512 = "3sx74c63qv1f3qy4gg717mvjyxc0zf66w8n5d156zs30vq256h4akw8d723ggf1qprb0q5yda14zn67rx1jlcwlb2cb0gz918qrga3w";
+      };
+    };
     "nconf-0.6.9" = {
       name = "nconf";
       packageName = "nconf";
@@ -17625,15 +17751,6 @@ let
         sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b";
       };
     };
-    "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";
-      };
-    };
     "ncp-0.4.2" = {
       name = "ncp";
       packageName = "ncp";
@@ -17697,13 +17814,13 @@ let
         sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29";
       };
     };
-    "needle-2.2.0" = {
+    "needle-2.2.1" = {
       name = "needle";
       packageName = "needle";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz";
-        sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq";
+        url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz";
+        sha512 = "3wnlvqmkxw69bl3clghqpsl1kxqm7hkq4v4ab0rm6dx7xqyg3bn8q38i6hmxm47ccfn6bxcvl53c4madxdgblnm06ika99x4g06rxmp";
       };
     };
     "negotiator-0.3.0" = {
@@ -17743,13 +17860,13 @@ let
         sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
       };
     };
-    "neo-async-2.5.0" = {
+    "neo-async-2.5.1" = {
       name = "neo-async";
       packageName = "neo-async";
-      version = "2.5.0";
+      version = "2.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz";
-        sha512 = "3mgwi8gsgy9lazh0qbpaz8f2l8gvvpn3jp0ghc6xnn0xq0ajdmzp7lfklby1n4s67fy1w5g5gzizyqzds8l3fqsj76cy0mq06rr56cw";
+        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz";
+        sha512 = "3256b78wjq1hf7ycvh6ll1wr0kxpqb01lgj1fdirkrx5lpzz12c4ygifw09c2bag30njm8sfjkwkg3gxpy32kl1w3n9x4cizdzgg8nw";
       };
     };
     "nested-error-stacks-1.0.2" = {
@@ -17860,13 +17977,13 @@ let
         sha512 = "34msnfifpdmxl414b8rch1p1six59jd9251b7wkb37n78fa84xfa5f5f5cxxp477wb846nfrsg6b1py3rahz4xdpk17lzzy9kvdjr5f";
       };
     };
-    "node-abi-2.3.0" = {
+    "node-abi-2.4.1" = {
       name = "node-abi";
       packageName = "node-abi";
-      version = "2.3.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.3.0.tgz";
-        sha512 = "2ijjyzh7bcyyhjaa5m0kdfg6hvxkq6czwxfg6y5d2nl6v7m9qab2ixwgvzbaaivn0r0ig48j4443905167vnpzgvlq5icfj9nyvl2fg";
+        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.1.tgz";
+        sha512 = "3mhfjq1a2ahvkjijw39q6wg6hdiqhz9nf02wjmn61sc0fc7fn0631wxafvny4gjnljin7yv808lhcswg0v1lrcg7k3bqhs7mb16qjd5";
       };
     };
     "node-alias-1.0.4" = {
@@ -17995,13 +18112,13 @@ let
         sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis";
       };
     };
-    "node-red-node-email-0.1.27" = {
+    "node-red-node-email-0.1.29" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.27";
+      version = "0.1.29";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.27.tgz";
-        sha512 = "0r799aswbfv6f9rjdrh6bddfzwj1mpinlani8cwc7zbmipcf4dsyffmf3xghb3hpb15k26jvpb46f2ia8cff1vyn4i9h3jn5dnzflnc";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.29.tgz";
+        sha512 = "0xrn1958dc81s10r3ynp4v7697py7bdhawvk71cgca1wi6ysj9w8r1dbfc29znpzz0kpmqy07v0y98nxasy6ing7hsc0kyd8rmrvnps";
       };
     };
     "node-red-node-feedparser-0.1.12" = {
@@ -18049,15 +18166,6 @@ let
         sha512 = "3a22r0jr4112h0vr1smzrsaygc607v13arhjbjwzmy1jvmcrdlq9ydnw96ailkrlnwl3k0l65hjcgnrgkdwyc2qhbfnq2bgk0xz7pkd";
       };
     };
-    "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/node-status-codes/-/node-status-codes-1.0.0.tgz";
-        sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
-      };
-    };
     "node-swt-0.1.1" = {
       name = "node-swt";
       packageName = "node-swt";
@@ -18094,13 +18202,13 @@ let
         sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
       };
     };
-    "node-version-1.1.0" = {
+    "node-version-1.1.3" = {
       name = "node-version";
       packageName = "node-version";
-      version = "1.1.0";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz";
-        sha512 = "0kc13ygbwm9zdjqv43ccb3mvfhmkwack6ziqcadw58b0f8ssv8h2gdr0br8xaqxpxp0h6pz9vm28yns03nl1vbqbgdankcsb127cmdp";
+        url = "https://registry.npmjs.org/node-version/-/node-version-1.1.3.tgz";
+        sha512 = "0zdxwcfi3gca8d1jdg3m1gh6b3xxsc7sxpdrnvabc5j5fdgmhcdqaxv3q28rl95ibb7qjcvw7c7k5wzhrvhayb9vn6lr7snabkh8k5c";
       };
     };
     "node-wsfederation-0.1.1" = {
@@ -18355,13 +18463,13 @@ let
         sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
       };
     };
-    "npm-6.0.0-next.0" = {
+    "npm-6.0.0" = {
       name = "npm";
       packageName = "npm";
-      version = "6.0.0-next.0";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-6.0.0-next.0.tgz";
-        sha512 = "06yn34ji94fcadvnj3mafxlv8hnin0mgrdpdjplk33nkjc8niq5kr1kfwikqxj36kyzwdcz8a27599sakryvgvb14mqjabc525ik35x";
+        url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz";
+        sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj";
       };
     };
     "npm-bundled-1.0.3" = {
@@ -18391,13 +18499,13 @@ let
         sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67";
       };
     };
-    "npm-package-arg-6.0.0" = {
+    "npm-package-arg-6.1.0" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "6.0.0";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.0.0.tgz";
-        sha512 = "15a1x3fjip5waxap8dbjkm88j0c2bcnay8pw14p74h1499wznynw2if91shrqlrbzwia09x4xiphp6wkxga5z8vf9k08bjarn1vn047";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz";
+        sha512 = "14dqycy588sf0k73livvvpmp1dqmbhacc97pq3ksxk1wrm9j82r7hhlrxigj0nb58gz4cbvbh3isj1x3sjiqxs60dhv439xd4zy31nd";
       };
     };
     "npm-packlist-1.1.10" = {
@@ -18941,15 +19049,6 @@ let
         sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95";
       };
     };
-    "opn-5.2.0" = {
-      name = "opn";
-      packageName = "opn";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/opn/-/opn-5.2.0.tgz";
-        sha512 = "12iyalgghs3dj0pfb7rxa013x946169yfsjfd15fsfrx5kv80z2qh082x7v7d91hh7bf9vxcm4wqmyyj9ckk3gnvc7mw77j6fkwdpr5";
-      };
-    };
     "opn-5.3.0" = {
       name = "opn";
       packageName = "opn";
@@ -19292,6 +19391,15 @@ let
         sha512 = "30jd44ckpmfj9prfhzc8bjvn5b5adxk93g9saif813id8mrvl3g1asrhz9l0bc2rp0i779wnhg1rjw80h2y7zk8v02ghq4bdh4hn4a0";
       };
     };
+    "pac-proxy-agent-2.0.2" = {
+      name = "pac-proxy-agent";
+      packageName = "pac-proxy-agent";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz";
+        sha512 = "3222l2ayjn9gj3q7br4vxqz1a5bq5h53fcqvrns3zdlqfinarbi0kgkrlf7vyc7arr7ljks5988y4a6lyd663br23wvg391a4vl0cvh";
+      };
+    };
     "pac-resolver-2.0.0" = {
       name = "pac-resolver";
       packageName = "pac-resolver";
@@ -19301,6 +19409,15 @@ let
         sha1 = "99b88d2f193fbdeefc1c9a529c1f3260ab5277cd";
       };
     };
+    "pac-resolver-3.0.0" = {
+      name = "pac-resolver";
+      packageName = "pac-resolver";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz";
+        sha512 = "1w6mzypllad7wy658kd56fqih6i8x0f841a2pnnn97dhkk810nw3r9f73kpxqa6llkrgy6p1ax4xy1rgbzvrf4zczblvf13pgqkgixm";
+      };
+    };
     "package-json-1.2.0" = {
       name = "package-json";
       packageName = "package-json";
@@ -19310,15 +19427,6 @@ let
         sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0";
       };
     };
-    "package-json-2.4.0" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
-        sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb";
-      };
-    };
     "package-json-4.0.1" = {
       name = "package-json";
       packageName = "package-json";
@@ -19400,22 +19508,22 @@ let
         sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
       };
     };
-    "parse-asn1-5.1.0" = {
+    "parse-asn1-5.1.1" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.0";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz";
-        sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz";
+        sha512 = "1vq07bq1c0b5v82mknyg2y4lrdy1qmqkzw432f406rx9v2hni3040z270kpsvi2vf4ikq6x0k9g8p16n7aafrwsrpwvx0wpa9z7pz18";
       };
     };
-    "parse-entities-1.1.1" = {
+    "parse-entities-1.1.2" = {
       name = "parse-entities";
       packageName = "parse-entities";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz";
-        sha1 = "8112d88471319f27abae4d64964b122fe4e1b890";
+        url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz";
+        sha512 = "192kwdas18b36rdffjp98qvq4ssnmnndryvcz2lzz6g8dnn5pfglabpjcj4p9bngkyp5z0fwvpb0vj4i9zdskp8gzbig6zd1scnbpz4";
       };
     };
     "parse-filepath-1.0.2" = {
@@ -19499,13 +19607,22 @@ let
         sha1 = "a814bd8505e8b58e88eb8ff3e2daff5d19a711b7";
       };
     };
-    "parse-torrent-5.8.3" = {
+    "parse-torrent-5.9.1" = {
+      name = "parse-torrent";
+      packageName = "parse-torrent";
+      version = "5.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.9.1.tgz";
+        sha512 = "31lm2ifw06p00gc0qvxinqvy8afhq0lrg3fpf5rrhb6dqx3avd3ykps8sjv2nj91wf06k62yvn9cvf1f243yzl9xpzy9255556x8bnb";
+      };
+    };
+    "parse-torrent-6.0.0" = {
       name = "parse-torrent";
       packageName = "parse-torrent";
-      version = "5.8.3";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz";
-        sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c";
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-6.0.0.tgz";
+        sha512 = "1yr12djspi83lybgycwsaz5wbikbsazwhk2w4xf3niri1lx0p3965br1xbsjw1m0xrzc71q6mw5xz44w0hd3ic5wmb2v62abl7kld16";
       };
     };
     "parse-torrent-file-2.1.4" = {
@@ -19517,15 +19634,6 @@ let
         sha1 = "32d4b6afde631420e5f415919a222b774b575707";
       };
     };
-    "parse-torrent-file-4.1.0" = {
-      name = "parse-torrent-file";
-      packageName = "parse-torrent-file";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.1.0.tgz";
-        sha512 = "2cxnv563f946k2ng808an4gcj7yi23drqv8agns3h69drrbv0rq47wdi0xjs0lsvi1i36i7l1wzaci4c4gzzfy8ghfmv4k06hpb5ph5";
-      };
-    };
     "parse5-3.0.3" = {
       name = "parse5";
       packageName = "parse5";
@@ -19940,13 +20048,13 @@ let
         sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
       };
     };
-    "pbkdf2-3.0.14" = {
+    "pbkdf2-3.0.16" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.0.14";
+      version = "3.0.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz";
-        sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz";
+        sha512 = "1q07jjlhbbn9fd1aqyrqqxlv184k8ppbafavwvb19lvgbzvp8fnrx7qd9lkbfzb6g4592czp178wizmgvhrhandxngiljv1gczrg06b";
       };
     };
     "peer-wire-protocol-0.7.1" = {
@@ -20157,13 +20265,13 @@ let
         sha1 = "a32b907f28d17f61b74d45d46fd89dea3c4e88b5";
       };
     };
-    "please-upgrade-node-3.0.1" = {
+    "please-upgrade-node-3.0.2" = {
       name = "please-upgrade-node";
       packageName = "please-upgrade-node";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz";
-        sha1 = "0a681f2c18915e5433a5ca2cd94e0b8206a782db";
+        url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.2.tgz";
+        sha512 = "2x54acxamqkr98gwnwf5h8bajcrcsv8b4156laym47ibf2093kbnki8v4dlk7zs8q5dclqnhqdr6p183phna67v0wdwb4mywm4mzjbf";
       };
     };
     "plist-1.2.0" = {
@@ -20319,13 +20427,13 @@ let
         sha512 = "174sg3cs8v8bqg8rnk673qp365n46kls3f3a41pp0jx48qivkg06rck0j2bfyzm5hr1i6kjbcn82h1rkjgfi5jbd0amrd877m3wfpbz";
       };
     };
-    "postcss-6.0.21" = {
+    "postcss-6.0.22" = {
       name = "postcss";
       packageName = "postcss";
-      version = "6.0.21";
+      version = "6.0.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz";
-        sha512 = "1vvp2mzw4gq6zm875fi7hgyypy0a44mbdpv0i4aqxsq8xajdxfyaz4ap4idh29v74ag4z26wla48k315yyg3d0h83zxkn1kniywmxnb";
+        url = "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz";
+        sha512 = "0fdfvn2pq9hvw40s9l174v5rv4d5x3i9xmd8p3mln6bhzrny3v1h0y1324ghq30jnbrvyfam0725r3hsmj28lhhmc32q08lpaa3v1sf";
       };
     };
     "prebuild-install-2.1.2" = {
@@ -20337,13 +20445,13 @@ let
         sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505";
       };
     };
-    "prebuild-install-2.5.1" = {
+    "prebuild-install-2.5.3" = {
       name = "prebuild-install";
       packageName = "prebuild-install";
-      version = "2.5.1";
+      version = "2.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.1.tgz";
-        sha512 = "013s09xwdppxw3n9h0vz22br6q1dc5rkh8pk9nk3xl0pqsv495qj1y8k5srgmgm7692q1hlyj08nrfbr9nr232bsrkcvhbkm8pzsdfw";
+        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.3.tgz";
+        sha512 = "3z8bc2sx9ibs343jllm11azqkcc7vxpf0skfm68dqwz9l59z381vbqip00sgpzg9di2zagjm3wbx65s6g2kg5kj8b1vp0vnqglkgcpy";
       };
     };
     "precond-0.2.3" = {
@@ -20715,6 +20823,15 @@ let
         sha1 = "57eb5347aa805d74ec681cb25649dba39c933499";
       };
     };
+    "proxy-agent-3.0.0" = {
+      name = "proxy-agent";
+      packageName = "proxy-agent";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.0.tgz";
+        sha512 = "1krp2s6sjv452zj0xhmknrm0769jx2v21bfas1aw2kvg2zhdxcq32w7i6kg87fd9ajyynss694bylaw8khkg8clsgxifz9wg6zgmac3";
+      };
+    };
     "proxy-from-env-1.0.0" = {
       name = "proxy-from-env";
       packageName = "proxy-from-env";
@@ -20787,13 +20904,13 @@ let
         sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb";
       };
     };
-    "public-encrypt-4.0.0" = {
+    "public-encrypt-4.0.2" = {
       name = "public-encrypt";
       packageName = "public-encrypt";
-      version = "4.0.0";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz";
-        sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6";
+        url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz";
+        sha512 = "38qgcvnxnp4lva9c0x6xhq05hb811n8q5s8dxchm5mg04rv64693a1w2hrhy8lcgbvs36kv003ar1xsh312c866hzvwb0qwr897jhp2";
       };
     };
     "pug-2.0.3" = {
@@ -20994,13 +21111,13 @@ let
         sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig";
       };
     };
-    "pumpify-1.4.0" = {
+    "pumpify-1.5.0" = {
       name = "pumpify";
       packageName = "pumpify";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz";
-        sha512 = "1h37biy199n445y10vpyiswwcxv8zigfqp0b1xwgbyjq51f2dhjn1pcggjc4j5ccbd64l1ivfi0bqinx4m5clcawvwggy7jv93qsjfs";
+        url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz";
+        sha512 = "0kf28xyrgm26kblaainzcxi4dqyxv0q1a03b55a9sma3b37sf9nkk2ysk7df2r4864ic4yr4j47plap1l0lck1raxnwraz8a29b8s2i";
       };
     };
     "punycode-1.3.2" = {
@@ -21219,6 +21336,15 @@ let
         sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r";
       };
     };
+    "qs-6.5.2" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
+        sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
+      };
+    };
     "qtdatastream-0.7.1" = {
       name = "qtdatastream";
       packageName = "qtdatastream";
@@ -21309,13 +21435,13 @@ let
         sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2";
       };
     };
-    "random-access-storage-1.1.1" = {
+    "random-access-storage-1.2.0" = {
       name = "random-access-storage";
       packageName = "random-access-storage";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz";
-        sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1";
+        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.2.0.tgz";
+        sha512 = "3jz9jky55s8w0pd5q2v58fxdgca5ymbhlif0zn6jv55jr7bvp1xvn60bz4b2k6m399zzxzdk196385wl3gw6xasxzi3mq8xkp9al118";
       };
     };
     "random-bytes-1.0.0" = {
@@ -21453,13 +21579,13 @@ let
         sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89";
       };
     };
-    "raw-socket-1.5.2" = {
+    "raw-socket-1.6.0" = {
       name = "raw-socket";
       packageName = "raw-socket";
-      version = "1.5.2";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.2.tgz";
-        sha512 = "0afwhc6rx359xqdsjiyxdlj46kb8mq4lkwy9fhmgszkp8cai9pk8927vxvg4gpg522clwx3dv1xsbnx745pip7crbjdb7kn2i8p2iqy";
+        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.0.tgz";
+        sha512 = "2268lfw8q4mz0v988by3y0hbad848sx7kmmqm3rk7nbj7xc3sy045adcdbnh3c8vrhk57ljk61wshphgr69y8pw3987f1if369ny7pr";
       };
     };
     "rc-0.4.0" = {
@@ -21471,13 +21597,13 @@ let
         sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
       };
     };
-    "rc-1.2.6" = {
+    "rc-1.2.7" = {
       name = "rc";
       packageName = "rc";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz";
-        sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz";
+        sha512 = "30b4pqzhk8f4ppzyk5diwxac7xpf4hd3rysyin012l59da9v5iaai4wd6yzlz3rjspfvvy191q6qcsw47mwlw9y07n35kzq23rw7lid";
       };
     };
     "rc-config-loader-2.0.1" = {
@@ -21705,13 +21831,13 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "record-cache-1.0.1" = {
+    "record-cache-1.0.2" = {
       name = "record-cache";
       packageName = "record-cache";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.1.tgz";
-        sha512 = "3a25qmwmlljwlcc1zpn80lrq3hmwwaykiac95q2gcm1im4wchk9mdhbgak2lidqijaf6mil2rp5sbm0zfzvvh39nz1lmlz72sll39iy";
+        url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.2.tgz";
+        sha512 = "2iykkjgwmmcma3306cjzsq34dg6rxfvwr4r11fyq56dfsybp9qwnvhc4fbi3l854zfj71fbw887bgab78ykr6b3m9gdw2lpf5sa53c0";
       };
     };
     "recursive-readdir-2.2.2" = {
@@ -21957,13 +22083,13 @@ let
         sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
       };
     };
-    "render-media-2.12.0" = {
+    "render-media-3.0.0" = {
       name = "render-media";
       packageName = "render-media";
-      version = "2.12.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/render-media/-/render-media-2.12.0.tgz";
-        sha512 = "1y1njral1kn6s6g797ji5pl475zcmvcmrgdnv1vliq8q33vw3b4i4i5fsx9yj2ap7jdpb461507wpijixf56rc5q4r97542zvzxq0by";
+        url = "https://registry.npmjs.org/render-media/-/render-media-3.0.0.tgz";
+        sha512 = "27zqxwa89zq3m0h5qykra6yx9jbc5cljfpx80nrm3y3rhl7ngm17fyb42xhw2sa584x2ld6ll1lnyrhvs3cihfm1ivd9g1hlvjvjaai";
       };
     };
     "render-readme-1.3.1" = {
@@ -22200,13 +22326,13 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
-    "resolve-1.7.0" = {
+    "resolve-1.7.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.7.0.tgz";
-        sha512 = "2f21aw16zyl0cnz3cr5pvskv4f4lxhp2c14ak8p80kam37nayxdsi9j9n9bcdpilnqbw2pbipxc4nx4vqhyg3mnlhjn1mfip3jikn21";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz";
+        sha512 = "1zhdyfbs9gfd5iswb8dbra3gljv9mglapgcirci1zsfs78rfn557rp6z81drxxsz0m4w4imm2n9qf7yrchkfjhxz9a0vwp9hwpg1fkk";
       };
     };
     "resolve-dir-1.0.1" = {
@@ -22407,13 +22533,13 @@ let
         sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
       };
     };
-    "ripemd160-2.0.1" = {
+    "ripemd160-2.0.2" = {
       name = "ripemd160";
       packageName = "ripemd160";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz";
-        sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7";
+        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz";
+        sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla";
       };
     };
     "rndm-1.2.0" = {
@@ -22488,22 +22614,22 @@ let
         sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
       };
     };
-    "run-parallel-1.1.8" = {
+    "run-parallel-1.1.9" = {
       name = "run-parallel";
       packageName = "run-parallel";
-      version = "1.1.8";
+      version = "1.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.8.tgz";
-        sha512 = "1jzs29b3g9xx5408i8gzyflx0wajfa1ai9sgm63pbvkaas0351j9y92kxq06x8dhg7w829skizs88cdlf156zfm1yk5brbbb0spb6vv";
+        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
+        sha512 = "3sl2kbxcwy92faw7zm0z4vql32622mag0bh6dv4bjk7cvc8a9sarvdclr9508hknhl0b7v8kzqvg3klvvff7psmvkfg9hy32i4sfjhc";
       };
     };
-    "run-parallel-limit-1.0.4" = {
+    "run-parallel-limit-1.0.5" = {
       name = "run-parallel-limit";
       packageName = "run-parallel-limit";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.4.tgz";
-        sha512 = "2y7d7x3kwlwgyqvhlklxl08rkc63c2ww0jf8pcwlnw4nl2k3wcbkid5fwg130cbkwzslv8c4xrrxccng4yqib8dbcgivyq0h855k4yf";
+        url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.5.tgz";
+        sha512 = "2b87xk6x0fxs3bls9zzprvxiy2ldgvjxckkfv3ccg23j6f8qv58379pmylkkiv61w6b8qcsmsciwch7lg41nxx0qk6bpgp076h3xiin";
       };
     };
     "run-queue-1.0.3" = {
@@ -22515,13 +22641,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "run-series-1.1.6" = {
+    "run-series-1.1.8" = {
       name = "run-series";
       packageName = "run-series";
-      version = "1.1.6";
+      version = "1.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-series/-/run-series-1.1.6.tgz";
-        sha512 = "2rpksrvsfrz5kv3cwr448d60521dlky61p5hp3ci7g8140yfm58g7xak4gkqysfc9cm6hknxyizfs832939fxg01qslxrzlx7l805a1";
+        url = "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz";
+        sha512 = "1gg6q66zyhqr3ylp9zx79v9qyxns1j643p9gkk2kqkijihpvp27ilhzg0qb8kiqxcsw2m0y5rbmdkq6qdhnkar4l088p96i8dhfsv7q";
       };
     };
     "rusha-0.8.13" = {
@@ -22578,13 +22704,13 @@ let
         sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
       };
     };
-    "rxjs-5.5.8" = {
+    "rxjs-5.5.10" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "5.5.8";
+      version = "5.5.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.8.tgz";
-        sha512 = "32whnkvnay58zbcwimj3lpagg52k7swjdcys6i14a0im2hj1svh602bpvpb3zrqv36k96a1gsjjzbjxvfy6aj89i838l06mxsiflgh7";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz";
+        sha512 = "3lc28jznaclc3qcipvf29dnfa11m4xdzyr4gkas29pgp0s4c44f8cyzsxyfwkqzqa8k06q7j7hl5wwyy671d8gdkwl9j76lh2cf4629";
       };
     };
     "safe-buffer-5.0.1" = {
@@ -22605,6 +22731,15 @@ let
         sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
       };
     };
+    "safe-buffer-5.1.2" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
+      };
+    };
     "safe-json-parse-1.0.1" = {
       name = "safe-json-parse";
       packageName = "safe-json-parse";
@@ -22641,6 +22776,15 @@ let
         sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
       };
     };
+    "sander-0.5.1" = {
+      name = "sander";
+      packageName = "sander";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sander/-/sander-0.5.1.tgz";
+        sha1 = "741e245e231f07cafb6fdf0f133adfa216a502ad";
+      };
+    };
     "sanitize-html-1.18.2" = {
       name = "sanitize-html";
       packageName = "sanitize-html";
@@ -22722,6 +22866,15 @@ let
         sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8";
       };
     };
+    "secure-keys-1.0.0" = {
+      name = "secure-keys";
+      packageName = "secure-keys";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/secure-keys/-/secure-keys-1.0.0.tgz";
+        sha1 = "f0c82d98a3b139a8776a8808050b824431087fca";
+      };
+    };
     "seek-bzip-1.0.5" = {
       name = "seek-bzip";
       packageName = "seek-bzip";
@@ -22821,6 +22974,15 @@ let
         sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1";
       };
     };
+    "semver-compare-1.0.0" = {
+      name = "semver-compare";
+      packageName = "semver-compare";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz";
+        sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc";
+      };
+    };
     "semver-diff-2.1.0" = {
       name = "semver-diff";
       packageName = "semver-diff";
@@ -22965,13 +23127,13 @@ let
         sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c";
       };
     };
-    "serialize-javascript-1.4.0" = {
+    "serialize-javascript-1.5.0" = {
       name = "serialize-javascript";
       packageName = "serialize-javascript";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz";
-        sha1 = "7c958514db6ac2443a8abc062dc9f7886a7f6005";
+        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz";
+        sha512 = "2hiydb59y0q07hp3qfs8g9qjhgmhmajps769wpw2f5ghxwy3ibr7y7lnx7q23snmc3asgzhik0444jvfs3d4gmy0qx9w0n0v3q1rbqr";
       };
     };
     "serve-favicon-2.3.2" = {
@@ -23316,13 +23478,22 @@ let
         sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb";
       };
     };
-    "simple-get-2.7.0" = {
+    "simple-get-2.8.1" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.7.0";
+      version = "2.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz";
+        sha512 = "13j7pz8kfspyi25dkkvb6wm5r95yf7adskwf7z46g02vv27clgq9lgpbxx2hy1s5qip45dim625sby77fm4c67h31a0769p5i2qf94m";
+      };
+    };
+    "simple-get-3.0.2" = {
+      name = "simple-get";
+      packageName = "simple-get";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.7.0.tgz";
-        sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.2.tgz";
+        sha512 = "021na7dsxyawdzbif9l56dzgvzdd5s4kwm09rb8hg3abvr94i05arvn0z6q5vmpi24bmnnp2i677rf7964fza0frx3zx406a82x6kbm";
       };
     };
     "simple-git-1.92.0" = {
@@ -23352,13 +23523,13 @@ let
         sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3";
       };
     };
-    "simple-peer-9.0.0" = {
+    "simple-peer-9.1.1" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "9.0.0";
+      version = "9.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.0.0.tgz";
-        sha512 = "1fwihnw60ayp1hyj2rp40cshqhi32rj1gjhr060awg35rk762z9a4d15zapvxi76bmdhgs3vs8lv7xmdqxbabg8d3z1xlkq5vnhq0d1";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.1.1.tgz";
+        sha512 = "27d9j7ah5ync1cndpinw966zb81lc9z6pc38y8dkc1l5rxdkv3fmf5ilhf0jq94m3qvb2ipldjmvbs1sza5ccvazwlr4pjgfr07ym23";
       };
     };
     "simple-plist-0.2.1" = {
@@ -23658,121 +23829,121 @@ let
         sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
       };
     };
-    "snyk-1.71.0" = {
+    "snyk-1.78.1" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.71.0";
+      version = "1.78.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.71.0.tgz";
-        sha1 = "842cfed35ffac591ac34824ce0f1467655c5f8f1";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.78.1.tgz";
+        sha1 = "a9eefbc97c6f0179f3cc318a4232aacd57e347fe";
       };
     };
-    "snyk-config-1.0.1" = {
+    "snyk-config-2.1.0" = {
       name = "snyk-config";
       packageName = "snyk-config";
-      version = "1.0.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz";
-        sha1 = "f27aec2498b24027ac719214026521591111508f";
+        url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.1.0.tgz";
+        sha512 = "0r81kdx8az7nfiv0r36ggarzdw5rzai06qivv1r48xdfax2gdz9axxjhnwyzhf3mpz6245fz2ilc8l349h85s01yh05rxjsjvbg6m8g";
       };
     };
-    "snyk-go-plugin-1.4.6" = {
+    "snyk-go-plugin-1.5.0" = {
       name = "snyk-go-plugin";
       packageName = "snyk-go-plugin";
-      version = "1.4.6";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.6.tgz";
-        sha512 = "3002f73liv15dpg1ls92j4m50374z69p9ic74zpqmr8mjlxcdv09gcxkdmg0bdkzlj3s02bpmdj7vrkw5jb2k2f6zbrr5g4d18pjy8n";
+        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.0.tgz";
+        sha512 = "20i967dg1n1pir2j0ivpd72i5j3y9xa3826jvl8jspmg9wfnpfq6x0isp3irw42zrcvflshi0nhk3sckcj3lqgjaw82g14wda28g80z";
       };
     };
-    "snyk-gradle-plugin-1.2.0" = {
+    "snyk-gradle-plugin-1.3.0" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.2.0.tgz";
-        sha512 = "1b2bxvwl2v4prlj942i4jkz4mahgp39j7lvy91jzv00nsk59l76b1icn48zj4zk84s00jil3pnxnfzsclhcc612d70s4wwi3x2hrrqn";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.3.0.tgz";
+        sha512 = "22av46k72s8cgigsj0ppir7cd1150079mg1hhb8qgkg9a4asdw3wn48ahwra08rai0rd4z4jhwhmhpc7d63np4ivvjdqcy30qzmr9mc";
       };
     };
-    "snyk-module-1.8.1" = {
+    "snyk-module-1.8.2" = {
       name = "snyk-module";
       packageName = "snyk-module";
-      version = "1.8.1";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz";
-        sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca";
+        url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.2.tgz";
+        sha512 = "03372r6cvic19gajy5sa3q11sjal4499svhv50bglywf9jfi2555lpnvsshh08kr6krwcmnm7vb3fm4va3pb616h5wy4ln2kxnmva2y";
       };
     };
-    "snyk-mvn-plugin-1.1.1" = {
+    "snyk-mvn-plugin-1.2.0" = {
       name = "snyk-mvn-plugin";
       packageName = "snyk-mvn-plugin";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.1.1.tgz";
-        sha512 = "3h9drys1g2wh3w072rn00zw57g5xy42ap38k05gvdryiphx8p9iksb4azg4dyf2vd616jzslqid45hjd6iphafdzpk4b90mws880hqa";
+        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.2.0.tgz";
+        sha512 = "3pq0wqa8isczv7pcwfm9jfh5qkwjd482hw45m40c5vnnzbxxbji4m1zvxybpzb08azfp6rigblr0hkrhb8m59qf24hcy1scgn3ddr49";
       };
     };
-    "snyk-nuget-plugin-1.3.9" = {
+    "snyk-nuget-plugin-1.4.0" = {
       name = "snyk-nuget-plugin";
       packageName = "snyk-nuget-plugin";
-      version = "1.3.9";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.9.tgz";
-        sha512 = "017qpf5cy1f0x8apjc1a3qp3aa9w7v7zlyy8jb8r7q4ilsnpdzvywrxhd6s1yy3b9fiylmgmldgdcz77srqq9pm2njvdi80pyd00zqp";
+        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.4.0.tgz";
+        sha512 = "1frla7fsnn7ijg088bjqqy7iq5q0if7sz337rb1g6h5kg760z7968yjgi3nprp218vbpqjrf75xpi6m8dj8k04gpfdkb2am9klnymh4";
       };
     };
-    "snyk-php-plugin-1.3.2" = {
+    "snyk-php-plugin-1.5.0" = {
       name = "snyk-php-plugin";
       packageName = "snyk-php-plugin";
-      version = "1.3.2";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.3.2.tgz";
-        sha512 = "2fihlcs2qxdbdfy1pjnf7110l6h4r16vkp0q51wqsfd8fw5s1qgb34plii6yhbfbs8a1il93i6hfn93yclbv50m2129wg7naf57jlqi";
+        url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.0.tgz";
+        sha512 = "10p6nq7sxfdfzaqh87s2hnw00vr904bklcscp26yvimdsa5p5n0x4m8ynbiiqa0b35rgp2lpq5qxmybgnshwv8b97fh89vq2i5lsbhx";
       };
     };
-    "snyk-policy-1.10.2" = {
+    "snyk-policy-1.12.0" = {
       name = "snyk-policy";
       packageName = "snyk-policy";
-      version = "1.10.2";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.2.tgz";
-        sha1 = "2a7bf0f07c7b811b9dda93cf9bbb10dc992dd7bc";
+        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.12.0.tgz";
+        sha512 = "3pmnx9hjrlz0gpxy6b2gia65h1rpdalc1g68s759p0ik0xq5rgi8hm3cqnvicg24cgqm8qwdsf5v7bcfxcj3m6yi7rc2wgkf0vahj08";
       };
     };
-    "snyk-python-plugin-1.5.7" = {
+    "snyk-python-plugin-1.6.0" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.5.7";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.7.tgz";
-        sha512 = "3fqq6dbx31yysvd835ng60linxmbkzixiqqf28yxq9pdx3x8dq55syhv1g6as3s85wd04q5vc5qlfgdl91jlhwcgjvdwjjr2wwp84pq";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.6.0.tgz";
+        sha512 = "06n8zx8az0afp7b2gnav664hzmjxg5dp96a5vmy5a58dhr278x6fl7pgsd332ykxanphrm59dsm0hyka2s8wibam2v8wjbgm4xxrlzz";
       };
     };
-    "snyk-resolve-1.0.0" = {
+    "snyk-resolve-1.0.1" = {
       name = "snyk-resolve";
       packageName = "snyk-resolve";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz";
-        sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2";
+        url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz";
+        sha512 = "2kh7wgl3yjw4am7ay4ag5d6qynbj06jzqf6wph17lhwx9ichwl6adqaf8nbsksib1y65kmvmvqm90j5zqdxfx6qj97qs1kdp0nbxs7g";
       };
     };
-    "snyk-resolve-deps-1.7.0" = {
+    "snyk-resolve-deps-3.1.0" = {
       name = "snyk-resolve-deps";
       packageName = "snyk-resolve-deps";
-      version = "1.7.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz";
-        sha1 = "13743a058437dff890baaf437c333c966a743cb6";
+        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-3.1.0.tgz";
+        sha512 = "3qk3349lw5q1spqk4q1arw496hbp4d8qlj576whfl710kf7ajwpv4kcak5wprzhvwmqs656q7w71sc0jvz9afprh65rlklx3yaiwl31";
       };
     };
-    "snyk-sbt-plugin-1.2.5" = {
+    "snyk-sbt-plugin-1.3.0" = {
       name = "snyk-sbt-plugin";
       packageName = "snyk-sbt-plugin";
-      version = "1.2.5";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.5.tgz";
-        sha512 = "183dfn89vslcl63y76jxyndz67f5c8ii4wh0pvbxgzqb3161rz5j5p4k7dv69shiw55q1lyb1j70pjng6rafw5k0jnqc58x63bpqgz8";
+        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.3.0.tgz";
+        sha512 = "03bdn4g3836nyv06flg4g6jnr9j297z8ay67jg0k7zfanwg7glaaqbkxzas1bl36jj1snyb8ifb8xvhshbxjbvl6xpngxxpbq3ly729";
       };
     };
     "snyk-tree-1.0.0" = {
@@ -23784,13 +23955,13 @@ let
         sha1 = "0fb73176dbf32e782f19100294160448f9111cc8";
       };
     };
-    "snyk-try-require-1.2.0" = {
+    "snyk-try-require-1.3.0" = {
       name = "snyk-try-require";
       packageName = "snyk-try-require";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz";
-        sha1 = "30fc2b11c07064591ee35780c826be91312f2144";
+        url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.0.tgz";
+        sha1 = "f35706acf91c8af788d58e1f1ad6bf0fcf6c5493";
       };
     };
     "socket.io-0.9.14" = {
@@ -23982,6 +24153,15 @@ let
         sha512 = "33yfj0m61wn7g9s59m7mxhm6w91nkdrd7hcnnbacrj58zqgykpyr7f6lsggvc9xzysrf951ncxh4malqi11yf8z6909fasllxi6cnxh";
       };
     };
+    "socks-proxy-agent-3.0.1" = {
+      name = "socks-proxy-agent";
+      packageName = "socks-proxy-agent";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz";
+        sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7";
+      };
+    };
     "sodium-javascript-0.5.5" = {
       name = "sodium-javascript";
       packageName = "sodium-javascript";
@@ -23991,13 +24171,13 @@ let
         sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah";
       };
     };
-    "sodium-native-2.1.5" = {
+    "sodium-native-2.1.6" = {
       name = "sodium-native";
       packageName = "sodium-native";
-      version = "2.1.5";
+      version = "2.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz";
-        sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var";
+        url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz";
+        sha512 = "3y0f008galwxign4qb49q2kfkhz68nfxazpcq5y63wahaqly89x640nnv8cv4rg9xn1vbp5wia76vkmh1ja13dp95vjzw2lv5q2zymx";
       };
     };
     "sodium-universal-2.0.0" = {
@@ -24009,6 +24189,15 @@ let
         sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj";
       };
     };
+    "sorcery-0.10.0" = {
+      name = "sorcery";
+      packageName = "sorcery";
+      version = "0.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sorcery/-/sorcery-0.10.0.tgz";
+        sha1 = "8ae90ad7d7cb05fc59f1ab0c637845d5c15a52b7";
+      };
+    };
     "sort-keys-1.1.2" = {
       name = "sort-keys";
       packageName = "sort-keys";
@@ -24207,6 +24396,15 @@ let
         sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
       };
     };
+    "sourcemap-codec-1.4.1" = {
+      name = "sourcemap-codec";
+      packageName = "sourcemap-codec";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz";
+        sha512 = "3645hn4agfzixljvwx4l0fwxqvcr6f0j7pvgcdcy34788n1qaabrs1nawn8c10qk8pw4b21mb0f0chgfhl10rzir7y5i2kf2cs5wzc5";
+      };
+    };
     "sparkles-1.0.0" = {
       name = "sparkles";
       packageName = "sparkles";
@@ -24450,13 +24648,13 @@ let
         sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x";
       };
     };
-    "stable-0.1.6" = {
+    "stable-0.1.8" = {
       name = "stable";
       packageName = "stable";
-      version = "0.1.6";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz";
-        sha1 = "910f5d2aed7b520c6e777499c1f32e139fdecb10";
+        url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz";
+        sha512 = "3mw0cg71gcp6hfg3x0snaxcva4yqnifs11vbs3ba4agmcz8njmz70ndk5d8z97441jdvjhvb8aq8r44ngd8z4iw5hpgfmff372nlbwf";
       };
     };
     "stack-trace-0.0.10" = {
@@ -24891,13 +25089,13 @@ let
         sha512 = "1r18lbap331hx5hfic2irpd3rai1ymp5s93p5xfzfr0khw9krkx51glwhmdjxbrk07kryqqdc2fly59avw3pq3q2apq7q487q55bh6r";
       };
     };
-    "string2compact-1.2.2" = {
+    "string2compact-1.2.3" = {
       name = "string2compact";
       packageName = "string2compact";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.2.tgz";
-        sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b";
+        url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.3.tgz";
+        sha512 = "2v32r74gw45hwccyyv9br6r685nps3c7z95ik5c9sip5nva4flx1scz0mg3h47hw0xrnfj0wh89binqz26ld86zvqxhai2067g3bi7d";
       };
     };
     "string_decoder-0.10.31" = {
@@ -24927,13 +25125,13 @@ let
         sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
       };
     };
-    "stringify-entities-1.3.1" = {
+    "stringify-entities-1.3.2" = {
       name = "stringify-entities";
       packageName = "stringify-entities";
-      version = "1.3.1";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz";
-        sha1 = "b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c";
+        url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz";
+        sha512 = "3f4kckmssz5nm8qwm7plgq1vl73jwzc9k7cf80gwjqvzdysa558x5gfhjws59hhni39yncaly8dm0rwa590k1pblxvg602955041c4y";
       };
     };
     "stringstream-0.0.5" = {
@@ -25188,13 +25386,13 @@ let
         sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87";
       };
     };
-    "superagent-3.8.2" = {
+    "superagent-3.8.3" = {
       name = "superagent";
       packageName = "superagent";
-      version = "3.8.2";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz";
-        sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1";
+        url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz";
+        sha512 = "0a4ra91hgzbhnyccsx319r1xzaw4cb3k144g7xrp10y3wckzd98vxhf5vk34cfvvlrav8pyf2vqr11scimkiyivg2w84458q0n2vd0q";
       };
     };
     "supports-color-0.2.0" = {
@@ -25251,22 +25449,13 @@ let
         sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
       };
     };
-    "supports-color-4.5.0" = {
+    "supports-color-5.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz";
-        sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b";
-      };
-    };
-    "supports-color-5.3.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "5.3.0";
+      version = "5.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz";
-        sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz";
+        sha512 = "3ks7qkl6s064qcdc5qnpzcwzcrnlzccz9m3faw54fnmsm2k8fzb9saqr5nhx7w9lnd4nbp0zg047zz8mwsd4fxfnalpb7kra619fdnf";
       };
     };
     "symbol-observable-1.0.1" = {
@@ -25405,22 +25594,22 @@ let
         sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5";
       };
     };
-    "tar-4.4.1" = {
+    "tar-4.4.2" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.1";
+      version = "4.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz";
-        sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz";
+        sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85";
       };
     };
-    "tar-fs-1.16.0" = {
+    "tar-fs-1.16.2" = {
       name = "tar-fs";
       packageName = "tar-fs";
-      version = "1.16.0";
+      version = "1.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz";
-        sha512 = "1i39d75rgrl2a3v3x65w7bz6az06sg7xdvp7j9zk5bqilj5znclmr7r5n9l6la6nkqikn4lkhnfrgp4hzbvp6ph77nn53g6zvmdpni3";
+        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.2.tgz";
+        sha512 = "0ywy8jh175q90rbr38yxx8dzhiyj8ch0jjxxidvjwmkh4s6hi1cp56ibq3aydlqflybssn9cc2cjdq717yqcw70kjsr12f46dd2gn9d";
       };
     };
     "tar-pack-3.4.1" = {
@@ -25432,13 +25621,13 @@ let
         sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w";
       };
     };
-    "tar-stream-1.5.5" = {
+    "tar-stream-1.6.0" = {
       name = "tar-stream";
       packageName = "tar-stream";
-      version = "1.5.5";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz";
-        sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr";
+        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz";
+        sha512 = "2kw4php0986jgdzqvrih64plc8md1f1v3wfc8mz3y0lz95dmmvba1lpjmwp1v4crgfky63r8an3syfavn3gb0d56xk7615zy40a47cn";
       };
     };
     "temp-0.6.0" = {
@@ -25486,6 +25675,15 @@ let
         sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2";
       };
     };
+    "tempfile-2.0.0" = {
+      name = "tempfile";
+      packageName = "tempfile";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz";
+        sha1 = "6b0446856a9b1114d1856ffcbe509cccb0977265";
+      };
+    };
     "term-size-1.2.0" = {
       name = "term-size";
       packageName = "term-size";
@@ -25603,6 +25801,15 @@ let
         sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
       };
     };
+    "through-2.2.7" = {
+      name = "through";
+      packageName = "through";
+      version = "2.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through/-/through-2.2.7.tgz";
+        sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd";
+      };
+    };
     "through-2.3.4" = {
       name = "through";
       packageName = "through";
@@ -25720,15 +25927,6 @@ let
         sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a";
       };
     };
-    "timed-out-3.1.3" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
-        sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
-      };
-    };
     "timed-out-4.0.1" = {
       name = "timed-out";
       packageName = "timed-out";
@@ -25747,13 +25945,13 @@ let
         sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d";
       };
     };
-    "timers-browserify-2.0.6" = {
+    "timers-browserify-2.0.10" = {
       name = "timers-browserify";
       packageName = "timers-browserify";
-      version = "2.0.6";
+      version = "2.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz";
-        sha512 = "0zvmxvcvmv91k667dy2hzd9a2knvhizxvbx73gcnbi5na3ypc3mldfljw062d7n6y2mf7n2gwwc5wr4wrdih927fxahg8s0hinyf38x";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz";
+        sha512 = "37aksk3ydmwy2n7ffsnbvyrwb5kmz5bhvi5fhyg593qs61x7vi9drblwnri5z4x9mzaz91xxqdgg15f0qmf8cd85wdfax2pbm4vbw32";
       };
     };
     "timespan-2.3.0" = {
@@ -25873,13 +26071,13 @@ let
         sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
       };
     };
-    "to-buffer-1.1.0" = {
+    "to-buffer-1.1.1" = {
       name = "to-buffer";
       packageName = "to-buffer";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.0.tgz";
-        sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa";
+        url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz";
+        sha512 = "1b8wsfz1rp8fsb2kz7isrsx292vl5w4cmx9qvivxqsj61avx9ph1azxa6zr3mc85cz8qddbkxm6ski8zvacmpadc22wp6pv5gk427wp";
       };
     };
     "to-fast-properties-1.0.3" = {
@@ -25972,13 +26170,13 @@ let
         sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29";
       };
     };
-    "torrent-discovery-8.4.0" = {
+    "torrent-discovery-8.4.1" = {
       name = "torrent-discovery";
       packageName = "torrent-discovery";
-      version = "8.4.0";
+      version = "8.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.0.tgz";
-        sha512 = "39hhpi3mzygr52pgdah0fvll7mdgmchilxshqjykypiz9167p476sjph4w1qbv98254ij6kdwn9b0j4bwqkcbnr3mspmjh1sm5n8fak";
+        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.1.tgz";
+        sha512 = "39wg1cq3w31h0yhwjl9aacpl9654psnwigdfbxli93xqvfm9w403gppc2r295ikc9rvglirzcyqiafpd6f8jpf65d6119xnwhgvyz1w";
       };
     };
     "torrent-piece-1.1.1" = {
@@ -26170,22 +26368,22 @@ let
         sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
       };
     };
-    "trim-trailing-lines-1.1.0" = {
+    "trim-trailing-lines-1.1.1" = {
       name = "trim-trailing-lines";
       packageName = "trim-trailing-lines";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz";
-        sha1 = "7aefbb7808df9d669f6da2e438cac8c46ada7684";
+        url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz";
+        sha512 = "2d7isckw2m4zqhp0qd4d8d272j8jp09qvqnp1fj3igzqkl7mx75l3fcnr8x1kh64xgf5afr9zyw6wk221mb7ajsk9xvfvfn2vsfyqkd";
       };
     };
-    "trough-1.0.1" = {
+    "trough-1.0.2" = {
       name = "trough";
       packageName = "trough";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz";
-        sha1 = "a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86";
+        url = "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz";
+        sha512 = "2qhjpmwnyz01jcf1yqjq00my48a3imn5z2z0ha4alfcr3imfpvrcbnv893cw71s7rh9h5icjga9nk180qk07nfmpwmlis66kd8jhy8l";
       };
     };
     "truncate-2.0.1" = {
@@ -26251,6 +26449,15 @@ let
         sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334";
       };
     };
+    "tunnel-0.0.4" = {
+      name = "tunnel";
+      packageName = "tunnel";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz";
+        sha1 = "2d3785a158c174c9a16dc2c046ec5fc5f1742213";
+      };
+    };
     "tunnel-0.0.5" = {
       name = "tunnel";
       packageName = "tunnel";
@@ -26386,13 +26593,13 @@ let
         sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557";
       };
     };
-    "typescript-2.8.1" = {
+    "typescript-2.8.3" = {
       name = "typescript";
       packageName = "typescript";
-      version = "2.8.1";
+      version = "2.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz";
-        sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2";
+        url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz";
+        sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b";
       };
     };
     "typewise-1.0.3" = {
@@ -26431,13 +26638,13 @@ let
         sha1 = "09ec54cd5b11dd5f1ef2fc0ab31d37002ca2b5ad";
       };
     };
-    "ua-parser-js-0.7.17" = {
+    "ua-parser-js-0.7.18" = {
       name = "ua-parser-js";
       packageName = "ua-parser-js";
-      version = "0.7.17";
+      version = "0.7.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz";
-        sha512 = "39ac4xrr9v9ya7rbn5cz8dss5j3s36yhpj9qrhfxxqzgy1vljns0qfyv7d76lqgdgdbfbrd91kb5x7jlg0fw2r4f3kml0v8xmv545xr";
+        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz";
+        sha512 = "2fa0nkj7g5jpslp45h1icl5hsw01qmm64x4s6vlxw07v2b80b3myi38r8b2s06h0chbva92bi9dd7hync3lmkfpls9m3h27algg1p1f";
       };
     };
     "uc.micro-1.0.5" = {
@@ -26503,13 +26710,13 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.3.20" = {
+    "uglify-js-3.3.23" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.3.20";
+      version = "3.3.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz";
-        sha512 = "3x6k1plb2hrmm51fn2w7nmi9pixipwj224a4afly17p2mwk75qhycib3zlaj9m0bk43ydfh0h2gv01l1xfhabvjcv36pc7x4xcf94js";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.23.tgz";
+        sha512 = "2zylyzplicczqknizbm1mp7grxz6bi6vg03rsld8l18b2rahl9y7b1rj2c3sp75afmmyqlgg57v8c0b1adyqm7arzw8kcc3n6l8mkra";
       };
     };
     "uglify-js-3.3.6" = {
@@ -26530,13 +26737,13 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "uglifyjs-webpack-plugin-1.2.4" = {
+    "uglifyjs-webpack-plugin-1.2.5" = {
       name = "uglifyjs-webpack-plugin";
       packageName = "uglifyjs-webpack-plugin";
-      version = "1.2.4";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz";
-        sha512 = "14jcr2nd1d4l940llkm93b2rm9886qi9vz16ab85nji84bmsr99rvzvv4vwzj3j0m2lpkkm2gskd4p29lv4vzjr76zp6vxwjn71nhng";
+        url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz";
+        sha512 = "15z1mr0hms0qbrip49l6c03ljb7243ag7smh13l8xfd0lgmky3b5pa1c1q4r4cdfwvl4m3yr9adj9grdfqqpgr5vc012gj05kbhk144";
       };
     };
     "uid-0.0.2" = {
@@ -26665,15 +26872,6 @@ let
         sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
       };
     };
-    "undefsafe-0.0.3" = {
-      name = "undefsafe";
-      packageName = "undefsafe";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz";
-        sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f";
-      };
-    };
     "undefsafe-2.0.2" = {
       name = "undefsafe";
       packageName = "undefsafe";
@@ -26737,6 +26935,15 @@ let
         sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
       };
     };
+    "underscore-1.9.0" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.0.tgz";
+        sha512 = "3w8byp6gw4jzam7sl3g72zy9k8qb67jc9h4fhlhd6xj3zn07rnnm812g9jc6ygfxqi4yv54l800ijnl9b8kizf8wc5582xi4h6pb1g0";
+      };
+    };
     "underscore-contrib-0.3.0" = {
       name = "underscore-contrib";
       packageName = "underscore-contrib";
@@ -26764,13 +26971,13 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "unherit-1.1.0" = {
+    "unherit-1.1.1" = {
       name = "unherit";
       packageName = "unherit";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz";
-        sha1 = "6b9aaedfbf73df1756ad9e316dd981885840cd7d";
+        url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz";
+        sha512 = "3k40pnw86jz2238r4fv4sp5sdykrva5gl4azq3yxnhk1mw8biy17b5c71hrzq0sfd48dp0kpq3k04f0k11bxd623qrpw2kmmxbnwxpr";
       };
     };
     "unicode-emoji-modifier-base-1.0.0" = {
@@ -26854,31 +27061,31 @@ let
         sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
       };
     };
-    "unist-util-is-2.1.1" = {
+    "unist-util-is-2.1.2" = {
       name = "unist-util-is";
       packageName = "unist-util-is";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.1.tgz";
-        sha1 = "0c312629e3f960c66e931e812d3d80e77010947b";
+        url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz";
+        sha512 = "1bk26f0rhka8jhrbjg0jhfc4cqxz7g5k7z8qxqw0353mfx7nvaq9dqj73s9vr3a0jd1yx4lv64cm6ajji7p55xj3cka1bgxy4mw2ib2";
       };
     };
-    "unist-util-remove-position-1.1.1" = {
+    "unist-util-remove-position-1.1.2" = {
       name = "unist-util-remove-position";
       packageName = "unist-util-remove-position";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz";
-        sha1 = "5a85c1555fc1ba0c101b86707d15e50fa4c871bb";
+        url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz";
+        sha512 = "3nrir95gy69ywsf99s11xmdk5dwjkaf1d7jriasr0nljg57cj4i5jxjh70f2hzazfwqfikb6blpn8dl3ck9sq3w578nbmga3cw0s6jz";
       };
     };
-    "unist-util-visit-1.3.0" = {
+    "unist-util-visit-1.3.1" = {
       name = "unist-util-visit";
       packageName = "unist-util-visit";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.0.tgz";
-        sha512 = "24s5gpqr3vip7zfd3c81k1mhcj1qzlmjhxpn80n3ay8kkg3zycjdkvi6d78j1d3lva7qr1lqrf2mcz5k41as5vwh8w5xdn52drmhyzn";
+        url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.1.tgz";
+        sha512 = "1lbrqw43r1ckx1i8zqjpyfbvdh3dngb9c6qsk5hcflqkryxzc8icc5vn50xf6vxsgcj4bznzfj10c17rrfd2jlvldhlnlq98ks43xyi";
       };
     };
     "universalify-0.1.1" = {
@@ -27025,13 +27232,22 @@ let
         sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p";
       };
     };
-    "update-check-1.2.0" = {
+    "upath-1.0.5" = {
+      name = "upath";
+      packageName = "upath";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz";
+        sha512 = "31m1lljcfngdnpyz67gpkwvb66gx6750si3jzmf1vg6kq420fq5lcd34cfgp6wz3manjpqbp9i98ax2yjl2xs7mq824chw38vvsgcm9";
+      };
+    };
+    "update-check-1.3.2" = {
       name = "update-check";
       packageName = "update-check";
-      version = "1.2.0";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-check/-/update-check-1.2.0.tgz";
-        sha512 = "1w28g23994qxxlkbmahrqsakjmr6hhknxyg6y109y5ghgph52w51wzyxz2y2z22417298cmyinbc8fjkv64840g61cqv0iziy7bsy14";
+        url = "https://registry.npmjs.org/update-check/-/update-check-1.3.2.tgz";
+        sha512 = "16lfi8gzdrmk0sq5fbqrq8vy3gmpssr05xac487hmsph1hk0i82n1bp8dklmvnkqk28w74bl8gphkanjn0v8f1walwcbbhpg3mss8fj";
       };
     };
     "update-notifier-0.5.0" = {
@@ -27043,15 +27259,6 @@ let
         sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc";
       };
     };
-    "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";
-      };
-    };
     "update-notifier-2.3.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
@@ -27061,13 +27268,13 @@ let
         sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451";
       };
     };
-    "update-notifier-2.4.0" = {
+    "update-notifier-2.5.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "2.4.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz";
-        sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz";
+        sha512 = "07vkna9y5i0ak6rwcbinrrgpabrcmav91ys805c42jskyc6kfla3wd12klsr858vzv5civi7arh5xz8bv7jdj81zgzyh6j70a31s0w3";
       };
     };
     "update-section-0.3.3" = {
@@ -27205,22 +27412,22 @@ let
         sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
       };
     };
-    "useragent-2.3.0" = {
+    "useragent-2.2.1" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.3.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz";
-        sha512 = "1vqmf9ng5navlr0kvklslvzbqym47sbqblc3i74ln0hswdyd0yx86fj3cnhb2pjjyy3cqs1mq9ywkz92j5x7km2iv1g2jkfkki0f2p0";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz";
+        sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e";
       };
     };
-    "ut_metadata-3.2.0" = {
+    "ut_metadata-3.2.1" = {
       name = "ut_metadata";
       packageName = "ut_metadata";
-      version = "3.2.0";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.0.tgz";
-        sha512 = "3c8a0bnic4symhd8m0gy22adlj8pkmiclsxbr6j979fwabrj0z74xp2bknfqp57vndr4f79d4mnhygrbvp69xdn911j0q6ljgd1bw8i";
+        url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.1.tgz";
+        sha512 = "0d0wdjn4cdn5jqsdma0624pvsxv2zakshxlcx2hm9vrxnr1pvm5al0lzwchkpri3nmsdimf3liv6rr7g5c9z79gphdijzrz19lg7ydn";
       };
     };
     "ut_pex-1.2.0" = {
@@ -27340,13 +27547,13 @@ let
         sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30";
       };
     };
-    "utp-native-1.7.0" = {
+    "utp-native-1.7.1" = {
       name = "utp-native";
       packageName = "utp-native";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz";
-        sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz";
+        url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz";
+        sha512 = "2mflgna04nng4cj8z4pr53pw0fm3z447mvbnvcahlvq8wpg46znrvg4fkgh18k14bkiq3gic5d2h975bgy7h7l64cfjpc8r2km3naqm";
       };
     };
     "uue-3.1.2" = {
@@ -27610,13 +27817,13 @@ let
         sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7";
       };
     };
-    "vfile-location-2.0.2" = {
+    "vfile-location-2.0.3" = {
       name = "vfile-location";
       packageName = "vfile-location";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz";
-        sha1 = "d3675c59c877498e492b4756ff65e4af1a752255";
+        url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz";
+        sha512 = "3l6rl79knh2zld6jvcxwjk17697nijqykbma3wxj5gcdixc8i4vjj92ad5372yf00x9j7h760s53km1n4ljcxzwl20m1hszi6bpzknc";
       };
     };
     "vhost-3.0.2" = {
@@ -27718,6 +27925,15 @@ let
         sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
       };
     };
+    "vm-browserify-1.0.1" = {
+      name = "vm-browserify";
+      packageName = "vm-browserify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.0.1.tgz";
+        sha512 = "2cfjhw3c398d3nlbi0z1f6jlmjymyk13clnsnvwpa6cgcpbhh0zsghs7zi1fz6ydnbg6ignbbhvzrk44k0mcaps8iiv0q0c29rcpb0j";
+      };
+    };
     "voc-1.1.0" = {
       name = "voc";
       packageName = "voc";
@@ -27880,6 +28096,15 @@ let
         sha512 = "003dzsqf9q7awjnkv00gwrqw7s8n29y8nmfcmpsl845j2m7rgxxvvd3gld643c92jfwq9yw7ysbaavw9pq1yc5df8yfxmh1sjj64aa5";
       };
     };
+    "watchpack-1.6.0" = {
+      name = "watchpack";
+      packageName = "watchpack";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz";
+        sha512 = "34gp4bbaidicl7azgivrrxb9kvdz501gg0xyf88lya75j9wmrbd1rs5rlk2h5g07q5rb453fkjkck54j2qzsdam1qk36bijf5xlg9wb";
+      };
+    };
     "wcwidth-1.0.1" = {
       name = "wcwidth";
       packageName = "wcwidth";
@@ -27943,13 +28168,13 @@ let
         sha512 = "1bq9cabpvsx4b0aajmbhsgkdzh816rrixhbnsmvcr0ypcndhn5zz9fggfc8i4l2s00b6jhif65phkc9l6zvika8ngb21rip9qx4pj4m";
       };
     };
-    "webtorrent-0.98.24" = {
+    "webtorrent-0.99.4" = {
       name = "webtorrent";
       packageName = "webtorrent";
-      version = "0.98.24";
+      version = "0.99.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.98.24.tgz";
-        sha512 = "1jf65qy9fq5ngb1sv296r6wbahjwac8vkdddpfhwmyvmbxabfyn8vz09d5di8sy69d4w0kyi74kjx09v7rd954cg135kr9smyy615yk";
+        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.99.4.tgz";
+        sha512 = "1d0rpdlr8flkbipr3qhr59qknfc3mlmz8ka9w6mnkbxhdflwky2l1f3z244xzgis509c8r1qyyjskv99ccrmc10rz93l52f4bb7m0kj";
       };
     };
     "whatwg-fetch-2.0.4" = {
@@ -28060,15 +28285,6 @@ let
         sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
       };
     };
-    "widest-line-1.0.0" = {
-      name = "widest-line";
-      packageName = "widest-line";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
-        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
-      };
-    };
     "widest-line-2.0.0" = {
       name = "widest-line";
       packageName = "widest-line";
@@ -28123,15 +28339,6 @@ let
         sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876";
       };
     };
-    "window-size-0.2.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
-        sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
-      };
-    };
     "windows-no-runnable-0.0.6" = {
       name = "windows-no-runnable";
       packageName = "windows-no-runnable";
@@ -28222,13 +28429,13 @@ let
         sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
       };
     };
-    "winston-2.4.1" = {
+    "winston-2.4.2" = {
       name = "winston";
       packageName = "winston";
-      version = "2.4.1";
+      version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.4.1.tgz";
-        sha512 = "2m8ya9y2s295czzzd8yffyny528vfnbjlzz4xpix3c5y51yfmczzbh3v1hkj0kmxwr25c7yp3xxz1vz4skbj93n4ir9gxbp6y9q7zwk";
+        url = "https://registry.npmjs.org/winston/-/winston-2.4.2.tgz";
+        sha512 = "1n2jk29vqjj4v60j3553gyy1lz5mnm90bf999p4nz6chnmh0izg8c9kf4chy1j68fx8d3mnr5ci5llqr4cjy0n775ydjj2zhrvw0bz1";
       };
     };
     "with-4.0.3" = {
@@ -28862,15 +29069,6 @@ let
         sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
       };
     };
-    "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";
-      };
-    };
     "yargs-3.32.0" = {
       name = "yargs";
       packageName = "yargs";
@@ -28880,15 +29078,6 @@ let
         sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995";
       };
     };
-    "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";
-      };
-    };
     "yargs-6.6.0" = {
       name = "yargs";
       packageName = "yargs";
@@ -28925,15 +29114,6 @@ let
         sha1 = "52acc23feecac34042078ee78c0c007f5085db4c";
       };
     };
-    "yargs-parser-2.4.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
-        sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
-      };
-    };
     "yargs-parser-4.2.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -29111,10 +29291,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.12.0";
+    version = "1.13.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.12.0.tgz";
-      sha512 = "1sk9p5lng0hwngvzbz28nwaamf73hyz4pa14fxzmwq11syjfiw8b3p95vig8sabn2zfwi8ddginhg5rvf10a5rgpq3cy608yy7qk21z";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.13.0.tgz";
+      sha512 = "30a11iiiihsrqj8dc11n5m57im2300l46cygfh4r1q121m2l0vhzaqkg6p65kd7law25xkviw92zwmkd926n674hkv9gr6vsxrskimh";
     };
     dependencies = [
       sources."JSV-4.0.2"
@@ -29123,7 +29303,7 @@ in
       sources."array-unique-0.3.2"
       sources."async-2.6.0"
       sources."babel-code-frame-6.26.0"
-      (sources."babel-core-6.26.0" // {
+      (sources."babel-core-6.26.3" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -29145,7 +29325,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."chalk-1.1.3"
       sources."chmodr-1.0.2"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."commander-2.15.1"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.5.1"
@@ -29187,7 +29367,7 @@ in
           sources."strip-ansi-0.1.1"
         ];
       })
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."loose-envify-1.3.1"
       sources."matcher-collection-1.0.5"
       sources."minimatch-3.0.4"
@@ -29207,7 +29387,7 @@ in
       sources."private-0.1.8"
       sources."regenerator-runtime-0.11.1"
       sources."repeating-2.0.1"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."sax-0.5.8"
       sources."slash-1.0.0"
       sources."source-map-0.6.1"
@@ -29320,11 +29500,11 @@ in
       sources."performance-now-2.1.0"
       sources."punycode-1.4.1"
       sources."q-1.5.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-1.1.14"
       sources."request-2.85.0"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sntp-2.1.0"
       sources."sshpk-1.14.1"
       sources."string_decoder-0.10.31"
@@ -29363,7 +29543,7 @@ in
     dependencies = [
       sources."@types/caseless-0.12.1"
       sources."@types/form-data-2.2.1"
-      sources."@types/node-8.10.4"
+      sources."@types/node-8.10.12"
       sources."@types/request-2.47.0"
       sources."@types/tough-cookie-2.3.2"
       sources."@types/uuid-3.4.3"
@@ -29634,7 +29814,7 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."map-stream-0.1.0"
       sources."md5.js-1.3.4"
       sources."mime-db-1.33.0"
@@ -29642,7 +29822,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.0"
+      sources."moment-2.22.1"
       (sources."ms-rest-2.3.3" // {
         dependencies = [
           sources."extend-3.0.1"
@@ -29653,10 +29833,10 @@ in
       })
       (sources."ms-rest-azure-2.5.5" // {
         dependencies = [
-          sources."@types/node-9.6.2"
+          sources."@types/node-9.6.12"
           (sources."adal-node-0.1.28" // {
             dependencies = [
-              sources."@types/node-8.10.4"
+              sources."@types/node-8.10.12"
             ];
           })
           sources."async-2.6.0"
@@ -29695,7 +29875,7 @@ in
       })
       sources."punycode-1.4.1"
       sources."q-0.9.7"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."read-1.0.7"
       (sources."readable-stream-1.0.34" // {
         dependencies = [
@@ -29728,7 +29908,7 @@ in
       })
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-0.5.2"
       sources."sntp-2.1.0"
       sources."source-map-0.1.43"
@@ -29933,10 +30113,10 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "16.1.1";
+    version = "16.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz";
-      sha512 = "01ay1w7sndfvwjdc5n7sa9a4yzzrwdr8agj1655dz50f0g034scaqli9v1dngxasi8gk8gqvqcsqnmphvwkj1y6awlq1y5l6bbgc8c9";
+      url = "https://registry.npmjs.org/browserify/-/browserify-16.2.0.tgz";
+      sha512 = "02kwwi6cvxwcyhv9n13j05y67xdkb4b09p5z7n2sl97sif012i5cibmbz6wqqy89ybqh7s3sbdxqf7g6y2hbl61g81vhrbz9815v2ya";
     };
     dependencies = [
       sources."JSONStream-1.3.2"
@@ -29949,7 +30129,7 @@ in
       sources."assert-1.4.1"
       sources."astw-2.2.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.2.3"
+      sources."base64-js-1.3.0"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
       sources."brorand-1.1.0"
@@ -29960,8 +30140,8 @@ in
         ];
       })
       sources."browserify-aes-1.2.0"
-      sources."browserify-cipher-1.0.0"
-      sources."browserify-des-1.0.0"
+      sources."browserify-cipher-1.0.1"
+      sources."browserify-des-1.0.1"
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
@@ -29978,20 +30158,16 @@ in
       sources."constants-browserify-1.0.0"
       sources."convert-source-map-1.1.3"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.3"
-      sources."create-hmac-1.1.6"
-      (sources."crypto-browserify-3.12.0" // {
-        dependencies = [
-          sources."hash-base-2.0.2"
-        ];
-      })
+      sources."create-ecdh-4.0.1"
+      sources."create-hash-1.2.0"
+      sources."create-hmac-1.1.7"
+      sources."crypto-browserify-3.12.0"
       sources."date-now-0.1.4"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
       sources."des.js-1.0.0"
       sources."detective-5.1.0"
-      sources."diffie-hellman-5.0.2"
+      sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
       sources."elliptic-6.4.0"
@@ -30007,7 +30183,6 @@ in
       sources."htmlescape-1.1.1"
       sources."https-browserify-1.0.0"
       sources."ieee754-1.1.11"
-      sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."inline-source-map-0.6.2"
@@ -30022,7 +30197,7 @@ in
       sources."lodash.memoize-3.0.4"
       sources."md5.js-1.3.4"
       sources."miller-rabin-4.0.1"
-      sources."minimalistic-assert-1.0.0"
+      sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -30037,15 +30212,15 @@ in
       sources."os-browserify-0.3.0"
       sources."pako-1.0.6"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.0"
+      sources."parse-asn1-5.1.1"
       sources."path-browserify-0.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.5"
       sources."path-platform-0.11.15"
-      sources."pbkdf2-3.0.14"
+      sources."pbkdf2-3.0.16"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
-      sources."public-encrypt-4.0.0"
+      sources."public-encrypt-4.0.2"
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -30055,12 +30230,11 @@ in
       (sources."readable-stream-2.3.6" // {
         dependencies = [
           sources."isarray-1.0.0"
-          sources."string_decoder-1.1.1"
         ];
       })
-      sources."resolve-1.7.0"
-      sources."ripemd160-2.0.1"
-      sources."safe-buffer-5.1.1"
+      sources."resolve-1.7.1"
+      sources."ripemd160-2.0.2"
+      sources."safe-buffer-5.1.2"
       sources."sha.js-2.4.11"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
@@ -30069,7 +30243,7 @@ in
       sources."stream-combiner2-1.1.1"
       sources."stream-http-2.8.1"
       sources."stream-splicer-2.0.0"
-      sources."string_decoder-1.0.3"
+      sources."string_decoder-1.1.1"
       (sources."subarg-1.0.0" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -30094,7 +30268,7 @@ in
         ];
       })
       sources."util-deprecate-1.0.2"
-      sources."vm-browserify-0.0.4"
+      sources."vm-browserify-1.0.1"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
     ];
@@ -30129,7 +30303,7 @@ in
       sources."async-0.2.10"
       sources."aws-sign-0.2.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.2.3"
+      sources."base64-js-1.3.0"
       sources."bencode-2.0.0"
       sources."bitfield-0.1.0"
       sources."bittorrent-dht-6.4.2"
@@ -30273,8 +30447,8 @@ in
       sources."optjs-3.2.2"
       sources."pad-0.0.5"
       sources."parse-json-2.2.0"
-      sources."parse-torrent-5.8.3"
-      sources."parse-torrent-file-4.1.0"
+      sources."parse-torrent-5.9.1"
+      sources."parse-torrent-file-2.1.4"
       sources."path-exists-2.1.0"
       sources."path-is-absolute-1.0.1"
       sources."path-type-1.1.0"
@@ -30289,13 +30463,12 @@ in
           sources."bencode-0.7.0"
           sources."debug-3.1.0"
           sources."end-of-stream-0.1.5"
-          sources."get-stdin-5.0.1"
+          sources."get-stdin-6.0.0"
           sources."isarray-1.0.0"
           sources."magnet-uri-4.2.3"
           sources."minimist-0.0.10"
           sources."object-assign-4.1.1"
           sources."once-1.2.0"
-          sources."parse-torrent-file-2.1.4"
           sources."readable-stream-2.3.6"
           sources."safe-buffer-5.0.1"
           sources."string_decoder-1.1.1"
@@ -30326,7 +30499,7 @@ in
       sources."qs-0.5.6"
       sources."query-string-1.0.1"
       sources."random-access-file-2.0.1"
-      sources."random-access-storage-1.1.1"
+      sources."random-access-storage-1.2.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
@@ -30336,7 +30509,6 @@ in
       sources."read-pkg-up-1.0.1"
       (sources."read-torrent-1.3.0" // {
         dependencies = [
-          sources."bencode-0.7.0"
           sources."magnet-uri-2.0.1"
           sources."mime-1.2.11"
           (sources."parse-torrent-4.1.0" // {
@@ -30344,7 +30516,6 @@ in
               sources."magnet-uri-4.2.3"
             ];
           })
-          sources."parse-torrent-file-2.1.4"
           sources."thirty-two-0.0.2"
         ];
       })
@@ -30355,16 +30526,16 @@ in
       sources."request-2.16.6"
       sources."rimraf-2.6.2"
       sources."router-0.6.2"
-      sources."run-parallel-1.1.8"
-      sources."run-series-1.1.6"
+      sources."run-parallel-1.1.9"
+      sources."run-series-1.1.8"
       sources."rusha-0.8.13"
       sources."rx-2.5.3"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-1.2.4"
       sources."semver-5.5.0"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-2.7.0"
+      sources."simple-get-2.8.1"
       sources."simple-peer-6.4.4"
       sources."simple-sha1-2.1.0"
       (sources."simple-websocket-4.3.1" // {
@@ -30387,7 +30558,7 @@ in
         ];
       })
       sources."stream-transcoder-0.0.5"
-      sources."string2compact-1.2.2"
+      sources."string2compact-1.2.3"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-2.0.1"
       sources."strip-bom-2.0.0"
@@ -30494,14 +30665,14 @@ in
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
       sources."axios-0.17.1"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.3.1"
       sources."cli-table2-0.2.0"
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."commander-2.15.1"
       sources."debug-3.1.0"
       sources."escape-string-regexp-1.0.5"
@@ -30521,7 +30692,7 @@ in
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -30555,7 +30726,7 @@ in
       sources."stack-trace-0.0.10"
       sources."statsd-parser-0.0.4"
       sources."strftime-0.10.0"
-      sources."winston-2.4.1"
+      sources."winston-2.4.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -30601,7 +30772,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."big-integer-1.6.27"
+      sources."big-integer-1.6.28"
       sources."block-stream-0.0.9"
       sources."bn.js-4.11.8"
       (sources."body-parser-1.18.2" // {
@@ -30626,8 +30797,8 @@ in
         ];
       })
       sources."browserify-aes-1.2.0"
-      sources."browserify-cipher-1.0.0"
-      sources."browserify-des-1.0.0"
+      sources."browserify-cipher-1.0.1"
+      sources."browserify-des-1.0.1"
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-transform-tools-1.7.0"
@@ -30684,9 +30855,8 @@ in
       (sources."cordova-lib-8.0.0" // {
         dependencies = [
           sources."acorn-4.0.13"
-          sources."base64-js-1.2.3"
+          sources."base64-js-1.3.0"
           sources."glob-7.1.1"
-          sources."hash-base-2.0.2"
           sources."isarray-1.0.0"
           sources."minimist-1.2.0"
           sources."nopt-4.0.1"
@@ -30698,7 +30868,9 @@ in
           sources."process-nextick-args-2.0.0"
           sources."q-1.0.1"
           sources."qs-6.3.2"
+          sources."safe-buffer-5.1.1"
           sources."shelljs-0.3.0"
+          sources."underscore-1.8.3"
           sources."uuid-3.2.1"
           sources."xmlbuilder-8.2.2"
         ];
@@ -30710,15 +30882,15 @@ in
         ];
       })
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.3"
-      sources."create-hmac-1.1.6"
+      sources."create-ecdh-4.0.1"
+      sources."create-hash-1.2.0"
+      sources."create-hmac-1.1.7"
       sources."cryptiles-2.0.5"
       sources."crypto-browserify-3.12.0"
       sources."dashdash-1.14.1"
       sources."date-now-0.1.4"
       sources."debug-2.6.9"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."defined-1.0.0"
       sources."delayed-stream-1.0.0"
       (sources."dep-graph-1.1.0" // {
@@ -30737,11 +30909,11 @@ in
       sources."destroy-1.0.4"
       sources."detect-indent-5.0.0"
       sources."detective-4.7.1"
-      sources."diffie-hellman-5.0.2"
+      sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.1.7"
       sources."dot-prop-3.0.0"
       sources."duplexer2-0.1.4"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."ecc-jsbn-0.1.1"
       sources."editor-1.0.0"
       sources."ee-first-1.1.1"
@@ -30862,7 +31034,7 @@ in
       sources."mime-1.4.1"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
-      sources."minimalistic-assert-1.0.0"
+      sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -30874,7 +31046,7 @@ in
       sources."nested-error-stacks-1.0.2"
       sources."nopt-3.0.1"
       sources."normalize-package-data-2.4.0"
-      sources."npm-package-arg-6.0.0"
+      sources."npm-package-arg-6.1.0"
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
@@ -30894,14 +31066,14 @@ in
       sources."package-json-1.2.0"
       sources."pako-0.2.9"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.0"
+      sources."parse-asn1-5.1.1"
       sources."parseurl-1.3.2"
       sources."path-browserify-0.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.5"
       sources."path-platform-0.11.15"
       sources."path-to-regexp-0.1.7"
-      sources."pbkdf2-3.0.14"
+      sources."pbkdf2-3.0.16"
       sources."pegjs-0.10.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
@@ -30912,7 +31084,7 @@ in
       sources."promzard-0.3.0"
       sources."properties-parser-0.3.1"
       sources."proxy-addr-2.0.3"
-      sources."public-encrypt-4.0.0"
+      sources."public-encrypt-4.0.2"
       sources."punycode-1.4.1"
       sources."q-1.5.1"
       sources."qs-6.5.1"
@@ -30927,7 +31099,7 @@ in
           sources."http-errors-1.6.2"
         ];
       })
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."read-1.0.7"
       sources."read-all-stream-3.1.0"
       sources."read-only-stream-2.0.0"
@@ -30942,13 +31114,13 @@ in
       sources."registry-url-3.1.0"
       sources."repeating-1.1.3"
       sources."request-2.79.0"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."restore-cursor-1.0.1"
       sources."rimraf-2.6.2"
-      sources."ripemd160-2.0.1"
+      sources."ripemd160-2.0.2"
       sources."run-async-0.1.0"
       sources."rx-lite-3.1.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-0.3.5"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
@@ -31002,7 +31174,7 @@ in
       sources."type-is-1.6.16"
       sources."typedarray-0.0.6"
       sources."umd-3.0.3"
-      sources."underscore-1.8.3"
+      sources."underscore-1.9.0"
       sources."unorm-1.4.1"
       sources."unpipe-1.0.0"
       (sources."update-notifier-0.5.0" // {
@@ -31110,7 +31282,7 @@ in
       sources."pseudomap-1.0.2"
       sources."readable-stream-1.1.14"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.5.0"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-3.0.1"
@@ -31155,7 +31327,7 @@ in
     dependencies = [
       sources."ansi-styles-3.2.1"
       sources."babel-runtime-6.26.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
       sources."core-js-2.5.5"
@@ -31176,7 +31348,7 @@ in
       sources."shebang-regex-1.0.0"
       sources."source-map-0.5.7"
       sources."source-map-support-0.4.18"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."universalify-0.1.1"
       sources."which-1.3.0"
       sources."yallist-2.1.2"
@@ -31268,7 +31440,7 @@ in
       sources."bytes-3.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caseless-0.12.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."circular-append-file-1.0.1"
       sources."cli-truncate-1.1.0"
       sources."cliclopts-1.1.1"
@@ -31276,7 +31448,7 @@ in
       sources."codecs-1.2.1"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -31292,7 +31464,7 @@ in
       sources."cycle-1.0.3"
       sources."dashdash-1.14.1"
       sources."dat-dns-1.3.2"
-      (sources."dat-doctor-1.3.1" // {
+      (sources."dat-doctor-1.4.0" // {
         dependencies = [
           sources."debug-2.6.9"
           sources."dns-packet-1.3.1"
@@ -31333,8 +31505,7 @@ in
       sources."dat-registry-4.0.0"
       sources."dat-secret-storage-4.0.1"
       sources."dat-storage-1.0.4"
-      sources."dat-swarm-defaults-1.0.0"
-      sources."datland-swarm-defaults-1.0.2"
+      sources."dat-swarm-defaults-1.0.1"
       sources."debug-3.1.0"
       sources."deep-equal-0.2.2"
       sources."delayed-stream-1.0.0"
@@ -31359,7 +31530,7 @@ in
       sources."dns-socket-3.0.0"
       sources."dns-txt-2.0.2"
       sources."dom-walk-0.1.1"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."ecc-jsbn-0.1.1"
       sources."end-of-stream-1.4.1"
       sources."escape-string-regexp-1.0.5"
@@ -31394,7 +31565,7 @@ in
       sources."hoek-4.2.1"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.13.0" // {
+      (sources."hypercore-6.14.0" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
@@ -31457,7 +31628,7 @@ in
       sources."min-document-2.19.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mirror-folder-2.1.1"
+      sources."mirror-folder-2.2.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."multi-random-access-2.1.1"
@@ -31503,10 +31674,10 @@ in
       sources."protocol-buffers-encodings-1.1.0"
       sources."pump-2.0.1"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."random-access-file-2.0.1"
       sources."random-access-memory-2.4.0"
-      sources."random-access-storage-1.1.1"
+      sources."random-access-storage-1.2.0"
       (sources."randomatic-1.1.7" // {
         dependencies = [
           (sources."is-number-3.0.0" // {
@@ -31529,14 +31700,14 @@ in
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
       sources."rusha-0.8.13"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."signed-varint-2.0.1"
       sources."simple-sha1-2.1.0"
       sources."siphash24-1.1.0"
       sources."slice-ansi-1.0.0"
       sources."sntp-2.1.0"
       sources."sodium-javascript-0.5.5"
-      sources."sodium-native-2.1.5"
+      sources."sodium-native-2.1.6"
       sources."sodium-universal-2.0.0"
       sources."sorted-array-functions-1.1.0"
       sources."sorted-indexof-1.0.0"
@@ -31558,7 +31729,7 @@ in
           sources."debug-2.6.9"
         ];
       })
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       (sources."throttle-1.0.3" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -31566,7 +31737,7 @@ in
       })
       sources."through2-2.0.3"
       sources."thunky-1.0.2"
-      sources."to-buffer-1.1.0"
+      sources."to-buffer-1.1.1"
       sources."toiletdb-1.4.1"
       sources."tough-cookie-2.3.4"
       sources."township-client-1.3.2"
@@ -31582,7 +31753,7 @@ in
       sources."untildify-3.0.2"
       sources."util-deprecate-1.0.2"
       sources."utile-0.3.0"
-      sources."utp-native-1.7.0"
+      sources."utp-native-1.7.1"
       sources."uuid-3.2.1"
       sources."varint-3.0.1"
       sources."verror-1.10.0"
@@ -31610,10 +31781,10 @@ in
   dhcp = nodeEnv.buildNodePackage {
     name = "dhcp";
     packageName = "dhcp";
-    version = "0.2.11";
+    version = "0.2.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.11.tgz";
-      sha512 = "287rcz01q13rn3b83ds5kh05l176wag4p9vxxzrx3q63nhjmy6pvkxf1c1d7k0bd8r8nhqdldn5f1p50r4a1y1ybgy9zz0gqfbwb0d7";
+      url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.12.tgz";
+      sha512 = "1ks1wdfgj703sxp1ys7hjfkw0sm6sm9z7iviqxicvmy9r3mj7irq3vjyk4nvxgyq29j3qz8bi8lvm38r4w8j1j2xbkx85fk0l3vpa7r";
     };
     dependencies = [
       sources."minimist-1.2.0"
@@ -31683,7 +31854,7 @@ in
       sources."fresh-0.2.4"
       sources."from-0.1.7"
       sources."hiredis-0.4.1"
-      sources."http-parser-js-0.4.11"
+      sources."http-parser-js-0.4.12"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."ipaddr.js-1.0.5"
@@ -31783,6 +31954,9 @@ in
       sources."basic-auth-1.1.0"
       sources."bindings-1.2.1"
       sources."bl-0.8.2"
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-0.1.1"
+      sources."buffer-fill-0.1.1"
       sources."bytewise-1.1.0"
       sources."bytewise-core-1.2.3"
       sources."cookie-signature-1.1.0"
@@ -31790,7 +31964,7 @@ in
       sources."cors-2.8.4"
       sources."deferred-leveldown-0.2.0"
       sources."docker-parse-image-3.0.1"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."end-of-stream-1.4.1"
       (sources."errno-0.1.7" // {
         dependencies = [
@@ -31805,6 +31979,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
+      sources."fs-constants-1.0.0"
       sources."inherits-2.0.3"
       sources."isarray-0.0.1"
       sources."json-stringify-safe-5.0.1"
@@ -31871,7 +32046,7 @@ in
       sources."pull-stream-3.6.7"
       sources."pull-window-2.1.4"
       sources."pump-1.0.3"
-      (sources."pumpify-1.4.0" // {
+      (sources."pumpify-1.5.0" // {
         dependencies = [
           sources."pump-2.0.1"
         ];
@@ -31879,7 +32054,7 @@ in
       sources."readable-stream-1.1.14"
       sources."relative-date-1.1.3"
       sources."root-2.0.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.1.1"
       sources."sorted-union-stream-1.0.2"
       sources."split2-0.2.1"
@@ -31887,7 +32062,7 @@ in
       sources."stream-shift-1.0.0"
       sources."stream-to-pull-stream-1.7.2"
       sources."string_decoder-0.10.31"
-      (sources."tar-stream-1.5.5" // {
+      (sources."tar-stream-1.6.0" // {
         dependencies = [
           sources."bl-1.2.2"
           sources."isarray-1.0.0"
@@ -31902,6 +32077,7 @@ in
         ];
       })
       sources."thunky-0.1.0"
+      sources."to-buffer-1.1.1"
       sources."typewise-1.0.3"
       sources."typewise-core-1.2.0"
       sources."typewiselite-1.0.0"
@@ -31922,10 +32098,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.3.8";
+    version = "3.3.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.8.tgz";
-      sha512 = "3bahinp16ajfxy06ihrl022906h6zdxhsgmwh28k1p04blzqzgddbryx4l1a8ncg5fdjlj7ka9k3f6lam68fanjw4093hgyns7iclf4";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.12.tgz";
+      sha512 = "3jj2vxmyham5bhfxvbilsd60sgkdabzl0mbid2i4hfjjgqjs76f4av2qifnvphn4a0ds727wjcp4kjz2963pjqrq53ik0k87706arn1";
     };
     dependencies = [
       sources."JSONStream-1.3.2"
@@ -31934,10 +32110,10 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.0"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.223.1"
+      sources."aws-sdk-2.233.1"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
-      sources."base64-js-1.2.3"
+      sources."base64-js-1.3.0"
       sources."bcrypt-pbkdf-1.0.1"
       sources."boom-4.3.1"
       sources."buffer-4.9.1"
@@ -31951,6 +32127,7 @@ in
         ];
       })
       sources."dashdash-1.14.1"
+      sources."decimal.js-10.0.0"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.1"
       sources."events-1.1.1"
@@ -31978,7 +32155,8 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonparse-1.3.1"
       sources."jsprim-1.4.1"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
+      sources."lossless-json-1.0.2"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimist-0.0.10"
@@ -31986,14 +32164,14 @@ in
       sources."optimist-0.6.1"
       sources."performance-now-2.1.0"
       sources."punycode-1.3.2"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."querystring-0.2.0"
       (sources."request-2.85.0" // {
         dependencies = [
           sources."punycode-1.4.1"
         ];
       })
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-1.2.1"
       sources."sntp-2.1.0"
       sources."sshpk-1.14.1"
@@ -32187,7 +32365,7 @@ in
       sources."repeat-string-1.6.1"
       sources."request-2.79.0"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."set-immediate-shim-1.0.1"
       sources."sntp-1.0.9"
       sources."split-1.0.1"
@@ -32242,7 +32420,7 @@ in
       sources."asap-2.0.6"
       sources."auto-bind-1.2.0"
       sources."babel-code-frame-6.26.0"
-      sources."babel-core-6.26.0"
+      sources."babel-core-6.26.3"
       sources."babel-generator-6.26.1"
       sources."babel-helper-builder-react-jsx-6.26.0"
       sources."babel-helpers-6.24.1"
@@ -32314,10 +32492,10 @@ in
       (sources."ink-0.3.1" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."core-js-1.2.7"
           sources."strip-ansi-4.0.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."ink-text-input-1.1.1"
@@ -32340,7 +32518,7 @@ in
       sources."json5-0.5.1"
       sources."load-json-file-1.1.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash.debounce-4.0.8"
       sources."lodash.flattendeep-4.4.0"
       sources."lodash.isequal-4.5.0"
@@ -32403,7 +32581,7 @@ in
       sources."require-from-string-1.2.1"
       sources."resolve-from-3.0.0"
       sources."restore-cursor-2.0.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."setimmediate-1.0.5"
@@ -32428,7 +32606,7 @@ in
       sources."to-fast-properties-1.0.3"
       sources."trim-newlines-1.0.0"
       sources."trim-right-1.0.1"
-      sources."ua-parser-js-0.7.17"
+      sources."ua-parser-js-0.7.18"
       sources."unicode-emoji-modifier-base-1.0.0"
       sources."url-parse-lax-1.0.0"
       sources."url-to-options-1.0.1"
@@ -32483,10 +32661,10 @@ in
       sources."buffer-from-1.0.0"
       sources."caller-path-0.1.0"
       sources."callsites-0.2.0"
-      (sources."chalk-2.3.2" // {
+      (sources."chalk-2.4.1" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."chardet-0.4.2"
@@ -32523,13 +32701,13 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
-      sources."globals-11.4.0"
+      sources."globals-11.5.0"
       sources."globby-5.0.0"
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.21"
-      sources."ignore-3.3.7"
+      sources."ignore-3.3.8"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -32547,7 +32725,7 @@ in
       sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.3.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lru-cache-4.1.2"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
@@ -32580,7 +32758,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."shebang-command-1.2.0"
@@ -32679,9 +32857,9 @@ in
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
-          (sources."chalk-2.3.2" // {
+          (sources."chalk-2.4.1" // {
             dependencies = [
-              sources."supports-color-5.3.0"
+              sources."supports-color-5.4.0"
             ];
           })
           sources."strip-ansi-4.0.0"
@@ -32706,13 +32884,13 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
-      sources."globals-11.4.0"
+      sources."globals-11.5.0"
       sources."globby-5.0.0"
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.21"
-      sources."ignore-3.3.7"
+      sources."ignore-3.3.8"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -32730,7 +32908,7 @@ in
       sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.3.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lru-cache-4.1.2"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
@@ -32759,14 +32937,14 @@ in
       sources."readable-stream-2.3.6"
       sources."regexpp-1.1.0"
       sources."require-uncached-1.0.3"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."resolve-from-1.0.1"
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."shebang-command-1.2.0"
@@ -32808,10 +32986,10 @@ in
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
     packageName = "emojione";
-    version = "3.1.2";
+    version = "3.1.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-3.1.2.tgz";
-      sha1 = "991e30c80db4b1cf15eacb257620a7edce9c6ef4";
+      url = "https://registry.npmjs.org/emojione/-/emojione-3.1.4.tgz";
+      sha1 = "828767fbbe2ffd4fa75ebeeba9873e83643d6664";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -32933,11 +33111,11 @@ in
       (sources."ora-1.4.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."cli-cursor-2.1.0"
           sources."onetime-2.0.1"
           sources."restore-cursor-2.0.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."os-tmpdir-1.0.2"
@@ -32958,7 +33136,7 @@ in
       sources."progress-1.1.8"
       sources."promise-phantom-3.1.6"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.6"
@@ -32967,7 +33145,7 @@ in
       sources."request-2.85.0"
       sources."request-progress-2.0.1"
       sources."restore-cursor-1.0.1"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.5.0"
       sources."signal-exit-3.0.2"
       sources."sntp-2.1.0"
@@ -33094,7 +33272,7 @@ in
         ];
       })
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."glob-7.1.2"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
@@ -33144,7 +33322,7 @@ in
       sources."preserve-0.2.0"
       (sources."prettyjson-1.2.1" // {
         dependencies = [
-          sources."colors-1.2.1"
+          sources."colors-1.2.4"
           sources."minimist-1.2.0"
         ];
       })
@@ -33170,7 +33348,7 @@ in
       sources."resumer-0.0.0"
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."set-immediate-shim-1.0.1"
       sources."shush-1.0.0"
       sources."stack-trace-0.0.10"
@@ -33209,7 +33387,7 @@ in
     dependencies = [
       sources."async-2.6.0"
       sources."debug-3.1.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash.groupby-4.6.0"
       sources."microee-0.0.6"
       sources."minilog-3.1.0"
@@ -33395,7 +33573,7 @@ in
       sources."array-uniq-1.0.3"
       sources."array-unique-0.3.2"
       sources."assign-symbols-1.0.0"
-      sources."atob-2.1.0"
+      sources."atob-2.1.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -33618,11 +33796,11 @@ in
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
       sources."replace-ext-0.0.1"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."resolve-dir-1.0.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."semver-4.3.6"
       sources."sequencify-0.0.7"
@@ -33735,7 +33913,7 @@ in
       sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5";
     };
     dependencies = [
-      sources."eventemitter3-3.0.1"
+      sources."eventemitter3-3.1.0"
       sources."http-proxy-1.0.2"
       sources."lru-cache-2.5.2"
       sources."minimist-0.0.8"
@@ -33831,10 +34009,10 @@ in
   html-minifier = nodeEnv.buildNodePackage {
     name = "html-minifier";
     packageName = "html-minifier";
-    version = "3.5.14";
+    version = "3.5.15";
     src = fetchurl {
-      url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.14.tgz";
-      sha512 = "0ai1rga42v2z8mbnn2kv238fzi9p2nxzj7l2b4csgcg4wddmh697h1s4kmwipqqfd6ppi6xd26m2ynipkjm63sj48kjb0sh73mz165i";
+      url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.15.tgz";
+      sha512 = "01ni8s31nr1rb70wqi980nyfwir4z2z5mjvs454rgylns4nfyqvci581b40s1b67hgd95anq46j4yf5r947y5wzvncr7dgsysnvi5ir";
     };
     dependencies = [
       sources."camel-case-3.0.0"
@@ -33846,7 +34024,7 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.5.7"
-      (sources."uglify-js-3.3.20" // {
+      (sources."uglify-js-3.3.23" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -33879,7 +34057,9 @@ in
           sources."is-extglob-2.1.1"
           sources."is-glob-3.1.0"
           sources."mime-1.4.1"
+          sources."qs-6.5.1"
           sources."raw-body-1.1.7"
+          sources."safe-buffer-5.1.1"
           sources."setprototypeof-1.0.3"
           sources."statuses-1.4.0"
           sources."string_decoder-0.10.31"
@@ -33914,9 +34094,12 @@ in
           sources."kind-of-4.0.0"
         ];
       })
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-0.1.1"
       sources."buffer-crc32-0.2.13"
+      sources."buffer-fill-0.1.1"
       sources."bytes-3.0.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."chardet-0.4.2"
       sources."chokidar-1.7.0"
       sources."chownr-1.0.1"
@@ -33953,7 +34136,7 @@ in
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
-      sources."eventemitter3-1.2.0"
+      sources."eventemitter3-3.1.0"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
       (sources."express-4.16.3" // {
@@ -33969,24 +34152,30 @@ in
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.3"
       sources."finalhandler-1.1.1"
+      sources."follow-redirects-1.4.1"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."form-data-2.3.2"
       sources."formidable-1.2.1"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
+      sources."fs-constants-1.0.0"
       sources."fs-minipass-1.2.5"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."glob-7.1.2"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."graceful-fs-4.1.11"
       sources."has-flag-3.0.0"
       sources."http-errors-1.6.3"
-      sources."http-parser-js-0.4.11"
-      sources."http-proxy-1.16.2"
-      sources."http-proxy-middleware-0.17.4"
+      sources."http-parser-js-0.4.12"
+      sources."http-proxy-1.17.0"
+      (sources."http-proxy-middleware-0.17.4" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."iconv-lite-0.4.19"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -34012,7 +34201,7 @@ in
       sources."lazystream-1.0.0"
       sources."leek-0.0.24"
       sources."livereload-js-2.3.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash._baseassign-3.2.0"
       sources."lodash._basecopy-3.0.1"
       sources."lodash._bindcallback-3.0.1"
@@ -34062,7 +34251,7 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-2.0.3"
       sources."pseudomap-1.0.2"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       (sources."randomatic-1.1.7" // {
         dependencies = [
           (sources."is-number-3.0.0" // {
@@ -34092,7 +34281,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-json-parse-1.0.1"
       sources."sax-1.1.4"
       sources."semver-5.5.0"
@@ -34110,14 +34299,15 @@ in
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-4.0.0"
-      sources."superagent-3.8.2"
-      sources."supports-color-5.3.0"
-      (sources."tar-4.4.1" // {
+      sources."superagent-3.8.3"
+      sources."supports-color-5.4.0"
+      (sources."tar-4.4.2" // {
         dependencies = [
           sources."minimist-0.0.8"
+          sources."safe-buffer-5.1.2"
         ];
       })
-      sources."tar-stream-1.5.5"
+      sources."tar-stream-1.6.0"
       sources."through-2.3.8"
       (sources."tiny-lr-1.1.1" // {
         dependencies = [
@@ -34125,6 +34315,7 @@ in
         ];
       })
       sources."tmp-0.0.33"
+      sources."to-buffer-1.1.1"
       sources."tslib-1.9.0"
       sources."type-is-1.6.16"
       sources."ultron-1.1.1"
@@ -34279,7 +34470,7 @@ in
       sources."bufrw-1.2.1"
       sources."chai-4.1.2"
       sources."chai-as-promised-7.1.1"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."check-error-1.0.2"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
@@ -34302,7 +34493,7 @@ in
           sources."opentracing-0.13.0"
         ];
       })
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."long-2.4.0"
       sources."minimatch-3.0.4"
       sources."mz-2.7.0"
@@ -34313,11 +34504,11 @@ in
       sources."opentracing-0.14.3"
       sources."path-is-absolute-1.0.1"
       sources."pathval-1.1.0"
-      sources."rxjs-5.5.8"
+      sources."rxjs-5.5.10"
       sources."semaphore-async-await-1.5.1"
       sources."string-similarity-1.2.0"
       sources."string-template-0.2.1"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."symbol-observable-1.0.1"
       sources."thenify-3.3.0"
       sources."thenify-all-1.6.0"
@@ -34605,7 +34796,7 @@ in
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
       sources."js-yaml-3.11.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
       sources."mime-db-1.33.0"
@@ -34615,13 +34806,13 @@ in
       sources."path-loader-1.0.4"
       sources."process-nextick-args-2.0.0"
       sources."punycode-2.1.0"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."slash-1.0.0"
       sources."sprintf-js-1.0.3"
       sources."string_decoder-1.1.1"
-      sources."superagent-3.8.2"
+      sources."superagent-3.8.3"
       sources."uri-js-3.0.2"
       sources."util-deprecate-1.0.2"
     ];
@@ -34637,10 +34828,10 @@ in
   json-server = nodeEnv.buildNodePackage {
     name = "json-server";
     packageName = "json-server";
-    version = "0.12.1";
+    version = "0.12.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-server/-/json-server-0.12.1.tgz";
-      sha512 = "3isg3ph43vqfq6m6pg0d1iy7gj2gc6jgym0gp3ng7p9fv7bf1q43isf3wbc7bc9w5swsxqjc3v304ic8iinilwrkwxgks1alaxjs3si";
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.12.2.tgz";
+      sha512 = "3dqw05mkw5k42zdpjhg3cjiq7bfh8x1zxllrwyz0jgwmd4p79079fhsiifazqa5is659lzdnmiyiabxy62jjjk55xa296rdhyajc2vm";
     };
     dependencies = [
       sources."accepts-1.3.5"
@@ -34667,10 +34858,10 @@ in
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."caseless-0.12.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."ci-info-1.1.3"
       sources."cli-boxes-1.0.0"
-      sources."cliui-4.0.0"
+      sources."cliui-4.1.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.1"
@@ -34697,7 +34888,7 @@ in
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
@@ -34775,7 +34966,7 @@ in
       sources."latest-version-3.1.0"
       sources."lcid-1.0.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash-id-0.14.0"
       sources."lowdb-0.15.5"
       sources."lowercase-keys-1.0.1"
@@ -34814,7 +35005,7 @@ in
       sources."path-to-regexp-0.1.7"
       sources."performance-now-2.1.0"
       sources."pify-3.0.0"
-      sources."please-upgrade-node-3.0.1"
+      sources."please-upgrade-node-3.0.2"
       sources."pluralize-7.0.0"
       sources."prepend-http-1.0.4"
       sources."proxy-addr-2.0.3"
@@ -34828,7 +35019,7 @@ in
           sources."http-errors-1.6.2"
         ];
       })
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
       sources."request-2.85.0"
@@ -34836,6 +35027,7 @@ in
       sources."require-main-filename-1.0.1"
       sources."safe-buffer-5.1.1"
       sources."semver-5.5.0"
+      sources."semver-compare-1.0.0"
       sources."semver-diff-2.1.0"
       sources."send-0.16.2"
       sources."serve-static-1.13.2"
@@ -34854,7 +35046,7 @@ in
       sources."strip-ansi-4.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."term-size-1.2.0"
       sources."timed-out-4.0.1"
       sources."tough-cookie-2.3.4"
@@ -34864,7 +35056,7 @@ in
       sources."unique-string-1.0.0"
       sources."unpipe-1.0.0"
       sources."unzip-response-2.0.1"
-      sources."update-notifier-2.4.0"
+      sources."update-notifier-2.5.0"
       sources."url-parse-lax-1.0.0"
       sources."utils-merge-1.0.1"
       sources."uuid-3.2.1"
@@ -34925,16 +35117,13 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "2.0.0";
+    version = "2.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-2.0.0.tgz";
-      sha512 = "0iyj9ic6sj94x4xdd6wy8zgabqbl2ydrsp8h76lwrcx27ns8pzd7bg8yibsjgddzkisb9p1gp6bn46b8g5m2lh3yj5vqx55q2ks7lib";
+      url = "https://registry.npmjs.org/karma/-/karma-2.0.2.tgz";
+      sha1 = "4d2db9402850a66551fa784b0164fb0824ed8c4b";
     };
     dependencies = [
-      sources."JSONStream-1.3.2"
       sources."accepts-1.3.5"
-      sources."acorn-4.0.13"
-      sources."acorn-node-1.3.0"
       sources."addressparser-1.0.1"
       sources."after-0.8.2"
       sources."agent-base-2.1.1"
@@ -34949,18 +35138,12 @@ in
       sources."anymatch-1.3.2"
       sources."arr-diff-2.0.0"
       sources."arr-flatten-1.1.0"
-      sources."array-filter-0.0.1"
-      sources."array-map-0.0.0"
-      sources."array-reduce-0.0.0"
       sources."array-slice-0.2.3"
       sources."array-unique-0.2.1"
       sources."arraybuffer.slice-0.0.7"
       sources."asn1-0.2.3"
-      sources."asn1.js-4.10.1"
-      sources."assert-1.4.1"
       sources."assert-plus-1.0.0"
       sources."ast-types-0.11.3"
-      sources."astw-2.2.0"
       sources."async-2.1.5"
       sources."async-each-1.0.1"
       sources."async-limiter-1.0.0"
@@ -34976,7 +35159,6 @@ in
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
-      sources."base64-js-1.2.3"
       sources."base64id-1.0.0"
       sources."bcrypt-pbkdf-1.0.1"
       sources."better-assert-1.0.2"
@@ -34985,7 +35167,6 @@ in
       sources."bl-1.1.2"
       sources."blob-0.0.4"
       sources."bluebird-3.5.1"
-      sources."bn.js-4.11.8"
       (sources."body-parser-1.18.2" // {
         dependencies = [
           sources."setprototypeof-1.0.3"
@@ -34998,102 +35179,51 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."brorand-1.1.0"
-      sources."browser-pack-6.1.0"
-      (sources."browser-resolve-1.11.2" // {
-        dependencies = [
-          sources."resolve-1.1.7"
-        ];
-      })
-      (sources."browserify-14.5.0" // {
-        dependencies = [
-          sources."acorn-5.5.3"
-          sources."hash-base-2.0.2"
-          sources."isarray-2.0.4"
-          sources."process-nextick-args-2.0.0"
-          sources."source-map-0.5.7"
-        ];
-      })
-      sources."browserify-aes-1.2.0"
-      sources."browserify-cipher-1.0.0"
-      sources."browserify-des-1.0.0"
-      sources."browserify-rsa-4.0.1"
-      sources."browserify-sign-4.0.4"
-      sources."browserify-zlib-0.2.0"
-      sources."buffer-5.1.0"
-      sources."buffer-from-1.0.0"
       sources."buffer-more-ints-0.0.2"
-      sources."buffer-xor-1.0.3"
       sources."buildmail-4.0.1"
-      sources."builtin-status-codes-3.0.0"
       sources."bytes-3.0.0"
-      sources."cached-path-relative-1.0.1"
       sources."callsite-1.0.0"
       sources."caseless-0.12.0"
       sources."chalk-1.1.3"
       sources."chokidar-1.7.0"
-      sources."cipher-base-1.0.4"
-      sources."circular-json-0.5.1"
+      sources."circular-json-0.5.3"
       sources."co-4.6.0"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."combine-lists-1.0.1"
-      sources."combine-source-map-0.8.0"
       sources."combined-stream-1.0.6"
       sources."commander-2.15.1"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
       sources."concat-map-0.0.1"
-      (sources."concat-stream-1.5.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-          sources."string_decoder-0.10.31"
-        ];
-      })
       (sources."connect-3.6.6" // {
         dependencies = [
           sources."statuses-1.3.1"
         ];
       })
-      sources."console-browserify-1.1.0"
-      sources."constants-browserify-1.0.0"
       sources."content-type-1.0.4"
-      sources."convert-source-map-1.1.3"
       sources."cookie-0.3.1"
       sources."core-js-2.5.5"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.3"
-      sources."create-hmac-1.1.6"
       (sources."cryptiles-3.1.2" // {
         dependencies = [
           sources."boom-5.2.0"
         ];
       })
-      sources."crypto-browserify-3.12.0"
       sources."custom-event-1.0.1"
       sources."dashdash-1.14.1"
       sources."data-uri-to-buffer-1.2.0"
       sources."date-format-1.2.0"
-      sources."date-now-0.1.4"
       sources."debug-2.6.9"
       sources."deep-is-0.1.3"
-      sources."defined-1.0.0"
       sources."degenerator-1.0.4"
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
-      sources."deps-sort-2.0.0"
-      sources."des.js-1.0.0"
-      sources."detective-4.7.1"
       sources."di-0.0.1"
-      sources."diffie-hellman-5.0.2"
       sources."dom-serialize-2.2.1"
-      sources."domain-browser-1.1.7"
       sources."double-ended-queue-2.1.0-0"
-      sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.1"
       sources."ee-first-1.1.1"
-      sources."elliptic-6.4.0"
       sources."encodeurl-1.0.2"
       (sources."engine.io-3.1.5" // {
         dependencies = [
@@ -35113,9 +35243,7 @@ in
       sources."esprima-3.1.3"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
-      sources."eventemitter3-1.2.0"
-      sources."events-1.1.1"
-      sources."evp_bytestokey-1.0.3"
+      sources."eventemitter3-3.1.0"
       (sources."expand-braces-0.1.2" // {
         dependencies = [
           sources."braces-0.1.5"
@@ -35136,19 +35264,18 @@ in
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.3"
       sources."finalhandler-1.1.0"
-      sources."follow-redirects-1.0.0"
+      sources."follow-redirects-1.4.1"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       (sources."ftp-0.3.10" // {
         dependencies = [
           sources."readable-stream-1.1.14"
         ];
       })
-      sources."function-bind-1.1.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
       sources."get-uri-2.0.1"
@@ -35159,37 +35286,28 @@ in
       sources."graceful-fs-4.1.11"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."has-1.0.1"
       sources."has-ansi-2.0.0"
       sources."has-binary2-1.0.2"
       sources."has-cors-1.1.0"
-      sources."hash-base-3.0.4"
-      sources."hash.js-1.1.3"
       sources."hawk-6.0.2"
       sources."hipchat-notifier-1.1.0"
-      sources."hmac-drbg-1.0.1"
       sources."hoek-4.2.1"
-      sources."htmlescape-1.1.1"
       sources."http-errors-1.6.3"
-      sources."http-proxy-1.16.2"
+      (sources."http-proxy-1.17.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."http-proxy-agent-1.0.0"
       sources."http-signature-1.2.0"
       sources."httpntlm-1.6.1"
       sources."httpreq-0.4.24"
-      sources."https-browserify-1.0.0"
       sources."https-proxy-agent-1.0.0"
       sources."iconv-lite-0.4.19"
-      sources."ieee754-1.1.11"
       sources."indexof-0.0.1"
       sources."inflection-1.10.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."inline-source-map-0.6.2"
-      (sources."insert-module-globals-7.0.6" // {
-        dependencies = [
-          sources."concat-stream-1.6.2"
-        ];
-      })
       sources."ip-1.0.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
@@ -35213,21 +35331,15 @@ in
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-0.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonify-0.0.0"
-      sources."jsonparse-1.3.1"
       sources."jsonpointer-4.0.1"
       sources."jsprim-1.4.1"
       sources."kind-of-3.2.2"
-      sources."labeled-stream-splicer-2.0.1"
       sources."levn-0.3.0"
-      sources."lexical-scope-1.2.0"
       sources."libbase64-0.1.0"
       sources."libmime-3.0.0"
       sources."libqp-1.1.0"
-      sources."lodash-4.17.5"
-      sources."lodash.memoize-3.0.4"
+      sources."lodash-4.17.10"
       (sources."log4js-2.5.3" // {
         dependencies = [
           sources."assert-plus-0.2.0"
@@ -35237,6 +35349,7 @@ in
           sources."co-3.0.6"
           sources."cryptiles-2.0.5"
           sources."debug-3.1.0"
+          sources."follow-redirects-1.0.0"
           sources."form-data-2.0.0"
           sources."har-validator-2.0.6"
           sources."hawk-3.1.3"
@@ -35245,8 +35358,8 @@ in
           sources."iconv-lite-0.4.15"
           sources."ip-1.1.5"
           sources."isarray-0.0.1"
-          sources."minimist-0.0.8"
           sources."ms-0.7.1"
+          sources."process-nextick-args-1.0.7"
           sources."qs-6.2.3"
           sources."readable-stream-2.0.6"
           sources."request-2.75.0"
@@ -35266,19 +35379,14 @@ in
           sources."semver-5.0.3"
         ];
       })
-      sources."md5.js-1.3.4"
       sources."media-typer-0.3.0"
       sources."micromatch-2.3.11"
-      sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
-      sources."minimalistic-assert-1.0.0"
-      sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."module-deps-4.1.1"
       sources."ms-2.0.0"
       sources."nan-2.10.0"
       sources."negotiator-0.6.1"
@@ -35299,48 +35407,34 @@ in
       sources."once-1.4.0"
       (sources."optimist-0.6.1" // {
         dependencies = [
-          sources."minimist-0.0.10"
           sources."wordwrap-0.0.3"
         ];
       })
       sources."optionator-0.8.2"
-      sources."os-browserify-0.3.0"
       sources."os-tmpdir-1.0.2"
       sources."pac-proxy-agent-1.1.0"
       sources."pac-resolver-2.0.0"
-      sources."pako-1.0.6"
-      sources."parents-1.0.1"
-      sources."parse-asn1-5.1.0"
       sources."parse-glob-3.0.4"
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
       sources."parseurl-1.3.2"
-      sources."path-browserify-0.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-parse-1.0.5"
-      sources."path-platform-0.11.15"
       (sources."path-proxy-1.0.0" // {
         dependencies = [
           sources."inflection-1.3.8"
         ];
       })
-      sources."pbkdf2-3.0.14"
       sources."performance-now-2.1.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."prelude-ls-1.1.2"
       sources."preserve-0.2.0"
-      sources."process-0.11.10"
-      sources."process-nextick-args-1.0.7"
+      sources."process-nextick-args-2.0.0"
       sources."proxy-agent-2.0.0"
-      sources."pseudomap-1.0.2"
-      sources."public-encrypt-4.0.0"
       sources."punycode-1.4.1"
       sources."q-1.4.1"
       sources."qjobs-1.2.0"
       sources."qs-6.5.1"
-      sources."querystring-0.2.0"
-      sources."querystring-es3-0.2.1"
       (sources."randomatic-1.1.7" // {
         dependencies = [
           (sources."is-number-3.0.0" // {
@@ -35350,8 +35444,6 @@ in
           })
         ];
       })
-      sources."randombytes-2.0.6"
-      sources."randomfill-1.0.4"
       sources."range-parser-1.2.0"
       (sources."raw-body-2.3.2" // {
         dependencies = [
@@ -35359,13 +35451,7 @@ in
           sources."http-errors-1.6.2"
         ];
       })
-      sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.3.6" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
       sources."redis-2.8.0"
       sources."redis-commands-1.3.5"
@@ -35377,16 +35463,11 @@ in
       sources."request-2.85.0"
       sources."requestretry-1.13.0"
       sources."requires-port-1.0.0"
-      sources."resolve-1.7.0"
       sources."rimraf-2.6.2"
-      sources."ripemd160-2.0.1"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.5.0"
       sources."set-immediate-shim-1.0.1"
       sources."setprototypeof-1.1.0"
-      sources."sha.js-2.4.11"
-      sources."shasum-1.0.2"
-      sources."shell-quote-1.6.1"
       sources."slack-node-0.2.0"
       sources."smart-buffer-1.1.15"
       sources."smtp-connection-2.12.0"
@@ -35408,50 +35489,27 @@ in
       sources."source-map-0.6.1"
       sources."sshpk-1.14.1"
       sources."statuses-1.5.0"
-      sources."stream-browserify-2.0.1"
-      sources."stream-combiner2-1.1.1"
-      sources."stream-http-2.8.1"
-      sources."stream-splicer-2.0.0"
       sources."streamroller-0.7.0"
-      sources."string_decoder-1.0.3"
+      sources."string_decoder-1.1.1"
       sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
-      sources."subarg-1.0.0"
       sources."supports-color-2.0.0"
-      sources."syntax-error-1.4.0"
-      sources."through-2.3.8"
-      sources."through2-2.0.3"
       sources."thunkify-2.1.2"
-      sources."timers-browserify-1.4.2"
       sources."timespan-2.3.0"
       sources."tmp-0.0.33"
       sources."to-array-0.1.4"
-      sources."to-arraybuffer-1.0.1"
       sources."tough-cookie-2.3.4"
       sources."tsscmp-1.0.5"
-      sources."tty-browserify-0.0.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."type-is-1.6.16"
-      sources."typedarray-0.0.6"
       sources."ultron-1.1.1"
-      sources."umd-3.0.3"
       sources."underscore-1.7.0"
       sources."unpipe-1.0.0"
-      (sources."url-0.11.0" // {
+      (sources."useragent-2.2.1" // {
         dependencies = [
-          sources."punycode-1.3.2"
-        ];
-      })
-      (sources."useragent-2.3.0" // {
-        dependencies = [
-          sources."lru-cache-4.1.2"
-        ];
-      })
-      (sources."util-0.10.3" // {
-        dependencies = [
-          sources."inherits-2.0.1"
+          sources."lru-cache-2.2.4"
         ];
       })
       sources."util-deprecate-1.0.2"
@@ -35459,7 +35517,6 @@ in
       sources."uuid-3.2.1"
       sources."uws-9.14.0"
       sources."verror-1.10.0"
-      sources."vm-browserify-0.0.4"
       sources."void-elements-2.0.1"
       sources."when-3.7.8"
       sources."wordwrap-1.0.0"
@@ -35468,7 +35525,6 @@ in
       sources."xmlhttprequest-ssl-1.5.5"
       sources."xregexp-2.0.0"
       sources."xtend-4.0.1"
-      sources."yallist-2.1.2"
       sources."yeast-0.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -35644,10 +35700,10 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "2.10.1";
+    version = "2.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-2.10.1.tgz";
-      sha512 = "1y2pnipc1wsra1gdj77c4217xcycdwycda28drnh7sf43hcw4ang1x859i95m084v9ahcjysdb7ap2c3zk6ivm0q3way48k1xxnci57";
+      url = "https://registry.npmjs.org/lerna/-/lerna-2.11.0.tgz";
+      sha512 = "22hg2kpml4wkbgp15nzbhcs81kdaynq0prspzmbfrr5hpbga1cz8vl2adc4dry1lcxs36s2w5pbsvrdic4bw623vx8nngxn0z7kl0wj";
     };
     dependencies = [
       sources."JSONStream-1.3.2"
@@ -35674,7 +35730,7 @@ in
       sources."camelcase-keys-2.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."center-align-0.1.3"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."chardet-0.4.2"
       sources."ci-info-1.1.3"
       sources."cli-cursor-2.1.0"
@@ -35691,7 +35747,7 @@ in
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       sources."console-control-strings-1.1.0"
-      (sources."conventional-changelog-1.1.23" // {
+      (sources."conventional-changelog-1.1.24" // {
         dependencies = [
           sources."camelcase-4.1.0"
           sources."map-obj-1.0.1"
@@ -35700,7 +35756,7 @@ in
       })
       sources."conventional-changelog-angular-1.6.6"
       sources."conventional-changelog-atom-0.2.8"
-      (sources."conventional-changelog-cli-1.3.21" // {
+      (sources."conventional-changelog-cli-1.3.22" // {
         dependencies = [
           sources."camelcase-2.1.1"
           sources."camelcase-keys-4.2.0"
@@ -35724,12 +35780,12 @@ in
         ];
       })
       sources."conventional-changelog-codemirror-0.3.8"
-      (sources."conventional-changelog-core-2.0.10" // {
+      (sources."conventional-changelog-core-2.0.11" // {
         dependencies = [
-          sources."meow-4.0.0"
+          sources."meow-4.0.1"
         ];
       })
-      sources."conventional-changelog-ember-0.3.11"
+      sources."conventional-changelog-ember-0.3.12"
       sources."conventional-changelog-eslint-1.0.9"
       sources."conventional-changelog-express-0.3.6"
       sources."conventional-changelog-jquery-0.1.0"
@@ -35754,7 +35810,7 @@ in
       sources."decamelize-1.2.0"
       sources."decamelize-keys-1.1.0"
       sources."dedent-0.7.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."defaults-1.0.3"
       sources."delegates-1.0.0"
       sources."detect-indent-5.0.0"
@@ -35843,7 +35899,7 @@ in
         ];
       })
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash._reinterpolate-3.0.0"
       sources."lodash.template-4.4.0"
       sources."lodash.templatesettings-4.1.0"
@@ -35854,7 +35910,7 @@ in
       sources."make-dir-1.2.0"
       sources."map-obj-1.0.1"
       sources."mem-1.1.0"
-      (sources."meow-4.0.0" // {
+      (sources."meow-4.0.1" // {
         dependencies = [
           sources."find-up-2.1.0"
           sources."load-json-file-4.0.0"
@@ -35870,7 +35926,7 @@ in
       sources."minimist-options-3.0.2"
       sources."mkdirp-0.5.1"
       sources."modify-values-1.0.1"
-      sources."moment-2.22.0"
+      sources."moment-2.22.1"
       sources."mute-stream-0.0.7"
       sources."normalize-package-data-2.4.0"
       sources."npm-run-path-2.0.2"
@@ -35911,7 +35967,7 @@ in
       sources."pseudomap-1.0.2"
       sources."q-1.5.1"
       sources."quick-lru-1.1.0"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-pkg-3.0.0"
       sources."read-pkg-up-1.0.1"
@@ -35929,7 +35985,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
@@ -35957,7 +36013,7 @@ in
           sources."minimist-0.1.0"
         ];
       })
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."temp-dir-1.0.0"
       (sources."temp-write-3.4.0" // {
         dependencies = [
@@ -36031,74 +36087,71 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "3.0.1";
+    version = "3.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-3.0.1.tgz";
-      sha512 = "25qmszxk5bzrjgyy1m0k87zc1c5h19ckvnlkhl9j3ncm3zfx7rzmydj6f4sw5c7ldc4npzs41fmgd1hw113kilrk8sggwzwvfw7hi59";
+      url = "https://registry.npmjs.org/less/-/less-3.0.2.tgz";
+      sha512 = "1hs3nj50rw6qlk3hjkd6ynhdv7mdlawwl4jzl3d43kbijkych51dm15ccb1ra7i9pmaq13nm24rkzf3bxv3fcpcrqq499cp0lbyg2cj";
     };
     dependencies = [
-      sources."ajv-4.11.8"
+      sources."ajv-5.5.2"
       sources."asap-2.0.6"
       sources."asn1-0.2.3"
-      sources."assert-plus-0.2.0"
+      sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.6.0"
+      sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."boom-2.10.1"
+      sources."boom-4.3.1"
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."combined-stream-1.0.6"
       sources."core-util-is-1.0.2"
-      sources."cryptiles-2.0.5"
+      (sources."cryptiles-3.1.2" // {
+        dependencies = [
+          sources."boom-5.2.0"
+        ];
+      })
       sources."dashdash-1.14.1"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.1"
       sources."errno-0.1.7"
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
+      sources."form-data-2.3.2"
       sources."getpass-0.1.7"
       sources."graceful-fs-4.1.11"
-      sources."har-schema-1.0.5"
-      sources."har-validator-4.2.1"
-      sources."hawk-3.1.3"
-      sources."hoek-2.16.3"
-      sources."http-signature-1.1.1"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."hawk-6.0.2"
+      sources."hoek-4.2.1"
+      sources."http-signature-1.2.0"
       sources."image-size-0.5.5"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
-      sources."json-stable-stringify-1.0.1"
+      sources."json-schema-traverse-0.3.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonify-0.0.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."jsprim-1.4.1"
       sources."mime-1.6.0"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
+      sources."performance-now-2.1.0"
       sources."promise-7.3.1"
       sources."prr-1.0.1"
       sources."punycode-1.4.1"
-      sources."qs-6.4.0"
-      sources."request-2.81.0"
-      sources."safe-buffer-5.1.1"
-      sources."sntp-1.0.9"
+      sources."qs-6.5.2"
+      sources."request-2.85.0"
+      sources."safe-buffer-5.1.2"
+      sources."sntp-2.1.0"
       sources."source-map-0.5.7"
-      (sources."sshpk-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."sshpk-1.14.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
@@ -36164,7 +36217,7 @@ in
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.5.1"
       sources."core-util-is-1.0.2"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."end-of-stream-1.4.1"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
@@ -36242,7 +36295,7 @@ in
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."stream-shift-1.0.0"
       sources."string_decoder-1.1.1"
       sources."strip-bom-2.0.0"
@@ -36363,6 +36416,7 @@ in
       sources."expand-range-1.8.2"
       (sources."express-4.16.3" // {
         dependencies = [
+          sources."safe-buffer-5.1.1"
           sources."statuses-1.4.0"
         ];
       })
@@ -36380,7 +36434,7 @@ in
       sources."form-data-2.3.2"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."getpass-0.1.7"
       sources."github-slugger-1.2.0"
       sources."glob-base-0.3.0"
@@ -36480,7 +36534,7 @@ in
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
       sources."request-2.85.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."send-0.16.2"
       sources."serve-static-1.13.2"
       sources."set-immediate-shim-1.0.1"
@@ -36555,7 +36609,7 @@ in
         ];
       })
       sources."chokidar-1.7.0"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."concat-map-0.0.1"
       sources."connect-3.5.1"
       sources."core-util-is-1.0.2"
@@ -36580,13 +36634,13 @@ in
       sources."for-own-0.1.5"
       sources."fresh-0.5.2"
       sources."from-0.1.7"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."graceful-fs-4.1.11"
       sources."http-auth-3.1.3"
       sources."http-errors-1.6.3"
-      sources."http-parser-js-0.4.11"
+      sources."http-parser-js-0.4.12"
       sources."inherits-2.0.3"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
@@ -36612,6 +36666,7 @@ in
         dependencies = [
           sources."debug-2.6.9"
           sources."ms-2.0.0"
+          sources."safe-buffer-5.1.1"
         ];
       })
       sources."ms-0.7.1"
@@ -36646,7 +36701,7 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       (sources."send-0.16.2" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -36724,10 +36779,10 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "5.0.5";
+    version = "5.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz";
-      sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw";
+      url = "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz";
+      sha512 = "23wcnn35p90xhsc5z94w45s30j756s97acm313h6lacnbliqlaka3drq2xbsi4br8gdkld3r4dc33vglq8kf5jb408c7b2agpyar8lh";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
@@ -36790,7 +36845,7 @@ in
       sources."isarray-1.0.0"
       sources."js-yaml-3.11.0"
       sources."json-refs-2.1.7"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
       sources."mime-db-1.33.0"
@@ -36800,13 +36855,13 @@ in
       sources."path-loader-1.0.4"
       sources."process-nextick-args-2.0.0"
       sources."punycode-2.1.0"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."slash-1.0.0"
       sources."sprintf-js-1.0.3"
       sources."string_decoder-1.1.1"
-      sources."superagent-3.8.2"
+      sources."superagent-3.8.3"
       sources."uri-js-3.0.2"
       sources."util-deprecate-1.0.2"
     ];
@@ -36928,7 +36983,7 @@ in
       sources."nijs-0.0.25"
       sources."nopt-3.0.6"
       sources."normalize-package-data-2.4.0"
-      sources."npm-package-arg-6.0.0"
+      sources."npm-package-arg-6.1.0"
       sources."npm-registry-client-8.5.1"
       (sources."npmconf-2.1.2" // {
         dependencies = [
@@ -36949,12 +37004,12 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proto-list-1.2.4"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
       sources."request-2.85.0"
       sources."retry-0.10.1"
       sources."rimraf-2.2.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
@@ -37085,11 +37140,11 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.0"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
       sources."request-2.85.0"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.3.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
@@ -37168,7 +37223,7 @@ in
           sources."yargs-1.3.3"
         ];
       })
-      sources."big-integer-1.6.27"
+      sources."big-integer-1.6.28"
       sources."block-stream-0.0.9"
       (sources."body-parser-1.18.2" // {
         dependencies = [
@@ -37204,7 +37259,7 @@ in
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."default-browser-id-1.0.4"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
@@ -37327,7 +37382,7 @@ in
           sources."http-errors-1.6.2"
         ];
       })
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.6"
@@ -37419,10 +37474,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.9.0";
+    version = "0.10.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz";
-      sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz";
+      sha512 = "10s7f95mxnxcwziwzx44l62zy3yjmhky942pw134dbd48wshl7abr1ja8qx1rfzz9vgygcx1vlz1jlldy61da33zq0bfi8bfji09f8v";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -37437,7 +37492,7 @@ in
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
       sources."debug-2.6.9"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
       sources."fs-minipass-1.2.5"
@@ -37458,7 +37513,7 @@ in
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
-      sources."needle-2.2.0"
+      sources."needle-2.2.1"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.0.3"
       sources."npm-packlist-1.1.10"
@@ -37471,14 +37526,14 @@ in
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.0"
-      (sources."rc-1.2.6" // {
+      (sources."rc-1.2.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."readable-stream-2.3.6"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."semver-5.5.0"
@@ -37488,7 +37543,7 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-4.4.1"
+      sources."tar-4.4.2"
       sources."util-deprecate-1.0.2"
       sources."wide-align-1.1.2"
       sources."wrappy-1.0.2"
@@ -37506,10 +37561,10 @@ in
   nodemon = nodeEnv.buildNodePackage {
     name = "nodemon";
     packageName = "nodemon";
-    version = "1.17.3";
+    version = "1.17.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz";
-      sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.4.tgz";
+      sha512 = "3bmxd7fd494gy4ddax3mihjz1iy484iakyssbhy87cc2kwbky9xkb8l47vphc3n858q9p9afxl57w0849i24amsdjhwbqh8vxhjy1v5";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -37530,7 +37585,7 @@ in
       sources."array-unique-0.3.2"
       sources."assign-symbols-1.0.0"
       sources."async-each-1.0.1"
-      sources."atob-2.1.0"
+      sources."atob-2.1.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -37555,7 +37610,7 @@ in
       sources."cache-base-1.0.1"
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       (sources."chokidar-2.0.3" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -37602,7 +37657,7 @@ in
       sources."crypto-random-string-1.0.0"
       sources."debug-3.1.0"
       sources."decode-uri-component-0.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."define-property-2.0.2"
       sources."dot-prop-4.2.0"
       sources."duplexer-0.1.1"
@@ -37627,7 +37682,7 @@ in
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."from-0.1.7"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
       (sources."glob-parent-3.1.0" // {
@@ -37721,7 +37776,7 @@ in
       sources."ps-tree-1.1.0"
       sources."pseudomap-1.0.2"
       sources."pstree.remy-1.1.0"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
       sources."regex-not-1.0.2"
@@ -37732,7 +37787,7 @@ in
       sources."repeat-string-1.6.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
@@ -37771,7 +37826,7 @@ in
       sources."strip-ansi-4.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."term-size-1.2.0"
       sources."through-2.3.8"
       sources."timed-out-4.0.1"
@@ -37800,8 +37855,8 @@ in
         ];
       })
       sources."unzip-response-2.0.1"
-      sources."upath-1.0.4"
-      sources."update-notifier-2.4.0"
+      sources."upath-1.0.5"
+      sources."update-notifier-2.5.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
       (sources."use-3.1.0" // {
@@ -37902,7 +37957,7 @@ in
       sources."css-what-2.1.0"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
@@ -37912,7 +37967,7 @@ in
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.1"
       sources."domutils-1.5.1"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."ecc-jsbn-0.1.1"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
@@ -38043,8 +38098,8 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.0"
-      sources."moment-timezone-0.5.14"
+      sources."moment-2.22.1"
+      sources."moment-timezone-0.5.16"
       (sources."mqtt-2.15.1" // {
         dependencies = [
           sources."ws-3.3.3"
@@ -38067,7 +38122,7 @@ in
       sources."needle-0.11.0"
       sources."negotiator-0.6.1"
       sources."node-pre-gyp-0.6.36"
-      (sources."node-red-node-email-0.1.27" // {
+      (sources."node-red-node-email-0.1.29" // {
         dependencies = [
           sources."addressparser-1.0.1"
           sources."clone-1.0.4"
@@ -38121,7 +38176,7 @@ in
       sources."proxy-addr-2.0.3"
       sources."pseudomap-1.0.2"
       sources."pump-2.0.1"
-      sources."pumpify-1.4.0"
+      sources."pumpify-1.5.0"
       sources."punycode-1.4.1"
       sources."qs-6.5.1"
       sources."random-bytes-1.0.0"
@@ -38133,7 +38188,7 @@ in
           sources."setprototypeof-1.0.3"
         ];
       })
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
       sources."reinterval-1.1.0"
       sources."remove-trailing-separator-1.1.0"
@@ -38293,7 +38348,7 @@ in
       sources."natives-1.1.3"
       (sources."net-ping-1.1.7" // {
         dependencies = [
-          sources."nan-2.3.5"
+          sources."nan-2.10.0"
         ];
       })
       sources."nodemailer-0.3.35"
@@ -38308,7 +38363,7 @@ in
       sources."qs-0.5.1"
       sources."rai-0.1.12"
       sources."range-parser-0.0.4"
-      sources."raw-socket-1.5.2"
+      sources."raw-socket-1.6.0"
       sources."redis-0.7.3"
       sources."semver-1.1.0"
       sources."send-0.1.0"
@@ -38344,10 +38399,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.8.0";
+    version = "6.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz";
-      sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f";
+      url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz";
+      sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -38486,12 +38541,12 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proto-list-1.2.4"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
       sources."request-2.85.0"
       sources."retry-0.6.0"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-4.3.6"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
@@ -38538,153 +38593,74 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.14.1";
+    version = "2.14.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.1.tgz";
-      sha512 = "1ciz9n8wmwq3lpi3g6xmjr4plqf3ydpqznrcci5bbrq7d9clkmkcg3gzbaqwkgrjgmvahby0akylk66zq8n8zm5mqn0vj0jsrxhryf4";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.2.tgz";
+      sha512 = "20p92czrssb8mfn5lmaswrzv0wy5va0r7xlmh5f6sd7zj46iydqkhfmfy9lv3d6zf7x42zdbkdrj4mk420gzlmgb3wgd608cafcnalk";
     };
     dependencies = [
-      sources."abbrev-1.1.1"
-      sources."align-text-0.1.4"
       sources."ansi-align-2.0.0"
-      sources."ansi-escapes-1.4.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
-      sources."ansicolors-0.3.2"
-      sources."archy-1.0.0"
       sources."argparse-1.0.10"
-      sources."asap-2.0.6"
-      sources."async-1.5.2"
-      sources."balanced-match-1.0.0"
-      sources."base64-js-0.0.2"
       sources."bluebird-3.5.1"
-      sources."bops-0.1.1"
-      sources."boxen-0.3.1"
-      sources."brace-expansion-1.1.11"
-      sources."builtin-modules-1.1.1"
-      sources."camelcase-1.2.1"
+      sources."boxen-1.3.0"
+      sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
-      sources."center-align-0.1.3"
       sources."chalk-1.1.3"
       sources."ci-info-1.1.3"
       sources."cint-8.2.1"
       sources."cli-boxes-1.0.0"
-      sources."cli-cursor-1.0.2"
       sources."cli-table-0.3.1"
-      sources."cli-width-2.2.0"
-      sources."clite-0.3.0"
-      sources."cliui-2.1.0"
-      sources."clone-deep-0.3.0"
-      sources."code-point-at-1.1.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
       sources."colors-1.0.3"
       sources."commander-2.15.1"
-      sources."concat-map-0.0.1"
-      (sources."configstore-1.4.0" // {
-        dependencies = [
-          sources."uuid-2.0.3"
-        ];
-      })
-      sources."core-util-is-1.0.2"
+      sources."configstore-3.1.2"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."debug-2.6.9"
-      sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
-      sources."dot-prop-3.0.0"
-      sources."duplexer2-0.1.4"
+      sources."deep-extend-0.5.1"
+      sources."dot-prop-4.2.0"
       sources."duplexer3-0.1.4"
-      sources."duplexify-3.5.4"
-      sources."email-validator-1.1.1"
-      sources."end-of-stream-1.4.1"
-      sources."error-ex-1.3.1"
-      sources."es6-promise-3.3.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.0"
       sources."execa-0.7.0"
-      sources."exit-hook-1.1.1"
       sources."fast-diff-1.1.2"
-      sources."figures-1.7.0"
-      sources."filled-array-1.1.0"
       sources."find-up-1.1.2"
-      sources."for-in-1.0.2"
-      sources."for-own-1.0.0"
-      sources."get-caller-file-1.0.2"
       sources."get-stdin-5.0.1"
       sources."get-stream-3.0.0"
       sources."global-dirs-0.1.1"
-      sources."got-5.7.1"
+      sources."got-6.7.1"
       sources."graceful-fs-4.1.11"
-      sources."graphlib-2.1.5"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."hasbin-1.2.3"
-      sources."hosted-git-info-2.6.0"
-      sources."iconv-lite-0.4.21"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
-      sources."infinity-agent-2.0.3"
-      sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."inquirer-1.0.3"
-      sources."invert-kv-1.0.0"
-      sources."is-arrayish-0.2.1"
-      sources."is-buffer-1.1.6"
-      sources."is-builtin-module-1.0.0"
       sources."is-ci-1.1.0"
-      sources."is-extendable-0.1.1"
-      sources."is-finite-1.0.2"
-      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
       sources."is-obj-1.0.1"
       sources."is-path-inside-1.0.1"
-      sources."is-plain-object-2.0.4"
-      sources."is-promise-2.1.0"
       sources."is-redirect-1.0.0"
       sources."is-retry-allowed-1.1.0"
       sources."is-stream-1.1.0"
-      sources."is-utf8-0.2.1"
-      sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."isobject-3.0.1"
       sources."jju-1.3.0"
       sources."js-yaml-3.11.0"
       sources."json-parse-helpfulerror-1.0.3"
       sources."json5-0.5.1"
-      sources."kind-of-3.2.2"
-      sources."latest-version-2.0.0"
-      sources."lazy-cache-1.0.4"
-      sources."lcid-1.0.0"
-      sources."load-json-file-1.1.0"
-      sources."lodash-4.17.5"
-      sources."lodash.assign-4.2.0"
-      sources."lodash.clonedeep-4.5.0"
-      sources."lodash.defaults-4.2.0"
-      sources."lodash.defaultsdeep-4.6.0"
-      sources."lodash.mergewith-4.6.1"
-      sources."longest-1.0.1"
+      sources."latest-version-3.1.0"
+      sources."lodash-4.17.10"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.2"
       sources."make-dir-1.2.0"
-      sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mixin-object-2.0.1"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.0"
       sources."ms-2.0.0"
-      sources."mute-stream-0.0.6"
-      sources."nconf-0.7.2"
-      (sources."needle-2.2.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."nested-error-stacks-1.0.2"
       sources."node-alias-1.0.4"
-      sources."node-status-codes-1.0.0"
-      sources."normalize-package-data-2.4.0"
       sources."npm-3.10.10"
       sources."npm-run-path-2.0.2"
       (sources."npmi-2.0.1" // {
@@ -38692,214 +38668,56 @@ in
           sources."semver-4.3.6"
         ];
       })
-      sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
       sources."object-keys-1.0.11"
-      sources."once-1.4.0"
-      sources."onetime-1.1.0"
-      sources."open-0.0.5"
-      sources."os-homedir-1.0.2"
-      sources."os-locale-1.4.0"
-      sources."os-name-1.0.3"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      sources."osx-release-1.1.0"
       sources."p-finally-1.0.0"
-      sources."package-json-2.4.0"
-      sources."parse-json-2.2.0"
+      sources."package-json-4.0.1"
       sources."path-exists-2.1.0"
-      sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
-      sources."path-type-1.1.0"
-      sources."pify-2.3.0"
+      sources."pify-3.0.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."prepend-http-1.0.4"
-      sources."process-nextick-args-2.0.0"
-      sources."promise-7.3.1"
-      sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
-      sources."punycode-1.3.2"
-      sources."querystring-0.2.0"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."rc-config-loader-2.0.1"
-      sources."read-all-stream-3.1.0"
-      sources."read-pkg-1.1.0"
-      sources."read-pkg-up-1.0.1"
-      sources."readable-stream-2.3.6"
-      sources."recursive-readdir-2.2.2"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
-      sources."repeat-string-1.6.1"
-      sources."repeating-2.0.1"
-      sources."require-directory-2.1.1"
       sources."require-from-string-2.0.2"
-      sources."require-main-filename-1.0.1"
-      sources."restore-cursor-1.0.1"
-      sources."right-align-0.1.3"
-      sources."run-async-2.3.0"
-      sources."rx-4.1.0"
-      sources."safe-buffer-5.1.1"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.2.4"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
       sources."semver-utils-1.1.2"
-      sources."set-blocking-2.0.0"
-      (sources."shallow-clone-0.1.2" // {
-        dependencies = [
-          sources."kind-of-2.0.1"
-        ];
-      })
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."slide-1.1.6"
-      (sources."snyk-1.71.0" // {
-        dependencies = [
-          sources."async-0.9.2"
-          sources."camelcase-3.0.0"
-          sources."cliui-3.2.0"
-          sources."debug-3.1.0"
-          sources."for-in-0.1.8"
-          sources."got-3.3.1"
-          sources."latest-version-1.0.1"
-          sources."lazy-cache-0.2.7"
-          sources."minimist-1.2.0"
-          sources."object-assign-3.0.0"
-          sources."package-json-1.2.0"
-          sources."repeating-1.1.3"
-          sources."timed-out-2.0.0"
-          sources."update-notifier-0.5.0"
-          sources."window-size-0.2.0"
-          sources."yargs-4.8.1"
-        ];
-      })
-      (sources."snyk-config-1.0.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-go-plugin-1.4.6"
-      sources."snyk-gradle-plugin-1.2.0"
-      (sources."snyk-module-1.8.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-mvn-plugin-1.1.1"
-      (sources."snyk-nuget-plugin-1.3.9" // {
-        dependencies = [
-          sources."es6-promise-4.2.4"
-        ];
-      })
-      sources."snyk-php-plugin-1.3.2"
-      (sources."snyk-policy-1.10.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-python-plugin-1.5.7"
-      (sources."snyk-resolve-1.0.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      (sources."snyk-resolve-deps-1.7.0" // {
-        dependencies = [
-          sources."configstore-2.1.0"
-          sources."debug-2.6.9"
-          sources."update-notifier-0.6.3"
-          sources."uuid-2.0.3"
-        ];
-      })
-      (sources."snyk-sbt-plugin-1.2.5" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-tree-1.0.0"
-      (sources."snyk-try-require-1.2.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
       sources."spawn-please-0.3.0"
-      sources."spdx-correct-3.0.0"
-      sources."spdx-exceptions-2.1.0"
-      sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
       sources."sprintf-js-1.0.3"
-      sources."stream-shift-1.0.0"
-      sources."string-length-1.0.1"
-      sources."string-width-1.0.2"
-      sources."string_decoder-1.1.1"
+      sources."string-width-2.1.1"
       sources."strip-ansi-3.0.1"
-      sources."strip-bom-2.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
-      (sources."tempfile-1.1.1" // {
-        dependencies = [
-          sources."uuid-2.0.3"
-        ];
-      })
       sources."term-size-1.2.0"
-      sources."then-fs-2.0.0"
-      sources."through-2.3.8"
-      sources."timed-out-3.1.3"
-      sources."to-utf8-0.0.1"
-      sources."toml-2.3.3"
-      sources."undefsafe-0.0.3"
+      sources."timed-out-4.0.1"
       sources."unique-string-1.0.0"
-      sources."unzip-response-1.0.2"
-      (sources."update-notifier-2.4.0" // {
+      sources."unzip-response-2.0.1"
+      (sources."update-notifier-2.5.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
-          sources."boxen-1.3.0"
-          sources."camelcase-4.1.0"
-          sources."chalk-2.3.2"
-          sources."configstore-3.1.2"
-          sources."dot-prop-4.2.0"
-          sources."got-6.7.1"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."latest-version-3.1.0"
-          sources."package-json-4.0.1"
-          sources."pify-3.0.0"
-          sources."string-width-2.1.1"
+          sources."chalk-2.4.1"
           sources."strip-ansi-4.0.0"
-          sources."supports-color-5.3.0"
-          sources."timed-out-4.0.1"
-          sources."unzip-response-2.0.1"
-          sources."widest-line-2.0.0"
-          sources."write-file-atomic-2.3.0"
-          sources."xdg-basedir-3.0.0"
+          sources."supports-color-5.4.0"
         ];
       })
-      sources."url-0.11.0"
       sources."url-parse-lax-1.0.0"
-      sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
-      sources."validate-npm-package-license-3.0.3"
       sources."which-1.3.0"
-      sources."which-module-1.0.0"
-      sources."widest-line-1.0.0"
-      sources."win-release-1.1.1"
-      sources."window-size-0.1.4"
-      sources."wordwrap-0.0.2"
-      sources."wrap-ansi-2.1.0"
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.3.4"
-      sources."xdg-basedir-2.0.0"
-      sources."xml2js-0.4.19"
-      sources."xmlbuilder-9.0.7"
-      sources."y18n-3.2.1"
+      sources."widest-line-2.0.0"
+      sources."write-file-atomic-2.3.0"
+      sources."xdg-basedir-3.0.0"
       sources."yallist-2.1.2"
-      sources."yargs-3.15.0"
-      sources."yargs-parser-2.4.1"
-      sources."zip-1.2.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -38926,7 +38744,7 @@ in
       sources."boom-5.2.0"
       sources."builtin-modules-1.1.1"
       sources."camelcase-4.1.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."chardet-0.4.2"
       sources."cli-cursor-2.1.0"
       sources."cli-table2-0.2.0"
@@ -38939,7 +38757,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."cross-spawn-5.1.0"
       sources."cvss-1.0.2"
       sources."debug-3.1.0"
@@ -38964,7 +38782,7 @@ in
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."is-fullwidth-code-point-2.0.0"
-          sources."lodash-4.17.5"
+          sources."lodash-4.17.10"
           sources."string-width-2.1.1"
           sources."strip-ansi-4.0.0"
         ];
@@ -39024,7 +38842,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-bom-3.0.0"
       sources."strip-eof-1.0.0"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."validate-npm-package-license-3.0.3"
@@ -39143,7 +38961,7 @@ in
       sources."cliui-2.1.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."combined-stream-1.0.6"
       sources."compressible-2.0.13"
       sources."compression-1.7.2"
@@ -39271,7 +39089,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.10"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.0"
+      sources."moment-2.22.1"
       sources."ms-2.0.0"
       sources."msgpack5-3.6.0"
       sources."mv-2.1.1"
@@ -39400,10 +39218,10 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.37.0";
+    version = "0.38.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz";
-      sha512 = "0i2j5pgw72bkg5s5crh3p534sz6m6yvbyg174kkgyj1l0sgaqmzj22xmh0dvxqk7r3rp79w2vs27gdqzb8azmlr6ag13m17h20cyhhf";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.38.0.tgz";
+      sha512 = "0jy97ypdv4a36cdcszfcj0qmv1z1k896h17xb7n2jzj26r4bz8kpj0dcnx255mj5bpxv3074gmabdk2da9jmp2awryyxj7f6l31p2bi";
     };
     dependencies = [
       sources."addr-to-ip-port-1.4.3"
@@ -39418,7 +39236,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bencode-2.0.0"
-      sources."big-integer-1.6.27"
+      sources."big-integer-1.6.28"
       sources."bitfield-0.1.0"
       sources."bittorrent-dht-6.4.2"
       sources."bittorrent-tracker-7.7.0"
@@ -39456,7 +39274,7 @@ in
       sources."decamelize-1.2.0"
       sources."decompress-response-3.3.0"
       sources."deep-equal-1.0.1"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."dns-equal-1.0.0"
       sources."dns-packet-1.3.1"
       sources."dns-txt-2.0.2"
@@ -39491,7 +39309,7 @@ in
       sources."ini-1.3.5"
       (sources."inquirer-1.2.3" // {
         dependencies = [
-          sources."lodash-4.17.5"
+          sources."lodash-4.17.10"
         ];
       })
       sources."internal-ip-1.2.0"
@@ -39548,12 +39366,12 @@ in
       sources."os-shim-0.1.3"
       sources."os-tmpdir-1.0.2"
       sources."parse-json-2.2.0"
-      (sources."parse-torrent-5.8.3" // {
+      (sources."parse-torrent-5.9.1" // {
         dependencies = [
-          sources."get-stdin-5.0.1"
+          sources."get-stdin-6.0.0"
         ];
       })
-      sources."parse-torrent-file-4.1.0"
+      sources."parse-torrent-file-2.1.4"
       sources."path-exists-2.1.0"
       sources."path-is-absolute-1.0.1"
       sources."path-type-1.1.0"
@@ -39570,11 +39388,11 @@ in
       sources."process-nextick-args-2.0.0"
       sources."pump-1.0.3"
       sources."random-access-file-2.0.1"
-      sources."random-access-storage-1.1.1"
+      sources."random-access-storage-1.2.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."re-emitter-1.1.3"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
@@ -39585,16 +39403,16 @@ in
       sources."reverse-http-1.3.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."run-parallel-1.1.8"
-      sources."run-series-1.1.6"
+      sources."run-parallel-1.1.9"
+      sources."run-series-1.1.8"
       sources."rusha-0.8.13"
       sources."rx-4.1.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.5.0"
       sources."server-destroy-1.0.1"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-2.7.0"
+      sources."simple-get-2.8.1"
       sources."simple-peer-6.4.4"
       sources."simple-sha1-2.1.0"
       (sources."simple-websocket-4.3.1" // {
@@ -39611,7 +39429,7 @@ in
       sources."speedometer-0.1.4"
       sources."stream-buffers-2.2.0"
       sources."string-width-1.0.2"
-      sources."string2compact-1.2.2"
+      sources."string2compact-1.2.3"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
@@ -39641,7 +39459,6 @@ in
           sources."minimist-0.0.8"
           sources."once-1.3.3"
           sources."parse-torrent-4.1.0"
-          sources."parse-torrent-file-2.1.4"
           sources."readable-stream-1.1.14"
           sources."safe-buffer-5.0.1"
           sources."string_decoder-0.10.31"
@@ -39878,9 +39695,9 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-1.0.10"
       sources."pump-1.0.3"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."random-access-file-2.0.1"
-      sources."random-access-storage-1.1.1"
+      sources."random-access-storage-1.2.0"
       sources."random-bytes-1.0.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
@@ -39907,10 +39724,10 @@ in
       })
       sources."rimraf-2.6.2"
       sources."rndm-1.2.0"
-      sources."run-parallel-1.1.8"
-      sources."run-series-1.1.6"
+      sources."run-parallel-1.1.9"
+      sources."run-series-1.1.8"
       sources."rusha-0.8.13"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       (sources."send-0.13.0" // {
         dependencies = [
           sources."ms-0.7.1"
@@ -39925,7 +39742,7 @@ in
         ];
       })
       sources."simple-concat-1.0.0"
-      sources."simple-get-2.7.0"
+      sources."simple-get-2.8.1"
       sources."simple-peer-6.4.4"
       sources."simple-sha1-2.1.0"
       (sources."simple-websocket-4.3.1" // {
@@ -39955,7 +39772,7 @@ in
       sources."speedometer-0.1.4"
       sources."statuses-1.5.0"
       sources."stream-counter-0.2.0"
-      sources."string2compact-1.2.2"
+      sources."string2compact-1.2.3"
       sources."string_decoder-0.10.31"
       sources."thirty-two-0.0.2"
       sources."thunky-1.0.2"
@@ -40079,7 +39896,7 @@ in
       })
       sources."kew-0.7.0"
       sources."klaw-1.3.1"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
@@ -40133,10 +39950,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.11.1";
+    version = "1.12.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz";
-      sha512 = "33s27xnirdx15j0dkp0i79bawmn7pysqxjiksh1jd5gcl4fdzvhd1sr9n7lh4k1ik37g1lmi3gb33j3kz31psqlxxyz1l5djgmq7wjg";
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz";
+      sha1 = "c1ad20e803e7749faf905a409d2367e06bbe7325";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -40150,10 +39967,10 @@ in
   pulp = nodeEnv.buildNodePackage {
     name = "pulp";
     packageName = "pulp";
-    version = "12.0.1";
+    version = "12.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pulp/-/pulp-12.0.1.tgz";
-      sha512 = "3n09lgnyd4p3h3jlhgcvbh6n6m9h89hwvbhli5ic32fkl5y4g7yi61m1vw483479jxkif2zyqs89l6j6hq4iy15jdknx1lcp9qbyvwy";
+      url = "https://registry.npmjs.org/pulp/-/pulp-12.2.0.tgz";
+      sha512 = "1kgjvji88fvdi6vazqq6gx32zqgkg9qp639952cz2v2g5izl7yblgawy1xra5dypv5c1a43wk4ch4iskr1kxxpfmn7pnql92q1nvxgg";
     };
     dependencies = [
       sources."JSONStream-1.3.2"
@@ -40188,7 +40005,7 @@ in
       sources."astw-2.2.0"
       sources."async-1.5.2"
       sources."async-each-1.0.1"
-      sources."atob-2.1.0"
+      sources."atob-2.1.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -40200,7 +40017,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."base64-js-1.2.3"
+      sources."base64-js-1.3.0"
       sources."binary-extensions-1.11.0"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
@@ -40224,15 +40041,14 @@ in
               sources."readable-stream-2.0.6"
             ];
           })
-          sources."hash-base-2.0.2"
           sources."isarray-2.0.4"
           sources."process-nextick-args-2.0.0"
         ];
       })
       sources."browserify-aes-1.2.0"
       sources."browserify-cache-api-3.0.1"
-      sources."browserify-cipher-1.0.0"
-      sources."browserify-des-1.0.0"
+      sources."browserify-cipher-1.0.1"
+      sources."browserify-des-1.0.1"
       (sources."browserify-incremental-3.1.1" // {
         dependencies = [
           sources."JSONStream-0.10.0"
@@ -40243,6 +40059,7 @@ in
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.1.4"
       sources."buffer-4.9.1"
+      sources."buffer-crc32-0.2.13"
       sources."buffer-from-1.0.0"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
@@ -40263,7 +40080,7 @@ in
         ];
       })
       sources."collection-visit-1.0.0"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."combine-source-map-0.8.0"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
@@ -40273,9 +40090,9 @@ in
       sources."convert-source-map-1.1.3"
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.3"
-      sources."create-hmac-1.1.6"
+      sources."create-ecdh-4.0.1"
+      sources."create-hash-1.2.0"
+      sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
       sources."date-now-0.1.4"
       sources."debug-2.6.9"
@@ -40285,10 +40102,11 @@ in
       sources."deps-sort-2.0.0"
       sources."des.js-1.0.0"
       sources."detective-4.7.1"
-      sources."diffie-hellman-5.0.2"
+      sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.1.7"
       sources."duplexer2-0.1.4"
       sources."elliptic-6.4.0"
+      sources."es6-promise-3.3.1"
       sources."events-1.1.1"
       sources."evp_bytestokey-1.0.3"
       (sources."expand-brackets-2.1.4" // {
@@ -40308,7 +40126,7 @@ in
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."function-bind-1.1.1"
       sources."get-value-2.0.6"
       sources."glob-7.1.2"
@@ -40364,17 +40182,23 @@ in
       sources."micromatch-3.1.10"
       sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
-      sources."minimalistic-assert-1.0.0"
+      sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."mixin-deep-1.3.1"
+      sources."mkdirp-0.5.1"
       sources."module-deps-4.1.1"
+      (sources."mold-source-map-0.4.0" // {
+        dependencies = [
+          sources."through-2.2.7"
+        ];
+      })
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nan-2.10.0"
       sources."nanomatch-1.2.9"
-      sources."neo-async-2.5.0"
+      sources."neo-async-2.5.1"
       (sources."node-static-0.7.10" // {
         dependencies = [
           sources."minimist-0.0.10"
@@ -40391,18 +40215,18 @@ in
       sources."os-tmpdir-1.0.2"
       sources."pako-0.2.9"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.0"
+      sources."parse-asn1-5.1.1"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.0"
       sources."path-dirname-1.0.2"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.5"
       sources."path-platform-0.11.15"
-      sources."pbkdf2-3.0.14"
+      sources."pbkdf2-3.0.16"
       sources."posix-character-classes-0.1.1"
       sources."process-0.11.10"
       sources."process-nextick-args-1.0.7"
-      sources."public-encrypt-4.0.0"
+      sources."public-encrypt-4.0.2"
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -40421,13 +40245,18 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
-      sources."rimraf-2.2.8"
-      sources."ripemd160-2.0.1"
-      sources."safe-buffer-5.1.1"
+      sources."rimraf-2.6.2"
+      sources."ripemd160-2.0.2"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
+      (sources."sander-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."set-immediate-shim-1.0.1"
       sources."set-value-2.0.0"
       sources."sha.js-2.4.11"
@@ -40446,9 +40275,11 @@ in
       })
       sources."snapdragon-node-2.1.1"
       sources."snapdragon-util-3.0.1"
+      sources."sorcery-0.10.0"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.1"
       sources."source-map-url-0.4.0"
+      sources."sourcemap-codec-1.4.1"
       (sources."split-string-3.1.0" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -40464,7 +40295,11 @@ in
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       sources."syntax-error-1.4.0"
-      sources."temp-0.8.3"
+      (sources."temp-0.8.3" // {
+        dependencies = [
+          sources."rimraf-2.2.8"
+        ];
+      })
       sources."through-2.3.8"
       sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
@@ -40490,7 +40325,7 @@ in
           })
         ];
       })
-      sources."upath-1.0.4"
+      sources."upath-1.0.5"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -40509,7 +40344,7 @@ in
       })
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-0.0.4"
-      (sources."watchpack-1.5.0" // {
+      (sources."watchpack-1.6.0" // {
         dependencies = [
           sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
@@ -40591,6 +40426,9 @@ in
         ];
       })
       sources."boom-2.10.1"
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-0.1.1"
+      sources."buffer-fill-0.1.1"
       sources."bufferutil-2.0.1"
       sources."bytes-3.0.0"
       sources."camelcase-1.2.1"
@@ -40617,7 +40455,7 @@ in
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
@@ -40645,6 +40483,7 @@ in
       sources."form-data-2.1.4"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
+      sources."fs-constants-1.0.0"
       sources."function-bind-1.1.1"
       sources."gauge-2.7.4"
       sources."getpass-0.1.7"
@@ -40695,7 +40534,7 @@ in
       })
       sources."less-middleware-2.2.1"
       sources."libquassel-2.1.9"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."longest-1.0.1"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
@@ -40716,7 +40555,7 @@ in
           sources."tunnel-agent-0.4.3"
         ];
       })
-      sources."node-abi-2.3.0"
+      sources."node-abi-2.4.1"
       sources."node.extend-2.0.0"
       sources."noop-logger-0.1.1"
       sources."npmlog-4.1.2"
@@ -40763,12 +40602,12 @@ in
           sources."http-errors-1.6.2"
         ];
       })
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
       sources."regenerator-runtime-0.11.1"
       sources."repeat-string-1.6.1"
       sources."request-2.81.0"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."right-align-0.1.3"
       sources."safe-buffer-5.1.1"
       sources."semver-5.5.0"
@@ -40798,8 +40637,9 @@ in
       sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-fs-1.16.0"
-      sources."tar-stream-1.5.5"
+      sources."tar-fs-1.16.2"
+      sources."tar-stream-1.6.0"
+      sources."to-buffer-1.1.1"
       sources."to-fast-properties-1.0.3"
       sources."token-stream-0.0.1"
       sources."tough-cookie-2.3.4"
@@ -41055,7 +40895,7 @@ in
       sources."oauth-sign-0.8.2"
       (sources."openid-2.0.6" // {
         dependencies = [
-          sources."qs-6.5.1"
+          sources."qs-6.5.2"
           sources."request-2.85.0"
         ];
       })
@@ -41067,7 +40907,7 @@ in
       sources."raw-body-0.0.3"
       sources."readable-stream-1.1.14"
       sources."request-2.9.203"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-1.2.4"
       sources."send-0.1.4"
       sources."sntp-2.1.0"
@@ -41112,10 +40952,10 @@ in
   serve = nodeEnv.buildNodePackage {
     name = "serve";
     packageName = "serve";
-    version = "6.5.4";
+    version = "6.5.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serve/-/serve-6.5.4.tgz";
-      sha512 = "3dhp8p2c9i86bwaxlxxlhml4p7ps2ph09pap35g5ivy0ndxv6av87axckmm4g7dwvz6c8y6mvc8c0v93m9hlk2rqm07y211621b1hhh";
+      url = "https://registry.npmjs.org/serve/-/serve-6.5.6.tgz";
+      sha512 = "1gfw9s3jh8ymzv26733pp33xkvhihlb25w8aznc3yqcx7wg82k7fzz6f3w3aw758dy7cshb89ijliaqcf1p4bgrchfqbxv1613wgmmd";
     };
     dependencies = [
       sources."accepts-1.3.5"
@@ -41126,24 +40966,23 @@ in
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
       sources."arch-2.1.0"
-      (sources."args-3.0.8" // {
+      (sources."args-4.0.0" // {
         dependencies = [
-          sources."chalk-2.1.0"
+          sources."chalk-2.3.2"
         ];
       })
       sources."async-1.5.2"
       sources."basic-auth-2.0.0"
       sources."bluebird-3.5.1"
-      sources."boxen-1.3.0"
-      sources."bytes-3.0.0"
-      sources."camelcase-4.1.0"
-      sources."center-align-0.1.3"
-      (sources."chalk-2.3.2" // {
+      (sources."boxen-1.3.0" // {
         dependencies = [
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.3.0"
+          sources."camelcase-4.1.0"
         ];
       })
+      sources."bytes-3.0.0"
+      sources."camelcase-5.0.0"
+      sources."center-align-0.1.3"
+      sources."chalk-2.4.0"
       sources."cli-boxes-1.0.0"
       (sources."clipboardy-1.2.3" // {
         dependencies = [
@@ -41160,7 +40999,7 @@ in
       sources."dargs-5.1.0"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."depd-1.1.1"
       sources."destroy-1.0.4"
       sources."detect-port-1.2.2"
@@ -41170,7 +41009,7 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
       sources."execa-0.7.0"
-      sources."filesize-3.6.0"
+      sources."filesize-3.6.1"
       sources."fresh-0.5.2"
       sources."fs-extra-5.0.0"
       sources."get-stream-3.0.0"
@@ -41181,7 +41020,7 @@ in
           sources."wordwrap-0.0.2"
         ];
       })
-      sources."has-flag-2.0.0"
+      sources."has-flag-3.0.0"
       sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.19"
       sources."inherits-2.0.3"
@@ -41195,10 +41034,10 @@ in
       sources."jsonfile-4.0.0"
       sources."kind-of-3.2.2"
       sources."lazy-cache-1.0.4"
-      sources."lodash-4.17.5"
+      sources."leven-2.1.0"
       sources."longest-1.0.1"
       sources."lru-cache-4.1.2"
-      sources."micro-9.1.0"
+      sources."micro-9.1.4"
       sources."micro-compress-1.0.0"
       sources."mime-1.4.1"
       sources."mime-db-1.33.0"
@@ -41207,23 +41046,22 @@ in
       sources."mri-1.1.0"
       sources."ms-2.0.0"
       sources."negotiator-0.6.1"
-      sources."node-version-1.1.0"
+      sources."node-version-1.1.3"
       sources."npm-run-path-2.0.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.1"
       sources."openssl-self-signed-certificate-1.1.6"
-      sources."opn-5.2.0"
+      sources."opn-5.3.0"
       sources."optimist-0.6.1"
       sources."p-finally-1.0.0"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
       sources."path-type-3.0.0"
       sources."pify-3.0.0"
-      sources."pkginfo-0.4.1"
       sources."pseudomap-1.0.2"
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.2"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
       sources."repeat-string-1.6.1"
@@ -41241,12 +41079,11 @@ in
       sources."signal-exit-3.0.2"
       sources."source-map-0.4.4"
       sources."statuses-1.5.0"
-      sources."string-similarity-1.2.0"
       sources."string-width-2.1.1"
       sources."strip-ansi-4.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-4.5.0"
+      sources."supports-color-5.4.0"
       sources."term-size-1.2.0"
       (sources."uglify-js-2.8.29" // {
         dependencies = [
@@ -41256,7 +41093,7 @@ in
       sources."uglify-to-browserify-1.0.2"
       sources."universalify-0.1.1"
       sources."unpipe-1.0.0"
-      (sources."update-check-1.2.0" // {
+      (sources."update-check-1.3.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -41544,7 +41381,7 @@ in
       })
       sources."bytes-1.0.0"
       sources."caseless-0.12.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."co-4.6.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
@@ -41660,7 +41497,7 @@ in
       sources."minimatch-1.0.0"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.0"
+      sources."moment-2.22.1"
       sources."ms-2.0.0"
       sources."mv-2.1.1"
       sources."nan-2.10.0"
@@ -41676,7 +41513,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
       sources."performance-now-2.1.0"
-      sources."postcss-6.0.21"
+      sources."postcss-6.0.22"
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-1.1.5"
       sources."punycode-1.4.1"
@@ -41697,7 +41534,7 @@ in
       })
       (sources."request-2.85.0" // {
         dependencies = [
-          sources."qs-6.5.1"
+          sources."qs-6.5.2"
         ];
       })
       sources."rimraf-2.4.5"
@@ -41724,7 +41561,7 @@ in
       sources."statuses-1.3.1"
       sources."string_decoder-1.1.1"
       sources."stringstream-0.0.5"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."through-2.3.8"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
@@ -41775,12 +41612,12 @@ in
       sources."graceful-readlink-1.0.1"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."minimatch-3.0.4"
       sources."process-nextick-args-2.0.0"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."set-immediate-shim-1.0.1"
       sources."string_decoder-1.1.1"
       sources."util-deprecate-1.0.2"
@@ -41863,7 +41700,7 @@ in
         ];
       })
       sources."rimraf-2.4.5"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-json-stringify-1.1.0"
       sources."semver-4.3.6"
       (sources."smartdc-auth-2.3.1" // {
@@ -41968,7 +41805,7 @@ in
       sources."object-component-0.0.3"
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."socket.io-adapter-1.1.1"
       sources."socket.io-client-2.1.0"
       sources."socket.io-parser-3.2.0"
@@ -42151,7 +41988,7 @@ in
       sources."is-regex-1.0.4"
       sources."is-symbol-1.0.1"
       sources."js-yaml-3.10.0"
-      sources."mdn-data-1.1.0"
+      sources."mdn-data-1.1.2"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."nth-check-1.0.1"
@@ -42162,7 +41999,7 @@ in
       sources."sax-1.2.4"
       sources."source-map-0.5.7"
       sources."sprintf-js-1.0.3"
-      sources."stable-0.1.6"
+      sources."stable-0.1.8"
       sources."unquote-1.1.1"
       sources."util.promisify-1.0.0"
     ];
@@ -42206,7 +42043,7 @@ in
       sources."prr-1.0.1"
       sources."readable-stream-2.3.6"
       sources."resolve-from-2.0.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."string_decoder-1.1.1"
       sources."tapable-0.2.8"
       sources."util-deprecate-1.0.2"
@@ -42305,7 +42142,7 @@ in
       sources."keypress-0.2.1"
       sources."kind-of-3.2.2"
       sources."lazy-cache-1.0.4"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."longest-1.0.1"
       sources."longjohn-0.2.11"
       sources."mime-db-1.33.0"
@@ -42341,7 +42178,7 @@ in
       })
       sources."right-align-0.1.3"
       sources."rimraf-2.2.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.3.0"
       sources."sntp-1.0.9"
       sources."source-map-0.1.32"
@@ -42388,10 +42225,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.8.1";
+    version = "2.8.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz";
-      sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz";
+      sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -42451,7 +42288,7 @@ in
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."debug-2.6.9"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."defaults-1.0.3"
       sources."delayed-stream-1.0.0"
       sources."detect-indent-5.0.0"
@@ -42505,7 +42342,7 @@ in
       sources."jspm-config-0.3.4"
       sources."latest-version-3.1.0"
       sources."listify-1.0.0"
-      sources."lockfile-1.0.3"
+      sources."lockfile-1.0.4"
       sources."log-update-1.0.2"
       sources."loose-envify-1.3.1"
       sources."lowercase-keys-1.0.1"
@@ -42541,7 +42378,7 @@ in
       sources."promise-finally-3.0.0"
       sources."pseudomap-1.0.2"
       sources."punycode-1.4.1"
-      (sources."rc-1.2.6" // {
+      (sources."rc-1.2.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -42551,7 +42388,7 @@ in
       sources."registry-url-3.1.0"
       sources."restore-cursor-1.0.1"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.0.3"
       sources."semver-diff-2.1.0"
       sources."shebang-command-1.2.0"
@@ -42574,7 +42411,7 @@ in
       sources."touch-1.0.0"
       sources."tough-cookie-2.3.4"
       sources."typedarray-0.0.6"
-      sources."typescript-2.8.1"
+      sources."typescript-2.8.3"
       (sources."typings-core-2.3.3" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -42583,12 +42420,12 @@ in
       sources."unc-path-regex-0.1.2"
       sources."unique-string-1.0.0"
       sources."unzip-response-2.0.1"
-      (sources."update-notifier-2.4.0" // {
+      (sources."update-notifier-2.5.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."semver-5.5.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."url-parse-lax-1.0.0"
@@ -42616,10 +42453,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.3.20";
+    version = "3.3.23";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz";
-      sha512 = "3x6k1plb2hrmm51fn2w7nmi9pixipwj224a4afly17p2mwk75qhycib3zlaj9m0bk43ydfh0h2gv01l1xfhabvjcv36pc7x4xcf94js";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.23.tgz";
+      sha512 = "2zylyzplicczqknizbm1mp7grxz6bi6vg03rsld8l18b2rahl9y7b1rj2c3sp75afmmyqlgg57v8c0b1adyqm7arzw8kcc3n6l8mkra";
     };
     dependencies = [
       sources."commander-2.15.1"
@@ -42637,10 +42474,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.4.18";
+    version = "1.4.22";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.18.tgz";
-      sha512 = "3mdb4qpdmm6n3c34z8pkrn3yx2nxyvqszw3rb24lcf8mbpbx2d534bpb3mcg2lg4lxsysijp652pkwbxd492sm7z9bz296r8cgppmqm";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.22.tgz";
+      sha512 = "22lf4pk1mn1vn8rgakj6z2dllv4xr7nybymkgrpvkfkglrlh6s9ch5cbbqsdy7mgrhgkmqwrygyb5xypwil4rrfw4a2x1q15jpg229w";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -42654,7 +42491,7 @@ in
       sources."arraybuffer.slice-0.0.7"
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
-      sources."async-2.6.0"
+      sources."async-0.9.2"
       sources."async-limiter-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
@@ -42683,7 +42520,7 @@ in
       sources."camelcase-4.1.0"
       sources."caseless-0.12.0"
       sources."charenc-0.0.2"
-      (sources."cliui-4.0.0" // {
+      (sources."cliui-4.1.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
         ];
@@ -42723,7 +42560,7 @@ in
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."delayed-stream-0.0.5"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
@@ -42734,6 +42571,7 @@ in
           sources."mkdirp-0.3.0"
         ];
       })
+      sources."dnd-page-scroll-0.0.4"
       sources."eachr-3.2.0"
       sources."ecc-jsbn-0.1.1"
       sources."editions-1.3.4"
@@ -42786,7 +42624,7 @@ in
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.19"
-      sources."ignore-3.3.7"
+      sources."ignore-3.3.8"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -42802,6 +42640,8 @@ in
       sources."isarray-0.0.1"
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
+      sources."jquery-3.3.1"
+      sources."jquery-ui-1.12.1"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
@@ -42810,17 +42650,17 @@ in
       sources."just-detect-adblock-1.0.0"
       (sources."keen.io-0.1.3" // {
         dependencies = [
-          sources."async-0.9.2"
           sources."methods-1.0.1"
           sources."mime-1.2.11"
           sources."qs-1.2.0"
           sources."superagent-0.21.0"
         ];
       })
-      sources."knockout-3.5.0-beta"
+      sources."knockout-3.5.0-rc"
       sources."lcid-1.0.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
+      sources."locks-0.2.2"
+      sources."lodash-4.17.10"
       sources."lru-cache-4.1.2"
       sources."md5-2.2.1"
       sources."media-typer-0.3.0"
@@ -42839,14 +42679,14 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.0"
+      sources."moment-2.22.1"
       sources."ms-2.0.0"
       sources."negotiator-0.6.1"
       sources."node-cache-4.2.0"
       sources."nopt-1.0.10"
       sources."normalize-package-data-2.4.0"
-      sources."npm-6.0.0-next.0"
-      sources."npm-package-arg-6.0.0"
+      sources."npm-6.0.0"
+      sources."npm-package-arg-6.1.0"
       (sources."npm-registry-client-8.5.1" // {
         dependencies = [
           sources."combined-stream-1.0.6"
@@ -42908,7 +42748,7 @@ in
           sources."http-errors-1.6.2"
         ];
       })
-      (sources."rc-1.2.6" // {
+      (sources."rc-1.2.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -42958,7 +42798,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      (sources."superagent-3.8.2" // {
+      (sources."superagent-3.8.3" // {
         dependencies = [
           sources."combined-stream-1.0.6"
           sources."component-emitter-1.2.1"
@@ -43001,7 +42841,7 @@ in
       sources."which-1.3.0"
       sources."which-module-2.0.0"
       sources."wide-align-1.1.2"
-      (sources."winston-2.4.1" // {
+      (sources."winston-2.4.2" // {
         dependencies = [
           sources."async-1.0.0"
         ];
@@ -43074,7 +42914,10 @@ in
       sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."buffer-3.6.0"
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-0.1.1"
       sources."buffer-crc32-0.2.13"
+      sources."buffer-fill-0.1.1"
       sources."builtins-1.0.3"
       sources."camelcase-1.2.1"
       sources."capture-stack-trace-1.0.0"
@@ -43085,7 +42928,7 @@ in
         ];
       })
       sources."center-align-0.1.3"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."chardet-0.4.2"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.3.1"
@@ -43154,6 +42997,7 @@ in
       sources."filenamify-2.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
+      sources."fs-constants-1.0.0"
       sources."fs-extra-0.26.7"
       sources."fs.realpath-1.0.0"
       sources."get-proxy-2.1.0"
@@ -43212,7 +43056,7 @@ in
       sources."kind-of-3.2.2"
       sources."klaw-1.3.1"
       sources."lazy-cache-1.0.4"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."log-symbols-2.2.0"
       sources."longest-1.0.1"
       sources."lowercase-keys-1.0.1"
@@ -43257,7 +43101,7 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proto-list-1.2.4"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."read-metadata-1.0.0"
       sources."readable-stream-2.3.6"
       sources."recursive-readdir-2.2.2"
@@ -43273,7 +43117,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."seek-bzip-1.0.5"
       sources."semver-5.5.0"
@@ -43289,14 +43133,15 @@ in
       sources."strip-ansi-4.0.0"
       sources."strip-dirs-2.1.0"
       sources."strip-outer-1.0.1"
-      sources."supports-color-5.3.0"
-      sources."tar-stream-1.5.5"
+      sources."supports-color-5.4.0"
+      sources."tar-stream-1.6.0"
       sources."through-2.3.8"
       sources."thunkify-2.1.2"
       sources."thunkify-wrap-1.0.4"
       sources."tildify-1.2.0"
       sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
+      sources."to-buffer-1.1.1"
       sources."toml-2.3.3"
       sources."tough-cookie-2.3.4"
       sources."trim-repeated-1.0.0"
@@ -43349,7 +43194,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."adm-zip-0.4.7"
+      sources."adm-zip-0.4.9"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."asn1-0.2.3"
@@ -43422,7 +43267,7 @@ in
       })
       sources."kew-0.1.7"
       sources."klaw-1.3.1"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
@@ -43470,7 +43315,7 @@ in
       sources."tunnel-agent-0.4.3"
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
-      sources."underscore-1.8.3"
+      sources."underscore-1.9.0"
       sources."util-deprecate-1.0.2"
       sources."verror-1.10.0"
       sources."which-1.2.14"
@@ -43490,16 +43335,16 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "4.5.0";
+    version = "4.7.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-4.5.0.tgz";
-      sha512 = "3m4zqjmw0byxpxxx35zfrpng2sawkk71mna6b7b5vx1ba534kvsrs3i6332vz7m0dskp9k8ywqv545kg8x7xnv8xvl6x709yjrdjsp8";
+      url = "https://registry.npmjs.org/webpack/-/webpack-4.7.0.tgz";
+      sha512 = "3qmpyw1gbcmwgc42iss0vqam6vgi5kqvzv5s4xba1ww50824vq5yb3p7zbh0is33q76axrkhj4d7p1cigp5w0jnhhd2v3v6ky580wrr";
     };
     dependencies = [
       sources."acorn-5.5.3"
       sources."acorn-dynamic-import-3.0.0"
       sources."ajv-6.4.0"
-      sources."ajv-keywords-3.1.0"
+      sources."ajv-keywords-3.2.0"
       sources."anymatch-2.0.0"
       sources."aproba-1.2.0"
       sources."arr-diff-4.0.0"
@@ -43510,7 +43355,7 @@ in
       sources."assert-1.4.1"
       sources."assign-symbols-1.0.0"
       sources."async-each-1.0.1"
-      sources."atob-2.1.0"
+      sources."atob-2.1.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -43523,7 +43368,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."base64-js-1.2.3"
+      sources."base64-js-1.3.0"
       sources."big.js-3.2.0"
       sources."binary-extensions-1.11.0"
       sources."bluebird-3.5.1"
@@ -43538,8 +43383,8 @@ in
       })
       sources."brorand-1.1.0"
       sources."browserify-aes-1.2.0"
-      sources."browserify-cipher-1.0.0"
-      sources."browserify-des-1.0.0"
+      sources."browserify-cipher-1.0.1"
+      sources."browserify-des-1.0.1"
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
@@ -43551,7 +43396,7 @@ in
       sources."cache-base-1.0.1"
       sources."chokidar-2.0.3"
       sources."chownr-1.0.1"
-      sources."chrome-trace-event-0.1.2"
+      sources."chrome-trace-event-0.1.3"
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -43569,9 +43414,9 @@ in
       sources."copy-concurrently-1.0.5"
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.3"
-      sources."create-hmac-1.1.6"
+      sources."create-ecdh-4.0.1"
+      sources."create-hash-1.2.0"
+      sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
       sources."cyclist-0.2.2"
       sources."date-now-0.1.4"
@@ -43579,9 +43424,9 @@ in
       sources."decode-uri-component-0.2.0"
       sources."define-property-2.0.2"
       sources."des.js-1.0.0"
-      sources."diffie-hellman-5.0.2"
+      sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."elliptic-6.4.0"
       sources."emojis-list-2.1.0"
       sources."end-of-stream-1.4.1"
@@ -43617,7 +43462,7 @@ in
       sources."from2-2.3.0"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."get-value-2.0.6"
       sources."glob-7.1.2"
       (sources."glob-parent-3.1.0" // {
@@ -43683,7 +43528,7 @@ in
         ];
       })
       sources."miller-rabin-4.0.1"
-      sources."minimalistic-assert-1.0.0"
+      sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -43694,10 +43539,9 @@ in
       sources."ms-2.0.0"
       sources."nan-2.10.0"
       sources."nanomatch-1.2.9"
-      sources."neo-async-2.5.0"
+      sources."neo-async-2.5.1"
       (sources."node-libs-browser-2.1.0" // {
         dependencies = [
-          sources."hash-base-2.0.2"
           sources."inherits-2.0.1"
           sources."punycode-1.4.1"
         ];
@@ -43713,13 +43557,13 @@ in
       sources."p-try-1.0.0"
       sources."pako-1.0.6"
       sources."parallel-transform-1.1.0"
-      sources."parse-asn1-5.1.0"
+      sources."parse-asn1-5.1.1"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.0"
       sources."path-dirname-1.0.2"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."pbkdf2-3.0.14"
+      sources."pbkdf2-3.0.16"
       sources."pify-3.0.0"
       sources."pkg-dir-2.0.0"
       sources."posix-character-classes-0.1.1"
@@ -43728,9 +43572,9 @@ in
       sources."promise-inflight-1.0.1"
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
-      sources."public-encrypt-4.0.0"
+      sources."public-encrypt-4.0.2"
       sources."pump-2.0.1"
-      sources."pumpify-1.4.0"
+      sources."pumpify-1.5.0"
       sources."punycode-2.1.0"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -43745,12 +43589,12 @@ in
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
       sources."rimraf-2.6.2"
-      sources."ripemd160-2.0.1"
+      sources."ripemd160-2.0.2"
       sources."run-queue-1.0.3"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."schema-utils-0.4.5"
-      sources."serialize-javascript-1.4.0"
+      sources."serialize-javascript-1.5.0"
       sources."set-immediate-shim-1.0.1"
       sources."set-value-2.0.0"
       sources."setimmediate-1.0.5"
@@ -43814,7 +43658,7 @@ in
       sources."string_decoder-1.1.1"
       sources."tapable-1.0.0"
       sources."through2-2.0.3"
-      sources."timers-browserify-2.0.6"
+      sources."timers-browserify-2.0.10"
       sources."to-arraybuffer-1.0.1"
       sources."to-object-path-0.3.0"
       sources."to-regex-3.0.2"
@@ -43822,7 +43666,7 @@ in
       sources."tty-browserify-0.0.0"
       sources."typedarray-0.0.6"
       sources."uglify-es-3.3.10"
-      (sources."uglifyjs-webpack-plugin-1.2.4" // {
+      (sources."uglifyjs-webpack-plugin-1.2.5" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -43843,7 +43687,7 @@ in
           })
         ];
       })
-      sources."upath-1.0.4"
+      sources."upath-1.0.5"
       sources."uri-js-3.0.2"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
@@ -43859,7 +43703,7 @@ in
       sources."util-0.10.3"
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-0.0.4"
-      sources."watchpack-1.5.0"
+      sources."watchpack-1.6.0"
       (sources."webpack-sources-1.1.0" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -43883,10 +43727,10 @@ in
   webtorrent-cli = nodeEnv.buildNodePackage {
     name = "webtorrent-cli";
     packageName = "webtorrent-cli";
-    version = "1.11.0";
+    version = "1.12.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.11.0.tgz";
-      sha512 = "04agjsk7s1fdmiy195shkjqxswpkadyg08vgj4pqxpwy6d5d4kbngz3gmg9vvnm2z9hi2sdc6ryx0r59nws7xjkifi3grzfkxzz1c06";
+      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.12.1.tgz";
+      sha512 = "2hnm4r244as9zcld8hf884vwp4iwqvrnjc01c5037bpwa0zzc8y5zss9xc75ffbhw8dp54kbfzvlfwfn6q49hymbnsfj44ckqfalavr";
     };
     dependencies = [
       sources."addr-to-ip-port-1.4.3"
@@ -43906,10 +43750,10 @@ in
       sources."binary-search-1.3.3"
       sources."bindings-1.3.0"
       sources."bitfield-2.0.0"
-      sources."bittorrent-dht-8.2.0"
+      sources."bittorrent-dht-8.3.0"
       sources."bittorrent-peerid-1.2.0"
-      sources."bittorrent-protocol-2.4.0"
-      sources."bittorrent-tracker-9.7.0"
+      sources."bittorrent-protocol-2.4.1"
+      sources."bittorrent-tracker-9.9.1"
       sources."bl-1.2.2"
       sources."blob-to-buffer-1.2.7"
       sources."block-stream2-1.1.0"
@@ -43922,13 +43766,21 @@ in
       sources."buffer-fill-0.1.1"
       sources."buffer-from-1.0.0"
       sources."buffer-indexof-1.1.1"
-      sources."bufferutil-3.0.4"
+      (sources."bufferutil-3.0.4" // {
+        dependencies = [
+          sources."simple-get-2.8.1"
+        ];
+      })
       sources."bufferview-1.0.1"
       sources."bytebuffer-3.5.5"
       sources."castv2-0.1.9"
       sources."castv2-client-1.2.0"
       sources."chownr-1.0.1"
-      sources."chromecasts-1.9.1"
+      (sources."chromecasts-1.9.1" // {
+        dependencies = [
+          sources."mime-1.6.0"
+        ];
+      })
       sources."chunk-store-stream-2.1.0"
       sources."clivas-0.2.0"
       sources."closest-to-2.0.0"
@@ -43939,17 +43791,25 @@ in
       sources."concat-stream-1.6.2"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      sources."create-torrent-3.30.0"
+      sources."create-torrent-3.31.0"
       sources."debug-2.6.9"
       sources."decompress-response-3.3.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."defined-1.0.0"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
-      sources."dlnacasts-0.1.0"
+      (sources."dlnacasts-0.1.0" // {
+        dependencies = [
+          sources."mime-1.6.0"
+        ];
+      })
       sources."dns-packet-1.3.1"
       sources."dns-txt-2.0.2"
-      sources."ecstatic-3.2.0"
+      (sources."ecstatic-3.2.0" // {
+        dependencies = [
+          sources."mime-1.6.0"
+        ];
+      })
       sources."elementtree-0.1.7"
       sources."end-of-stream-1.4.1"
       sources."executable-4.1.1"
@@ -43957,10 +43817,11 @@ in
       sources."filestream-4.1.3"
       sources."flatten-1.0.2"
       sources."fs-chunk-store-1.7.0"
+      sources."fs-constants-1.0.0"
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
       sources."get-browser-rtc-1.0.2"
-      sources."get-stdin-5.0.1"
+      sources."get-stdin-6.0.0"
       sources."github-from-package-0.0.0"
       sources."glob-7.1.2"
       sources."has-unicode-2.0.1"
@@ -43979,24 +43840,28 @@ in
       sources."isarray-1.0.0"
       sources."junk-2.1.0"
       sources."k-bucket-4.0.0"
-      sources."k-rpc-4.3.1"
+      sources."k-rpc-5.0.0"
       sources."k-rpc-socket-1.8.0"
       sources."last-one-wins-1.0.4"
-      sources."load-ip-set-1.3.1"
+      (sources."load-ip-set-1.3.1" // {
+        dependencies = [
+          sources."simple-get-2.8.1"
+        ];
+      })
       sources."long-2.4.0"
       sources."lru-3.1.0"
       sources."magnet-uri-5.1.7"
       sources."mdns-js-0.5.0"
       sources."mdns-js-packet-0.2.0"
-      sources."mediasource-2.1.3"
+      sources."mediasource-2.2.0"
       sources."memory-chunk-store-1.3.0"
-      sources."mime-1.6.0"
+      sources."mime-2.3.1"
       sources."mimic-response-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.0"
-      sources."mp4-box-encoding-1.1.3"
+      sources."moment-2.22.1"
+      sources."mp4-box-encoding-1.1.4"
       sources."mp4-stream-2.0.3"
       sources."ms-2.0.0"
       (sources."multicast-dns-6.2.3" // {
@@ -44009,7 +43874,7 @@ in
       sources."netmask-1.0.6"
       sources."network-address-1.1.2"
       sources."next-event-1.0.0"
-      sources."node-abi-2.3.0"
+      sources."node-abi-2.4.1"
       sources."node-ssdp-2.9.1"
       sources."nodebmc-0.0.7"
       sources."noop-logger-0.1.1"
@@ -44021,45 +43886,48 @@ in
       sources."optjs-3.2.2"
       sources."os-homedir-1.0.2"
       sources."package-json-versionify-1.0.4"
-      sources."parse-torrent-5.8.3"
-      sources."parse-torrent-file-4.1.0"
+      (sources."parse-torrent-6.0.0" // {
+        dependencies = [
+          sources."simple-get-3.0.2"
+        ];
+      })
       sources."path-is-absolute-1.0.1"
       sources."piece-length-1.0.0"
       sources."pify-2.3.0"
       sources."plist-with-patches-0.5.1"
-      sources."prebuild-install-2.5.1"
+      sources."prebuild-install-2.5.3"
       sources."prettier-bytes-1.0.4"
       sources."process-nextick-args-2.0.0"
       sources."protobufjs-3.8.2"
       sources."pump-3.0.0"
       sources."qap-3.3.1"
       sources."random-access-file-2.0.1"
-      sources."random-access-storage-1.1.1"
+      sources."random-access-storage-1.2.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
       sources."range-slice-stream-1.2.0"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
-      sources."record-cache-1.0.1"
-      (sources."render-media-2.12.0" // {
+      sources."record-cache-1.0.2"
+      (sources."render-media-3.0.0" // {
         dependencies = [
           sources."pump-1.0.3"
         ];
       })
       sources."rimraf-2.6.2"
-      sources."run-parallel-1.1.8"
-      sources."run-parallel-limit-1.0.4"
-      sources."run-series-1.1.6"
+      sources."run-parallel-1.1.9"
+      sources."run-parallel-limit-1.0.5"
+      sources."run-series-1.1.8"
       sources."rusha-0.8.13"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-1.1.4"
       sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-2.7.0"
-      sources."simple-peer-9.0.0"
+      sources."simple-get-2.8.1"
+      sources."simple-peer-9.1.1"
       sources."simple-sha1-2.1.0"
       (sources."simple-websocket-7.0.2" // {
         dependencies = [
@@ -44072,21 +43940,22 @@ in
       sources."stream-to-blob-url-2.1.0"
       sources."stream-with-known-length-to-buffer-1.0.1"
       sources."string-width-1.0.2"
-      sources."string2compact-1.2.2"
+      sources."string2compact-1.2.3"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      (sources."tar-fs-1.16.0" // {
+      (sources."tar-fs-1.16.2" // {
         dependencies = [
           sources."pump-1.0.3"
         ];
       })
-      sources."tar-stream-1.5.5"
+      sources."tar-stream-1.6.0"
       sources."thirty-two-1.0.2"
       sources."through-2.3.8"
       sources."thunky-0.1.0"
       sources."to-arraybuffer-1.0.1"
-      (sources."torrent-discovery-8.4.0" // {
+      sources."to-buffer-1.1.1"
+      (sources."torrent-discovery-8.4.1" // {
         dependencies = [
           sources."minimist-1.2.0"
           sources."pump-2.0.1"
@@ -44102,16 +43971,16 @@ in
       sources."upnp-device-client-1.0.2"
       sources."upnp-mediarenderer-client-1.2.4"
       sources."url-join-2.0.5"
-      sources."ut_metadata-3.2.0"
+      sources."ut_metadata-3.2.1"
       sources."ut_pex-1.2.0"
       sources."util-deprecate-1.0.2"
       sources."videostream-2.4.2"
       sources."vlc-command-1.1.1"
-      (sources."webtorrent-0.98.24" // {
+      (sources."webtorrent-0.99.4" // {
         dependencies = [
           sources."debug-3.1.0"
-          sources."mime-2.2.2"
           sources."minimist-0.0.8"
+          sources."simple-get-3.0.2"
           sources."thunky-1.0.2"
         ];
       })
@@ -44146,7 +44015,7 @@ in
     dependencies = [
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
-      sources."@types/node-9.6.2"
+      sources."@types/node-10.0.4"
       sources."JSONSelect-0.2.1"
       sources."abbrev-1.1.1"
       sources."acorn-5.5.3"
@@ -44165,32 +44034,26 @@ in
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
           sources."async-2.6.0"
-          sources."camelcase-1.2.1"
+          sources."camelcase-2.1.1"
           sources."cli-cursor-1.0.2"
-          sources."cliui-3.2.0"
+          sources."cliui-4.1.0"
           sources."debug-3.1.0"
           sources."decamelize-1.2.0"
           sources."domelementtype-1.1.3"
-          sources."es6-promise-3.3.1"
+          sources."es6-promise-4.2.4"
           sources."figures-1.7.0"
-          sources."find-up-2.1.0"
           sources."for-in-0.1.8"
-          sources."globals-11.4.0"
-          sources."got-3.3.1"
+          sources."globals-11.5.0"
+          sources."iconv-lite-0.4.19"
           sources."inquirer-0.12.0"
           sources."is-fullwidth-code-point-1.0.0"
-          sources."latest-version-1.0.1"
-          sources."lazy-cache-0.2.7"
+          sources."isarray-0.0.1"
           sources."mute-stream-0.0.5"
-          sources."object-assign-3.0.0"
           sources."onetime-1.1.0"
-          sources."package-json-1.2.0"
-          sources."parse-json-2.2.0"
-          sources."path-exists-3.0.0"
+          sources."pify-3.0.0"
           sources."pluralize-1.2.1"
           sources."progress-1.1.8"
-          sources."punycode-1.3.2"
-          sources."repeating-1.1.3"
+          sources."punycode-2.1.0"
           sources."restore-cursor-1.0.1"
           sources."run-async-0.1.0"
           sources."rx-lite-3.1.2"
@@ -44198,33 +44061,26 @@ in
           sources."source-map-0.6.1"
           sources."source-map-support-0.5.4"
           sources."string-width-1.0.2"
+          sources."string_decoder-0.10.31"
           sources."strip-ansi-4.0.0"
-          sources."strip-bom-2.0.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
           sources."table-3.8.3"
-          sources."timed-out-2.0.0"
           sources."traverse-0.6.6"
           sources."underscore-1.6.0"
-          sources."update-notifier-0.5.0"
-          sources."which-module-2.0.0"
-          sources."window-size-0.2.0"
-          sources."wordwrap-0.0.2"
           (sources."yargs-11.0.0" // {
             dependencies = [
               sources."camelcase-4.1.0"
-              sources."cliui-4.0.0"
               sources."is-fullwidth-code-point-2.0.0"
               sources."string-width-2.1.1"
             ];
           })
-          sources."yargs-parser-9.0.2"
         ];
       })
-      sources."adm-zip-0.4.7"
+      sources."adm-zip-0.4.9"
+      sources."agent-base-4.2.0"
       sources."ajv-6.3.0"
       sources."ajv-keywords-2.1.1"
       sources."ajv-merge-patch-3.0.0"
-      sources."align-text-0.1.4"
       sources."anchor-markdown-header-0.5.7"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.1.0"
@@ -44267,14 +44123,15 @@ in
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
+      sources."ast-types-0.11.3"
       sources."async-0.2.10"
       sources."async-each-1.0.1"
       sources."asynckit-0.4.0"
-      sources."atob-2.1.0"
+      sources."atob-2.1.1"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."babel-code-frame-6.26.0"
-      sources."babel-core-6.26.0"
+      sources."babel-core-6.26.3"
       sources."babel-generator-6.26.1"
       sources."babel-helpers-6.24.1"
       sources."babel-messages-6.23.0"
@@ -44294,7 +44151,7 @@ in
       sources."babel-traverse-6.26.0"
       sources."babel-types-6.26.0"
       sources."babylon-6.18.0"
-      sources."bail-1.0.2"
+      sources."bail-1.0.3"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -44316,11 +44173,14 @@ in
       sources."boom-4.3.1"
       sources."bops-0.1.1"
       sources."boundary-1.0.1"
-      sources."boxen-0.3.1"
+      sources."boxen-1.3.0"
       sources."brace-expansion-1.1.11"
       sources."braces-2.3.2"
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-0.1.1"
       sources."buffer-crc32-0.2.13"
       sources."buffer-equal-constant-time-1.0.1"
+      sources."buffer-fill-0.1.1"
       sources."buffer-from-1.0.0"
       sources."builtin-modules-1.1.1"
       (sources."bunyan-1.8.12" // {
@@ -44329,19 +44189,19 @@ in
           sources."rimraf-2.4.5"
         ];
       })
+      sources."bytes-3.0.0"
       sources."cache-base-1.0.1"
       sources."caller-path-0.1.0"
       sources."callsites-0.2.0"
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."caseless-0.12.0"
-      sources."ccount-1.0.2"
-      sources."center-align-0.1.3"
+      sources."ccount-1.0.3"
       sources."chalk-2.3.2"
-      sources."character-entities-1.2.1"
-      sources."character-entities-html4-1.1.1"
-      sources."character-entities-legacy-1.1.1"
-      sources."character-reference-invalid-1.1.1"
+      sources."character-entities-1.2.2"
+      sources."character-entities-html4-1.1.2"
+      sources."character-entities-legacy-1.1.2"
+      sources."character-reference-invalid-1.1.2"
       sources."chardet-0.4.2"
       (sources."cheerio-1.0.0-rc.2" // {
         dependencies = [
@@ -44366,13 +44226,12 @@ in
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
-      sources."clite-0.3.0"
-      sources."cliui-2.1.0"
+      sources."cliui-3.2.0"
       sources."clone-1.0.4"
       sources."clone-deep-0.3.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."collapse-white-space-1.0.3"
+      sources."collapse-white-space-1.0.4"
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
@@ -44385,11 +44244,7 @@ in
       sources."compress-commons-1.2.2"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
-      (sources."configstore-1.4.0" // {
-        dependencies = [
-          sources."uuid-2.0.3"
-        ];
-      })
+      sources."configstore-3.1.2"
       sources."convert-source-map-1.5.1"
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.5.5"
@@ -44409,19 +44264,26 @@ in
       sources."css-what-2.1.0"
       sources."d-1.0.0"
       sources."dashdash-1.14.1"
+      sources."data-uri-to-buffer-1.2.0"
       sources."debounce-1.1.0"
       sources."debug-2.6.9"
-      sources."decamelize-2.0.0"
+      (sources."decamelize-2.0.0" // {
+        dependencies = [
+          sources."xregexp-4.0.0"
+        ];
+      })
       sources."decode-uri-component-0.2.0"
       sources."deep-equal-1.0.1"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."deep-is-0.1.3"
       sources."deepcopy-0.6.3"
       sources."deepmerge-2.1.0"
       sources."defaults-1.0.3"
       sources."define-property-2.0.2"
+      sources."degenerator-1.0.4"
       sources."del-2.2.2"
       sources."delayed-stream-1.0.0"
+      sources."depd-1.1.1"
       sources."detect-indent-4.0.0"
       (sources."dispensary-0.16.0" // {
         dependencies = [
@@ -44434,14 +44296,12 @@ in
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.1"
       sources."domutils-1.5.1"
-      sources."dot-prop-3.0.0"
+      sources."dot-prop-4.2.0"
       sources."dtrace-provider-0.8.6"
-      sources."duplexer2-0.1.4"
       sources."duplexer3-0.1.4"
-      sources."duplexify-3.5.4"
       sources."ecc-jsbn-0.1.1"
       sources."ecdsa-sig-formatter-1.0.9"
-      sources."email-validator-1.1.1"
+      sources."email-validator-2.0.3"
       sources."emoji-regex-6.1.3"
       sources."encoding-0.1.12"
       sources."end-of-stream-1.4.1"
@@ -44461,6 +44321,7 @@ in
       sources."es6-symbol-3.1.1"
       sources."es6-weak-map-2.0.2"
       sources."escape-string-regexp-1.0.5"
+      sources."escodegen-1.9.1"
       sources."escope-3.6.0"
       (sources."eslint-4.19.0" // {
         dependencies = [
@@ -44526,9 +44387,9 @@ in
       sources."fd-slicer-1.0.1"
       sources."figures-2.0.0"
       sources."file-entry-cache-2.0.0"
+      sources."file-uri-to-path-1.0.0"
       sources."fill-range-4.0.0"
-      sources."filled-array-1.1.0"
-      sources."find-up-1.1.2"
+      sources."find-up-2.1.0"
       (sources."firefox-profile-1.1.0" // {
         dependencies = [
           sources."async-2.5.0"
@@ -44543,9 +44404,15 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
       sources."fragment-cache-0.2.1"
+      sources."fs-constants-1.0.0"
       sources."fs-extra-4.0.3"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
+      (sources."ftp-0.3.10" // {
+        dependencies = [
+          sources."readable-stream-1.1.14"
+        ];
+      })
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       (sources."fx-runner-1.0.8" // {
@@ -44560,6 +44427,11 @@ in
       sources."generate-object-property-1.2.0"
       sources."get-caller-file-1.0.2"
       sources."get-stream-3.0.0"
+      (sources."get-uri-2.0.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."gettext-parser-1.1.0"
@@ -44577,7 +44449,7 @@ in
       sources."global-dirs-0.1.1"
       sources."globals-9.18.0"
       sources."globby-5.0.0"
-      sources."got-5.7.1"
+      sources."got-6.7.1"
       sources."graceful-fs-4.1.11"
       sources."graceful-readlink-1.0.1"
       sources."graphlib-2.1.5"
@@ -44596,12 +44468,14 @@ in
       sources."home-or-tmp-2.0.0"
       sources."hosted-git-info-2.6.0"
       sources."htmlparser2-3.9.2"
+      sources."http-errors-1.6.2"
+      sources."http-proxy-agent-2.1.0"
       sources."http-signature-1.2.0"
+      sources."https-proxy-agent-2.2.1"
       sources."iconv-lite-0.4.21"
-      sources."ignore-3.3.7"
+      sources."ignore-3.3.8"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
-      sources."infinity-agent-2.0.3"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
@@ -44609,23 +44483,24 @@ in
       sources."interpret-1.1.0"
       sources."invariant-2.2.4"
       sources."invert-kv-1.0.0"
+      sources."ip-1.1.5"
       sources."is-absolute-0.1.7"
       sources."is-accessor-descriptor-1.0.0"
-      sources."is-alphabetical-1.0.1"
-      sources."is-alphanumerical-1.0.1"
+      sources."is-alphabetical-1.0.2"
+      sources."is-alphanumerical-1.0.2"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
       sources."is-builtin-module-1.0.0"
       sources."is-data-descriptor-1.0.0"
-      sources."is-decimal-1.0.1"
+      sources."is-decimal-1.0.2"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
       sources."is-finite-1.0.2"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.0"
-      sources."is-hexadecimal-1.0.1"
+      sources."is-hexadecimal-1.0.2"
       sources."is-installed-globally-0.1.0"
       sources."is-mergeable-object-1.1.0"
       sources."is-my-ip-valid-1.0.0"
@@ -44648,6 +44523,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
       sources."is-windows-1.0.2"
+      sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
       sources."isemail-1.2.0"
       sources."isexe-2.0.0"
@@ -44678,26 +44554,27 @@ in
       sources."jwa-1.1.5"
       sources."jws-3.1.4"
       sources."kind-of-3.2.2"
-      sources."latest-version-2.0.0"
-      sources."lazy-cache-1.0.4"
+      sources."latest-version-3.1.0"
+      sources."lazy-cache-0.2.7"
       sources."lazystream-1.0.0"
       sources."lcid-1.0.0"
       sources."levn-0.3.0"
       sources."load-json-file-1.1.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash.assign-4.2.0"
+      sources."lodash.assignin-4.2.0"
       sources."lodash.clonedeep-4.5.0"
-      sources."lodash.defaults-4.2.0"
-      sources."lodash.defaultsdeep-4.6.0"
-      sources."lodash.mergewith-4.6.1"
+      sources."lodash.flatten-4.4.0"
+      sources."lodash.get-4.4.2"
       sources."lodash.once-4.1.1"
+      sources."lodash.set-4.3.2"
       sources."lodash.sortby-4.7.0"
-      sources."longest-1.0.1"
       sources."longest-streak-1.0.0"
       sources."loose-envify-1.3.1"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.2"
+      sources."macos-release-1.1.0"
       sources."make-dir-1.2.0"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
@@ -44721,7 +44598,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.22.0"
+      sources."moment-2.22.1"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."mv-2.1.1"
@@ -44730,19 +44607,18 @@ in
       sources."nanomatch-1.2.9"
       sources."natural-compare-1.4.0"
       sources."natural-compare-lite-1.4.0"
-      sources."nconf-0.7.2"
+      sources."nconf-0.10.0"
       sources."ncp-2.0.0"
-      (sources."needle-2.2.0" // {
+      (sources."needle-2.2.1" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
       })
-      sources."neo-async-2.5.0"
-      sources."nested-error-stacks-1.0.2"
+      sources."neo-async-2.5.1"
+      sources."netmask-1.0.6"
       sources."next-tick-1.0.0"
       sources."node-forge-0.7.5"
       sources."node-notifier-5.2.1"
-      sources."node-status-codes-1.0.0"
       sources."nomnom-1.8.1"
       sources."normalize-package-data-2.4.0"
       sources."normalize-path-2.1.1"
@@ -44757,26 +44633,27 @@ in
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."open-0.0.5"
+      sources."opn-5.3.0"
       sources."optionator-0.8.2"
       sources."os-homedir-1.0.2"
       sources."os-locale-2.1.0"
-      sources."os-name-1.0.3"
+      sources."os-name-2.0.1"
       sources."os-shim-0.1.3"
       sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      sources."osx-release-1.1.0"
       sources."p-finally-1.0.0"
       sources."p-limit-1.2.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
-      sources."package-json-2.4.0"
+      sources."pac-proxy-agent-2.0.2"
+      sources."pac-resolver-3.0.0"
+      sources."package-json-4.0.1"
       sources."pako-1.0.6"
-      sources."parse-entities-1.1.1"
+      sources."parse-entities-1.1.2"
       sources."parse-json-4.0.0"
       sources."parse5-3.0.3"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
-      sources."path-exists-2.1.0"
+      sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
@@ -44810,15 +44687,15 @@ in
       sources."process-nextick-args-2.0.0"
       sources."progress-2.0.0"
       sources."promise-7.3.1"
+      sources."proxy-agent-3.0.0"
       sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
-      sources."querystring-0.2.0"
+      sources."qs-6.5.2"
       sources."quick-format-unescaped-1.1.2"
-      sources."rc-1.2.6"
-      sources."read-all-stream-3.1.0"
+      sources."raw-body-2.3.2"
+      sources."rc-1.2.7"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.6"
@@ -44851,27 +44728,27 @@ in
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."require-uncached-1.0.3"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."resolve-from-1.0.1"
       sources."resolve-url-0.2.1"
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
-      sources."right-align-0.1.3"
       sources."rimraf-2.6.2"
       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."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-json-stringify-1.1.0"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
+      sources."secure-keys-1.0.0"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
       sources."set-blocking-2.0.0"
       sources."set-immediate-shim-1.0.1"
       sources."set-value-2.0.0"
+      sources."setprototypeof-1.0.3"
       sources."sha.js-2.4.11"
       (sources."shallow-clone-0.1.2" // {
         dependencies = [
@@ -44911,7 +44788,7 @@ in
       sources."signal-exit-3.0.2"
       sources."slash-1.0.0"
       sources."slice-ansi-1.0.0"
-      sources."slide-1.1.6"
+      sources."smart-buffer-1.1.15"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
           (sources."define-property-0.2.5" // {
@@ -44926,73 +44803,52 @@ in
       sources."snapdragon-node-2.1.1"
       sources."snapdragon-util-3.0.1"
       sources."sntp-2.1.0"
-      (sources."snyk-1.71.0" // {
+      (sources."snyk-1.78.1" // {
         dependencies = [
+          sources."ansi-escapes-3.1.0"
           sources."ansi-regex-2.1.1"
-          sources."ansi-styles-2.2.1"
           sources."async-1.5.2"
-          sources."camelcase-3.0.0"
-          sources."chalk-1.1.3"
-          sources."inquirer-1.0.3"
-          sources."mute-stream-0.0.6"
+          sources."chalk-2.4.1"
+          sources."cli-cursor-2.1.0"
+          sources."figures-2.0.0"
+          sources."inquirer-3.3.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."mute-stream-0.0.7"
+          sources."onetime-2.0.1"
           sources."os-locale-1.4.0"
+          sources."restore-cursor-2.0.0"
           sources."run-async-2.3.0"
+          sources."rx-lite-4.0.8"
+          sources."string-width-2.1.1"
           sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-          sources."yargs-3.15.0"
-        ];
-      })
-      (sources."snyk-config-1.0.1" // {
-        dependencies = [
-          sources."async-0.9.2"
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-go-plugin-1.4.6"
-      sources."snyk-gradle-plugin-1.2.0"
-      (sources."snyk-module-1.8.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-mvn-plugin-1.1.1"
-      (sources."snyk-nuget-plugin-1.3.9" // {
-        dependencies = [
-          sources."es6-promise-4.2.4"
+          sources."yargs-3.32.0"
         ];
       })
-      sources."snyk-php-plugin-1.3.2"
-      (sources."snyk-policy-1.10.2" // {
+      (sources."snyk-config-2.1.0" // {
         dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-python-plugin-1.5.7"
-      (sources."snyk-resolve-1.0.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      (sources."snyk-resolve-deps-1.7.0" // {
-        dependencies = [
-          sources."configstore-2.1.0"
-          sources."debug-2.6.9"
-          sources."update-notifier-0.6.3"
-          sources."uuid-2.0.3"
-          sources."yargs-4.8.1"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
         ];
       })
-      (sources."snyk-sbt-plugin-1.2.5" // {
+      sources."snyk-go-plugin-1.5.0"
+      sources."snyk-gradle-plugin-1.3.0"
+      sources."snyk-module-1.8.2"
+      sources."snyk-mvn-plugin-1.2.0"
+      sources."snyk-nuget-plugin-1.4.0"
+      sources."snyk-php-plugin-1.5.0"
+      sources."snyk-policy-1.12.0"
+      sources."snyk-python-plugin-1.6.0"
+      sources."snyk-resolve-1.0.1"
+      sources."snyk-resolve-deps-3.1.0"
+      (sources."snyk-sbt-plugin-1.3.0" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
       })
       sources."snyk-tree-1.0.0"
-      (sources."snyk-try-require-1.2.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."snyk-try-require-1.3.0"
+      sources."socks-1.1.10"
+      sources."socks-proxy-agent-3.0.1"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.1"
       (sources."source-map-support-0.5.3" // {
@@ -45017,8 +44873,8 @@ in
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.14.1"
       sources."static-extend-0.1.2"
+      sources."statuses-1.5.0"
       sources."stream-parser-0.3.1"
-      sources."stream-shift-1.0.0"
       sources."stream-to-array-2.3.0"
       (sources."stream-to-promise-2.2.0" // {
         dependencies = [
@@ -45026,10 +44882,9 @@ in
           sources."once-1.3.3"
         ];
       })
-      sources."string-length-1.0.1"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
-      sources."stringify-entities-1.3.1"
+      sources."stringify-entities-1.3.2"
       sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-3.0.0"
@@ -45040,12 +44895,9 @@ in
       sources."structured-source-3.0.2"
       sources."supports-color-2.0.0"
       sources."table-4.0.2"
-      sources."tar-stream-1.5.5"
-      (sources."tempfile-1.1.1" // {
-        dependencies = [
-          sources."uuid-2.0.3"
-        ];
-      })
+      sources."tar-stream-1.6.0"
+      sources."temp-dir-1.0.0"
+      sources."tempfile-2.0.0"
       sources."term-size-1.2.0"
       sources."text-table-0.2.0"
       sources."then-fs-2.0.0"
@@ -45053,8 +44905,10 @@ in
       sources."thenify-all-1.6.0"
       sources."through-2.3.8"
       sources."through2-2.0.3"
-      sources."timed-out-3.1.3"
+      sources."thunkify-2.1.2"
+      sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
+      sources."to-buffer-1.1.1"
       sources."to-fast-properties-1.0.3"
       sources."to-object-path-0.3.0"
       sources."to-regex-3.0.2"
@@ -45068,15 +44922,19 @@ in
       sources."traverse-0.4.6"
       sources."trim-0.0.1"
       sources."trim-right-1.0.1"
-      sources."trim-trailing-lines-1.1.0"
-      sources."trough-1.0.1"
+      sources."trim-trailing-lines-1.1.1"
+      sources."trough-1.0.2"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."typedarray-0.0.6"
-      sources."undefsafe-0.0.3"
+      (sources."undefsafe-2.0.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."underscore-1.8.3"
-      sources."unherit-1.1.0"
+      sources."unherit-1.1.1"
       sources."unified-4.2.1"
       (sources."union-value-1.0.0" // {
         dependencies = [
@@ -45084,10 +44942,11 @@ in
         ];
       })
       sources."unique-string-1.0.0"
-      sources."unist-util-is-2.1.1"
-      sources."unist-util-remove-position-1.1.1"
-      sources."unist-util-visit-1.3.0"
+      sources."unist-util-is-2.1.2"
+      sources."unist-util-remove-position-1.1.2"
+      sources."unist-util-visit-1.3.1"
       sources."universalify-0.1.1"
+      sources."unpipe-1.0.0"
       (sources."unset-value-1.0.0" // {
         dependencies = [
           (sources."has-value-0.3.1" // {
@@ -45097,27 +44956,11 @@ in
           })
         ];
       })
-      sources."unzip-response-1.0.2"
+      sources."unzip-response-2.0.1"
       sources."upath-1.0.4"
-      (sources."update-notifier-2.3.0" // {
-        dependencies = [
-          sources."boxen-1.3.0"
-          sources."configstore-3.1.2"
-          sources."dot-prop-4.2.0"
-          sources."got-6.7.1"
-          sources."latest-version-3.1.0"
-          sources."package-json-4.0.1"
-          sources."pify-3.0.0"
-          sources."timed-out-4.0.1"
-          sources."unzip-response-2.0.1"
-          sources."widest-line-2.0.0"
-          sources."write-file-atomic-2.3.0"
-          sources."xdg-basedir-3.0.0"
-        ];
-      })
+      sources."update-notifier-2.3.0"
       sources."update-section-0.3.3"
       sources."urix-0.1.0"
-      sources."url-0.11.0"
       sources."url-parse-lax-1.0.0"
       (sources."use-3.1.0" // {
         dependencies = [
@@ -45130,7 +44973,7 @@ in
       sources."validate-npm-package-license-3.0.3"
       sources."verror-1.10.0"
       sources."vfile-1.4.0"
-      sources."vfile-location-2.0.2"
+      sources."vfile-location-2.0.3"
       (sources."watchpack-1.5.0" // {
         dependencies = [
           sources."define-property-1.0.0"
@@ -45158,15 +45001,11 @@ in
       })
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-4.0.2"
-      (sources."whatwg-url-6.3.0" // {
-        dependencies = [
-          sources."punycode-2.1.0"
-        ];
-      })
+      sources."whatwg-url-6.3.0"
       sources."when-3.7.7"
       sources."which-1.3.0"
-      sources."which-module-1.0.0"
-      sources."widest-line-1.0.0"
+      sources."which-module-2.0.0"
+      sources."widest-line-2.0.0"
       sources."win-release-1.1.1"
       sources."window-size-0.1.4"
       sources."winreg-0.0.12"
@@ -45174,27 +45013,31 @@ in
       sources."wrap-ansi-2.1.0"
       sources."wrappy-1.0.2"
       sources."write-0.2.1"
-      sources."write-file-atomic-1.3.4"
-      sources."xdg-basedir-2.0.0"
+      sources."write-file-atomic-2.3.0"
+      sources."xdg-basedir-3.0.0"
       sources."xml2js-0.4.19"
       sources."xmlbuilder-9.0.7"
       sources."xmldom-0.1.27"
-      sources."xregexp-4.0.0"
+      sources."xregexp-2.0.0"
       sources."xtend-4.0.1"
       sources."y18n-3.2.1"
       sources."yallist-2.1.2"
       (sources."yargs-6.6.0" // {
         dependencies = [
           sources."camelcase-3.0.0"
-          sources."cliui-3.2.0"
           sources."decamelize-1.2.0"
+          sources."find-up-1.1.2"
           sources."is-fullwidth-code-point-1.0.0"
           sources."os-locale-1.4.0"
+          sources."parse-json-2.2.0"
+          sources."path-exists-2.1.0"
           sources."string-width-1.0.2"
+          sources."strip-bom-2.0.0"
+          sources."which-module-1.0.0"
           sources."yargs-parser-4.2.1"
         ];
       })
-      sources."yargs-parser-2.4.1"
+      sources."yargs-parser-9.0.2"
       sources."yauzl-2.9.1"
       sources."zip-1.2.0"
       (sources."zip-dir-1.0.2" // {
@@ -45233,10 +45076,10 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "1.5.1";
+    version = "1.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-1.5.1.tgz";
-      sha1 = "e8680360e832ac89521eb80dad3a7bc27a40bab4";
+      url = "https://registry.npmjs.org/yarn/-/yarn-1.6.0.tgz";
+      sha1 = "9cec6f7986dc237d39ec705ce74d95155fe55d4b";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -45250,10 +45093,10 @@ in
   yo = nodeEnv.buildNodePackage {
     name = "yo";
     packageName = "yo";
-    version = "2.0.1";
+    version = "2.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yo/-/yo-2.0.1.tgz";
-      sha512 = "390n0gdbxr25mr804mrwfqw6r6srk4q9spnsnnlfvlsfvr6dwd93nrgh0l2sr76a9jdw2jiycwc0241h6zch6hi0jlhg3w8hk6i4hyy";
+      url = "https://registry.npmjs.org/yo/-/yo-2.0.2.tgz";
+      sha512 = "13z42dkmgbs67a3i6wfzf1h3lp54r6xj9p063kyx2nq0v132lqnkss2srl2kayfljcdprr7pw7dfm6h08kqnkhzrlzi1ls7h7cz2qgy";
     };
     dependencies = [
       sources."@sindresorhus/is-0.7.0"
@@ -45333,7 +45176,7 @@ in
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
       sources."decompress-response-3.3.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."default-uid-1.0.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
@@ -45376,8 +45219,9 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.1.2"
       sources."global-dirs-0.1.1"
+      sources."global-tunnel-ng-2.1.1"
       sources."globby-6.1.0"
-      sources."got-8.3.0"
+      sources."got-8.3.1"
       sources."graceful-fs-4.1.11"
       sources."grouped-queue-0.3.3"
       sources."har-schema-2.0.0"
@@ -45404,9 +45248,9 @@ in
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."strip-ansi-4.0.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       (sources."insight-0.8.4" // {
@@ -45471,7 +45315,7 @@ in
       sources."latest-version-3.1.0"
       sources."load-json-file-1.1.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash._getnative-3.9.1"
       sources."lodash.debounce-3.1.1"
       sources."lodash.pad-4.5.1"
@@ -45568,9 +45412,9 @@ in
       sources."process-nextick-args-2.0.0"
       sources."pseudomap-1.0.2"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."query-string-5.1.1"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."read-pkg-1.1.0"
       (sources."read-pkg-up-2.0.0" // {
         dependencies = [
@@ -45598,7 +45442,7 @@ in
       sources."rx-4.1.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."scoped-regex-1.0.0"
       sources."semver-5.5.0"
@@ -45661,6 +45505,7 @@ in
       sources."tmp-0.0.33"
       sources."tough-cookie-2.3.4"
       sources."trim-newlines-1.0.0"
+      sources."tunnel-0.0.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."twig-0.8.9"
@@ -45668,13 +45513,13 @@ in
       sources."unique-string-1.0.0"
       sources."untildify-3.0.2"
       sources."unzip-response-2.0.1"
-      (sources."update-notifier-2.4.0" // {
+      (sources."update-notifier-2.5.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."camelcase-4.1.0"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."execa-0.7.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."url-parse-lax-3.0.0"
@@ -45714,11 +45559,11 @@ in
       (sources."yeoman-environment-2.0.6" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."debug-3.1.0"
           sources."log-symbols-2.2.0"
           sources."pify-2.3.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       (sources."yosay-2.0.2" // {
diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index 2d987cbfb1b..62428e9dbf3 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -15,4 +15,5 @@
 , "vue-cli"
 , "swagger"
 , "npm"
+, "three"
 ]
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 4b2e714c42d..88aed5fd823 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -22,13 +22,13 @@ let
         sha512 = "0ahsk9basb6qimsb40yr40vxxkmmfiqlig23brc5dymic61gfhzg2mzqz5cvkiz2y8g2rwnlwb619fkd3f4hw1yg8bkbczcaxzcrqn0";
       };
     };
-    "@cycle/isolate-3.2.0" = {
+    "@cycle/isolate-3.3.0" = {
       name = "_at_cycle_slash_isolate";
       packageName = "@cycle/isolate";
-      version = "3.2.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.2.0.tgz";
-        sha512 = "1g3jcq2dmxpqn3nyvclbf9hnp18h4c41vsqywp2yf2mda92bzdjwidq8f231yxb6rs6r39zpvn741kjify4h5zl4d8ix1xigilbcyj7";
+        url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.3.0.tgz";
+        sha512 = "0406glnab9c4579lfqikh8w67xjd7fvll3sysxy80sxjv3iaks6w08bgjl8418pk2x0iid8shd3ad7xqiw1lvdjarxnrydmnj3c8mjq";
       };
     };
     "@cycle/run-3.4.0" = {
@@ -49,13 +49,13 @@ let
         sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7";
       };
     };
-    "@types/node-9.6.2" = {
+    "@types/node-10.0.4" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "9.6.2";
+      version = "10.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz";
-        sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.0.4.tgz";
+        sha512 = "2zwjjfa4s706r0w45siwgzax5c8g5j3z79dkckwzgrzqxglj070ijv0m9g1ipc1y4kr7l0r9qia9yfxc9syw64hib8vh216cxk1las6";
       };
     };
     "@types/superagent-3.5.6" = {
@@ -481,13 +481,13 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "atob-2.1.0" = {
+    "atob-2.1.1" = {
       name = "atob";
       packageName = "atob";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz";
-        sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a";
+        url = "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz";
+        sha1 = "ae2d5a729477f289d60dd7f96a6314a22dd6c22a";
       };
     };
     "atomic-batcher-1.0.2" = {
@@ -940,13 +940,13 @@ let
         sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
       };
     };
-    "chalk-2.3.2" = {
+    "chalk-2.4.1" = {
       name = "chalk";
       packageName = "chalk";
-      version = "2.3.2";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz";
-        sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4";
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz";
+        sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr";
       };
     };
     "chardet-0.4.2" = {
@@ -1228,13 +1228,13 @@ let
         sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
     };
-    "colors-1.2.1" = {
+    "colors-1.2.4" = {
       name = "colors";
       packageName = "colors";
-      version = "1.2.1";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz";
-        sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk";
+        url = "https://registry.npmjs.org/colors/-/colors-1.2.4.tgz";
+        sha512 = "1ch53w9md043zff52vsmh89qirws3x7n4zw88xxw0h98fjg71dsll3gh1b598a48xq98d15qpjb07g9ddjsfknrba0byp56fl3a53z9";
       };
     };
     "combine-errors-3.0.3" = {
@@ -1570,13 +1570,13 @@ let
         sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad";
       };
     };
-    "dat-doctor-1.3.1" = {
+    "dat-doctor-1.4.0" = {
       name = "dat-doctor";
       packageName = "dat-doctor";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.3.1.tgz";
-        sha512 = "19cfxdik2pv94dbfsz4nm6a0v6vfx5s1isaagmsjrb44czbcl55sjj9nf1302hqc8ckijsdmlsrna02hb0mjzzhsy0m6c8r3cv0wabk";
+        url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz";
+        sha512 = "3ysgc2z0pjbka9617lqykw8c0bqbacgixd6j8nlcdi7sz7j94w2sl17mq3xaq7b6kr5wdngi64y584hj8baqgxw2aaavgvk96kff3fl";
       };
     };
     "dat-encoding-4.0.2" = {
@@ -1669,22 +1669,13 @@ let
         sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c";
       };
     };
-    "dat-swarm-defaults-1.0.0" = {
+    "dat-swarm-defaults-1.0.1" = {
       name = "dat-swarm-defaults";
       packageName = "dat-swarm-defaults";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.0.tgz";
-        sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354";
-      };
-    };
-    "datland-swarm-defaults-1.0.2" = {
-      name = "datland-swarm-defaults";
-      packageName = "datland-swarm-defaults";
-      version = "1.0.2";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/datland-swarm-defaults/-/datland-swarm-defaults-1.0.2.tgz";
-        sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0";
+        url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.1.tgz";
+        sha512 = "0kgq4nz4axx3kpfam6lxid88x5gx39gbk3kzcgmbhxld9vwl3469q58hkd2zjripg3955483j450yvszk1pwpn895adz62mn0xsarag";
       };
     };
     "debug-2.2.0" = {
@@ -1786,13 +1777,13 @@ let
         sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d";
       };
     };
-    "deep-extend-0.4.2" = {
+    "deep-extend-0.5.1" = {
       name = "deep-extend";
       packageName = "deep-extend";
-      version = "0.4.2";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz";
-        sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz";
+        sha512 = "3bzqm7nqgh7m8xjhl0q8jc0ccm9riymsfmy0144x6n2qy9v1gin2ww8s9wjlayk0xyzq9cz9pyar02yiv30mhqsj7rmw35ywrsc3jrp";
       };
     };
     "define-property-0.2.5" = {
@@ -2047,13 +2038,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "duplexify-3.5.4" = {
+    "duplexify-3.6.0" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.5.4";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz";
-        sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7";
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz";
+        sha512 = "12hhn0igd7y8nmni0qd63wpc9w1fl5rgdh4d1mq65n6r00l7byh7fs5v6m6pd8xzwmnxhrxqrc1y5yh6hswbh2i9ic9la21if5w7vbw";
       };
     };
     "ecc-jsbn-0.1.1" = {
@@ -2605,6 +2596,15 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
+    "fs-constants-1.0.0" = {
+      name = "fs-constants";
+      packageName = "fs-constants";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz";
+        sha512 = "2iv1j05gzx1sgpckd597sdd2f5x54rgcib3rpwgf31050wqxn5h27map6cn9wk4vix393s4ws2xv6kgps5zfby2iirb2zw8hk1818yb";
+      };
+    };
     "fs-extra-0.24.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -2641,13 +2641,13 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-1.1.3" = {
+    "fsevents-1.2.3" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.1.3";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz";
-        sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz";
+        sha512 = "3nsv4z5qk2hhcrp6bng9bzpj4nsk0b41i363phlqfp69dq1p2x6a1g3y86z2j7aj4mfj88y1i1agkb1y0pg5c388223h394jqxppvjz";
       };
     };
     "fstream-1.0.11" = {
@@ -3046,13 +3046,13 @@ let
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
-    "hypercore-6.13.0" = {
+    "hypercore-6.14.0" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.13.0";
+      version = "6.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz";
-        sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.14.0.tgz";
+        sha512 = "3liw77yhvn3nlrczf9s30vvn4bxrn3glh65a2psy1va9pvcnjwx6wfh52v5l9qbd7zyp4q4nb7qrq0n3am7jwmz3dkb5fzvdnlwikkh";
       };
     };
     "hypercore-protocol-6.6.4" = {
@@ -3910,13 +3910,13 @@ let
         sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6";
       };
     };
-    "lodash-4.17.5" = {
+    "lodash-4.17.10" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.5";
+      version = "4.17.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz";
-        sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
+        sha512 = "1ba5b80jjzwrh9fbdk5ywv8sic0dynij21wgrfxsfjzwvwd7x1n6azdhdc0vjdxqmcpm0mhshd1k7n2ascxpz00z3p8a3k97mwg1s2i";
       };
     };
     "lodash-compat-3.10.2" = {
@@ -4567,13 +4567,13 @@ let
         sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1";
       };
     };
-    "mirror-folder-2.1.1" = {
+    "mirror-folder-2.2.0" = {
       name = "mirror-folder";
       packageName = "mirror-folder";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz";
-        sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604";
+        url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.2.0.tgz";
+        sha512 = "3js8pwgmj4lzzi6nzl0wp021rhsnz31jpkkzdf35xzwm1l65m6ygjf4hz77vvy3dk2h5jb2d32nvzy26n3d5hswg3nb8s0rylvv510r";
       };
     };
     "mixin-deep-1.3.1" = {
@@ -4801,13 +4801,13 @@ let
         sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d";
       };
     };
-    "needle-2.2.0" = {
+    "needle-2.2.1" = {
       name = "needle";
       packageName = "needle";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz";
-        sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq";
+        url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz";
+        sha512 = "3wnlvqmkxw69bl3clghqpsl1kxqm7hkq4v4ab0rm6dx7xqyg3bn8q38i6hmxm47ccfn6bxcvl53c4madxdgblnm06ika99x4g06rxmp";
       };
     };
     "nets-3.2.0" = {
@@ -4846,13 +4846,13 @@ let
         sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8";
       };
     };
-    "nodemon-1.17.3" = {
+    "nodemon-1.17.4" = {
       name = "nodemon";
       packageName = "nodemon";
-      version = "1.17.3";
+      version = "1.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz";
-        sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh";
+        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.4.tgz";
+        sha512 = "3bmxd7fd494gy4ddax3mihjz1iy484iakyssbhy87cc2kwbky9xkb8l47vphc3n858q9p9afxl57w0849i24amsdjhwbqh8vxhjy1v5";
       };
     };
     "nopt-1.0.10" = {
@@ -5503,13 +5503,13 @@ let
         sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
       };
     };
-    "qs-6.5.1" = {
+    "qs-6.5.2" = {
       name = "qs";
       packageName = "qs";
-      version = "6.5.1";
+      version = "6.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
-        sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r";
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
+        sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
       };
     };
     "raf-3.3.2" = {
@@ -5539,13 +5539,13 @@ let
         sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2";
       };
     };
-    "random-access-storage-1.1.1" = {
+    "random-access-storage-1.2.0" = {
       name = "random-access-storage";
       packageName = "random-access-storage";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz";
-        sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1";
+        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.2.0.tgz";
+        sha512 = "3jz9jky55s8w0pd5q2v58fxdgca5ymbhlif0zn6jv55jr7bvp1xvn60bz4b2k6m399zzxzdk196385wl3gw6xasxzi3mq8xkp9al118";
       };
     };
     "randomatic-1.1.7" = {
@@ -5584,13 +5584,13 @@ let
         sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca";
       };
     };
-    "rc-1.2.6" = {
+    "rc-1.2.7" = {
       name = "rc";
       packageName = "rc";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz";
-        sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz";
+        sha512 = "30b4pqzhk8f4ppzyk5diwxac7xpf4hd3rysyin012l59da9v5iaai4wd6yzlz3rjspfvvy191q6qcsw47mwlw9y07n35kzq23rw7lid";
       };
     };
     "read-1.0.7" = {
@@ -5881,13 +5881,13 @@ let
         sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
       };
     };
-    "safe-buffer-5.1.1" = {
+    "safe-buffer-5.1.2" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.1.1";
+      version = "5.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
       };
     };
     "safe-regex-1.1.0" = {
@@ -6187,13 +6187,13 @@ let
         sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah";
       };
     };
-    "sodium-native-2.1.5" = {
+    "sodium-native-2.1.6" = {
       name = "sodium-native";
       packageName = "sodium-native";
-      version = "2.1.5";
+      version = "2.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz";
-        sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var";
+        url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz";
+        sha512 = "3y0f008galwxign4qb49q2kfkhz68nfxazpcq5y63wahaqly89x640nnv8cv4rg9xn1vbp5wia76vkmh1ja13dp95vjzw2lv5q2zymx";
       };
     };
     "sodium-universal-2.0.0" = {
@@ -6574,6 +6574,15 @@ let
         sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1";
       };
     };
+    "superagent-3.8.3" = {
+      name = "superagent";
+      packageName = "superagent";
+      version = "3.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz";
+        sha512 = "0a4ra91hgzbhnyccsx319r1xzaw4cb3k144g7xrp10y3wckzd98vxhf5vk34cfvvlrav8pyf2vqr11scimkiyivg2w84458q0n2vd0q";
+      };
+    };
     "supports-color-1.2.0" = {
       name = "supports-color";
       packageName = "supports-color";
@@ -6601,13 +6610,13 @@ let
         sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
       };
     };
-    "supports-color-5.3.0" = {
+    "supports-color-5.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "5.3.0";
+      version = "5.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz";
-        sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz";
+        sha512 = "3ks7qkl6s064qcdc5qnpzcwzcrnlzccz9m3faw54fnmsm2k8fzb9saqr5nhx7w9lnd4nbp0zg047zz8mwsd4fxfnalpb7kra619fdnf";
       };
     };
     "swagger-converter-0.1.7" = {
@@ -6673,22 +6682,22 @@ let
         sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1";
       };
     };
-    "tar-4.4.1" = {
+    "tar-4.4.2" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.1";
+      version = "4.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz";
-        sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz";
+        sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85";
       };
     };
-    "tar-stream-1.5.5" = {
+    "tar-stream-1.6.0" = {
       name = "tar-stream";
       packageName = "tar-stream";
-      version = "1.5.5";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz";
-        sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr";
+        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz";
+        sha512 = "2kw4php0986jgdzqvrih64plc8md1f1v3wfc8mz3y0lz95dmmvba1lpjmwp1v4crgfky63r8an3syfavn3gb0d56xk7615zy40a47cn";
       };
     };
     "term-size-1.2.0" = {
@@ -6790,13 +6799,13 @@ let
         sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d";
       };
     };
-    "to-buffer-1.1.0" = {
+    "to-buffer-1.1.1" = {
       name = "to-buffer";
       packageName = "to-buffer";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.0.tgz";
-        sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa";
+        url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz";
+        sha512 = "1b8wsfz1rp8fsb2kz7isrsx292vl5w4cmx9qvivxqsj61avx9ph1azxa6zr3mc85cz8qddbkxm6ski8zvacmpadc22wp6pv5gk427wp";
       };
     };
     "to-iso-string-0.0.2" = {
@@ -7114,22 +7123,22 @@ let
         sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
       };
     };
-    "upath-1.0.4" = {
+    "upath-1.0.5" = {
       name = "upath";
       packageName = "upath";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz";
-        sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p";
+        url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz";
+        sha512 = "31m1lljcfngdnpyz67gpkwvb66gx6750si3jzmf1vg6kq420fq5lcd34cfgp6wz3manjpqbp9i98ax2yjl2xs7mq824chw38vvsgcm9";
       };
     };
-    "update-notifier-2.4.0" = {
+    "update-notifier-2.5.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "2.4.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz";
-        sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz";
+        sha512 = "07vkna9y5i0ak6rwcbinrrgpabrcmav91ys805c42jskyc6kfla3wd12klsr858vzv5civi7arh5xz8bv7jdj81zgzyh6j70a31s0w3";
       };
     };
     "uri-js-3.0.2" = {
@@ -7222,13 +7231,13 @@ let
         sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
       };
     };
-    "utp-native-1.7.0" = {
+    "utp-native-1.7.1" = {
       name = "utp-native";
       packageName = "utp-native";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz";
-        sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz";
+        url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz";
+        sha512 = "2mflgna04nng4cj8z4pr53pw0fm3z447mvbnvcahlvq8wpg46znrvg4fkgh18k14bkiq3gic5d2h975bgy7h7l64cfjpc8r2km3naqm";
       };
     };
     "uuid-3.2.1" = {
@@ -7519,13 +7528,13 @@ let
         sha1 = "a81981ea70a57946133883f029c5821a89359a7f";
       };
     };
-    "z-schema-3.19.1" = {
+    "z-schema-3.20.0" = {
       name = "z-schema";
       packageName = "z-schema";
-      version = "3.19.1";
+      version = "3.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/z-schema/-/z-schema-3.19.1.tgz";
-        sha512 = "29crh8y7kjqp652n8wpbh4ljd4j579jg9kwaw9anmd8nhkdz5ljg9arxm8wpcpir5rka60l7h3i13mahcrsq95ydl3f1pxfcfm77wwc";
+        url = "https://registry.npmjs.org/z-schema/-/z-schema-3.20.0.tgz";
+        sha512 = "2fmqk4rayvsp7kjhfmr7ldrwvfvg1aif9dwpsqbqvmsz8j18q5lxs1vm4frg7pla8fwj2xacjzy0fsm2xfqvwmsxa5yxvsb21y5v2pn";
       };
     };
   };
@@ -7576,23 +7585,23 @@ in
     dependencies = [
       sources."@cycle/dom-18.3.0"
       sources."@cycle/http-14.9.0"
-      sources."@cycle/isolate-3.2.0"
+      sources."@cycle/isolate-3.3.0"
       sources."@cycle/run-3.4.0"
       (sources."@cycle/time-0.10.1" // {
         dependencies = [
           sources."chalk-1.1.3"
         ];
       })
-      sources."@types/node-9.6.2"
+      sources."@types/node-10.0.4"
       sources."@types/superagent-3.5.6"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."asynckit-0.4.0"
-      (sources."chalk-2.3.2" // {
+      (sources."chalk-2.4.1" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."chardet-0.4.2"
@@ -7638,7 +7647,7 @@ in
       sources."is-promise-2.1.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash._baseiteratee-4.7.0"
       sources."lodash._basetostring-4.12.0"
       sources."lodash._baseuniq-4.6.0"
@@ -7662,14 +7671,14 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.0"
       sources."pseudomap-1.0.2"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."raf-3.3.2"
       sources."readable-stream-2.3.6"
       sources."restore-cursor-2.0.0"
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."setimmediate-1.0.5"
       sources."shebang-command-1.2.0"
@@ -7758,7 +7767,7 @@ in
       sources."bytes-3.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caseless-0.12.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."circular-append-file-1.0.1"
       sources."cli-truncate-1.1.0"
       sources."cliclopts-1.1.1"
@@ -7766,7 +7775,7 @@ in
       sources."codecs-1.2.1"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -7782,7 +7791,7 @@ in
       sources."cycle-1.0.3"
       sources."dashdash-1.14.1"
       sources."dat-dns-1.3.2"
-      (sources."dat-doctor-1.3.1" // {
+      (sources."dat-doctor-1.4.0" // {
         dependencies = [
           sources."debug-2.6.9"
           sources."dns-packet-1.3.1"
@@ -7823,8 +7832,7 @@ in
       sources."dat-registry-4.0.0"
       sources."dat-secret-storage-4.0.1"
       sources."dat-storage-1.0.4"
-      sources."dat-swarm-defaults-1.0.0"
-      sources."datland-swarm-defaults-1.0.2"
+      sources."dat-swarm-defaults-1.0.1"
       sources."debug-3.1.0"
       sources."deep-equal-0.2.2"
       sources."delayed-stream-1.0.0"
@@ -7849,7 +7857,7 @@ in
       sources."dns-socket-3.0.0"
       sources."dns-txt-2.0.2"
       sources."dom-walk-0.1.1"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."ecc-jsbn-0.1.1"
       sources."end-of-stream-1.4.1"
       sources."escape-string-regexp-1.0.5"
@@ -7884,7 +7892,7 @@ in
       sources."hoek-4.2.1"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.13.0" // {
+      (sources."hypercore-6.14.0" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
@@ -7947,7 +7955,7 @@ in
       sources."min-document-2.19.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mirror-folder-2.1.1"
+      sources."mirror-folder-2.2.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."multi-random-access-2.1.1"
@@ -7993,10 +8001,10 @@ in
       sources."protocol-buffers-encodings-1.1.0"
       sources."pump-2.0.1"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."random-access-file-2.0.1"
       sources."random-access-memory-2.4.0"
-      sources."random-access-storage-1.1.1"
+      sources."random-access-storage-1.2.0"
       (sources."randomatic-1.1.7" // {
         dependencies = [
           (sources."is-number-3.0.0" // {
@@ -8019,14 +8027,14 @@ in
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
       sources."rusha-0.8.13"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."signed-varint-2.0.1"
       sources."simple-sha1-2.1.0"
       sources."siphash24-1.1.0"
       sources."slice-ansi-1.0.0"
       sources."sntp-2.1.0"
       sources."sodium-javascript-0.5.5"
-      sources."sodium-native-2.1.5"
+      sources."sodium-native-2.1.6"
       sources."sodium-universal-2.0.0"
       sources."sorted-array-functions-1.1.0"
       sources."sorted-indexof-1.0.0"
@@ -8048,7 +8056,7 @@ in
           sources."debug-2.6.9"
         ];
       })
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       (sources."throttle-1.0.3" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -8056,7 +8064,7 @@ in
       })
       sources."through2-2.0.3"
       sources."thunky-1.0.2"
-      sources."to-buffer-1.1.0"
+      sources."to-buffer-1.1.1"
       sources."toiletdb-1.4.1"
       sources."tough-cookie-2.3.4"
       sources."township-client-1.3.2"
@@ -8072,7 +8080,7 @@ in
       sources."untildify-3.0.2"
       sources."util-deprecate-1.0.2"
       sources."utile-0.3.0"
-      sources."utp-native-1.7.0"
+      sources."utp-native-1.7.1"
       sources."uuid-3.2.1"
       sources."varint-3.0.1"
       sources."verror-1.10.0"
@@ -8134,10 +8142,10 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "5.0.5";
+    version = "5.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz";
-      sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw";
+      url = "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz";
+      sha512 = "23wcnn35p90xhsc5z94w45s30j756s97acm313h6lacnbliqlaka3drq2xbsi4br8gdkld3r4dc33vglq8kf5jb408c7b2agpyar8lh";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
@@ -8282,11 +8290,11 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.0"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
       sources."request-2.85.0"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.3.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
@@ -8336,10 +8344,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.9.0";
+    version = "0.10.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz";
-      sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz";
+      sha512 = "10s7f95mxnxcwziwzx44l62zy3yjmhky942pw134dbd48wshl7abr1ja8qx1rfzz9vgygcx1vlz1jlldy61da33zq0bfi8bfji09f8v";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -8354,7 +8362,7 @@ in
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
       sources."debug-2.6.9"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
       sources."fs-minipass-1.2.5"
@@ -8375,7 +8383,7 @@ in
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
-      sources."needle-2.2.0"
+      sources."needle-2.2.1"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.0.3"
       sources."npm-packlist-1.1.10"
@@ -8388,14 +8396,14 @@ in
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.0"
-      (sources."rc-1.2.6" // {
+      (sources."rc-1.2.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."readable-stream-2.3.6"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."semver-5.5.0"
@@ -8405,7 +8413,7 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-4.4.1"
+      sources."tar-4.4.2"
       sources."util-deprecate-1.0.2"
       sources."wide-align-1.1.2"
       sources."wrappy-1.0.2"
@@ -8423,10 +8431,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "1.38.3";
+    version = "1.41.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.38.3.tgz";
-      sha1 = "84b7ce1eee5d893c51995752e8afc2ee726539e3";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.41.3.tgz";
+      sha1 = "66b38792c8447702c47553a87dddc5748a3aefca";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -8475,12 +8483,12 @@ in
       sources."graceful-readlink-1.0.1"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."minimatch-3.0.4"
       sources."process-nextick-args-2.0.0"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."set-immediate-shim-1.0.1"
       sources."string_decoder-1.1.1"
       sources."util-deprecate-1.0.2"
@@ -8531,7 +8539,10 @@ in
       sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."buffer-3.6.0"
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-0.1.1"
       sources."buffer-crc32-0.2.13"
+      sources."buffer-fill-0.1.1"
       sources."builtins-1.0.3"
       sources."camelcase-1.2.1"
       sources."capture-stack-trace-1.0.0"
@@ -8542,7 +8553,7 @@ in
         ];
       })
       sources."center-align-0.1.3"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."chardet-0.4.2"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.3.1"
@@ -8611,6 +8622,7 @@ in
       sources."filenamify-2.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
+      sources."fs-constants-1.0.0"
       sources."fs-extra-0.26.7"
       sources."fs.realpath-1.0.0"
       sources."get-proxy-2.1.0"
@@ -8669,7 +8681,7 @@ in
       sources."kind-of-3.2.2"
       sources."klaw-1.3.1"
       sources."lazy-cache-1.0.4"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."log-symbols-2.2.0"
       sources."longest-1.0.1"
       sources."lowercase-keys-1.0.1"
@@ -8714,7 +8726,7 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proto-list-1.2.4"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."read-metadata-1.0.0"
       sources."readable-stream-2.3.6"
       sources."recursive-readdir-2.2.2"
@@ -8730,7 +8742,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."seek-bzip-1.0.5"
       sources."semver-5.5.0"
@@ -8746,14 +8758,15 @@ in
       sources."strip-ansi-4.0.0"
       sources."strip-dirs-2.1.0"
       sources."strip-outer-1.0.1"
-      sources."supports-color-5.3.0"
-      sources."tar-stream-1.5.5"
+      sources."supports-color-5.4.0"
+      sources."tar-stream-1.6.0"
       sources."through-2.3.8"
       sources."thunkify-2.1.2"
       sources."thunkify-wrap-1.0.4"
       sources."tildify-1.2.0"
       sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
+      sources."to-buffer-1.1.1"
       sources."toml-2.3.3"
       sources."tough-cookie-2.3.4"
       sources."trim-repeated-1.0.0"
@@ -8839,7 +8852,7 @@ in
       sources."async-1.5.2"
       sources."async-each-1.0.1"
       sources."asynckit-0.4.0"
-      sources."atob-2.1.0"
+      sources."atob-2.1.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -8917,7 +8930,7 @@ in
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."define-property-2.0.2"
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
@@ -8961,7 +8974,7 @@ in
       sources."from-0.1.7"
       sources."fs-extra-0.24.0"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.2"
@@ -9026,13 +9039,13 @@ in
         dependencies = [
           sources."debug-3.1.0"
           sources."ms-2.0.0"
-          sources."qs-6.5.1"
-          sources."superagent-3.8.2"
+          sources."qs-6.5.2"
+          sources."superagent-3.8.3"
         ];
       })
       (sources."json-schema-deref-sync-0.3.4" // {
         dependencies = [
-          sources."lodash-4.17.5"
+          sources."lodash-4.17.10"
         ];
       })
       sources."jsonfile-2.4.0"
@@ -9115,11 +9128,11 @@ in
       sources."nan-2.10.0"
       sources."nanomatch-1.2.9"
       sources."native-promise-only-0.8.1"
-      (sources."nodemon-1.17.3" // {
+      (sources."nodemon-1.17.4" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."debug-3.1.0"
           sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
@@ -9146,7 +9159,7 @@ in
           sources."lru-cache-4.1.2"
           sources."minimist-1.2.0"
           sources."strip-ansi-4.0.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."nopt-1.0.10"
@@ -9187,7 +9200,7 @@ in
           sources."bytes-2.1.0"
         ];
       })
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
       sources."readline2-1.0.1"
@@ -9205,7 +9218,7 @@ in
       sources."rimraf-2.6.2"
       sources."run-async-0.1.0"
       sources."rx-lite-3.1.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."sanitize-filename-1.6.1"
       sources."semver-5.5.0"
@@ -9287,7 +9300,7 @@ in
           sources."form-data-1.0.0-rc3"
           sources."formidable-1.0.17"
           sources."isarray-0.0.1"
-          sources."lodash-4.17.5"
+          sources."lodash-4.17.10"
           sources."mime-1.3.4"
           sources."ms-0.7.1"
           sources."object-assign-3.0.0"
@@ -9337,8 +9350,8 @@ in
         ];
       })
       sources."unzip-response-2.0.1"
-      sources."upath-1.0.4"
-      sources."update-notifier-2.4.0"
+      sources."upath-1.0.5"
+      sources."update-notifier-2.5.0"
       sources."uri-js-3.0.2"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
@@ -9362,7 +9375,7 @@ in
       sources."xtend-4.0.1"
       sources."yallist-2.1.2"
       sources."yargs-3.10.0"
-      sources."z-schema-3.19.1"
+      sources."z-schema-3.20.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -9376,10 +9389,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.8.0";
+    version = "6.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz";
-      sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f";
+      url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz";
+      sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -9390,4 +9403,21 @@ in
     production = true;
     bypassCache = true;
   };
+  three = nodeEnv.buildNodePackage {
+    name = "three";
+    packageName = "three";
+    version = "0.92.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/three/-/three-0.92.0.tgz";
+      sha1 = "8d3d1f5af890e62da7f4cb45d20c09fa51057dcd";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "JavaScript 3D library";
+      homepage = https://threejs.org/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
 }
\ No newline at end of file
-- 
GitLab


From 4e9892f84591b16333c51da081b6d69d6e875f59 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 24 Apr 2018 15:36:02 +0200
Subject: [PATCH 0175/1085] nodePackages_8_x.mathjax: Init at 2.7.4

---
 .../node-packages/node-packages-v8.json         |  1 +
 .../node-packages/node-packages-v8.nix          | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index 62428e9dbf3..4236064c754 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -16,4 +16,5 @@
 , "swagger"
 , "npm"
 , "three"
+, "mathjax"
 ]
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 88aed5fd823..e64364eb68b 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -9420,4 +9420,21 @@ in
     production = true;
     bypassCache = true;
   };
+  mathjax = nodeEnv.buildNodePackage {
+    name = "mathjax";
+    packageName = "mathjax";
+    version = "2.7.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.4.tgz";
+      sha512 = "37hnj84ls531nqjxr4r6k4bjbqz4zqpb9adg7k6klah8dlj3rh38j4p8mbjh4h0v7r575kkc528rspincfabpm4j8y5v68kh6v8p907";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers.";
+      homepage = "https://github.com/mathjax/MathJax#readme";
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = true;
+  };
 }
\ No newline at end of file
-- 
GitLab


From fe24a0fa386e8a45919904ee62a35c11712f71ae Mon Sep 17 00:00:00 2001
From: Demyan Rogozhin <demyan.rogozhin@gmail.com>
Date: Sat, 5 May 2018 00:45:24 +0200
Subject: [PATCH 0176/1085] particl-core: init at 0.16.0.4

Particl is privacy-focused altcoin build for p2p eCommerce.
Added Particl Core - daemon used to run staking node.
---
 maintainers/maintainer-list.nix               |  5 ++
 pkgs/applications/altcoins/default.nix        |  2 +
 .../altcoins/particl/particl-core.nix         | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/altcoins/particl/particl-core.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9369a76688c..782a3ee6aad 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -998,6 +998,11 @@
     github = "demin-dmitriy";
     name = "Dmitriy Demin";
   };
+  demyanrogozhin = {
+    email = "demyan.rogozhin@gmail.com";
+    github = "demyanrogozhin";
+    name = "Demyan Rogozhin";
+  };
   derchris = {
     email = "derchris@me.com";
     github = "derchrisuk";
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index fa704b59659..9915e0a301a 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -87,4 +87,6 @@ rec {
   parity = callPackage ./parity { };
   parity-beta = callPackage ./parity/beta.nix { };
   parity-ui = callPackage ./parity-ui { };
+
+  particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; withGui = false; };
 }
diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
new file mode 100644
index 00000000000..c9454963b22
--- /dev/null
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, autoconf
+, automake
+, autoreconfHook
+, boost
+, db48
+, fetchurl
+, libevent
+, libtool
+, miniupnpc
+, openssl
+, pkgconfig
+, utillinux
+, zeromq
+, zlib
+, withGui
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "particl-core-${version}";
+  version     = "0.16.0.4";
+
+  src = fetchurl {
+    url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz";
+    sha256 = "1yy8pw13rn821jpi1zvzwi3ipxi1bgfxv8g6jz49qlbjzjmjcr68";
+  };
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl db48 boost zlib
+                  miniupnpc libevent zeromq ]
+                  ++ optionals stdenv.isLinux [ utillinux ];
+
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
+
+  meta = {
+    description = "Privacy-Focused Marketplace & Decentralized Application Platform";
+    longDescription= ''
+      An open source, decentralized privacy platform built for global person to person eCommerce.
+    '';
+    homepage = https://particl.io/;
+    maintainers = with maintainers; [ demyanrogozhin ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c4d182d2d3..512e8b15062 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14896,6 +14896,8 @@ with pkgs;
 
   stellar-core = self.altcoins.stellar-core;
 
+  particl-core = self.altcoins.particl-core;
+
   aumix = callPackage ../applications/audio/aumix {
     gtkGUI = false;
   };
-- 
GitLab


From 42a0b11450948fd83b45e1ee60c252f8b9e84e81 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 6 May 2018 04:38:47 +0200
Subject: [PATCH 0177/1085] dockerTools.pullImage: Fix build with sandboxing

Regression introduced in 736848723e5aefa5d24396c58dc6de603399efde.

This commit most certainly hasn't been tested with sandboxing enabled
and breaks not only pullImage but also the docker-tools NixOS VM test
because it doesn't find it's certificate path and also relies on
/var/tmp being there.

Fixing the certificate path is the easiest one because it can be done
via environment variable.

I've used overrideAttrs for changing the hardcoded path to /tmp (which
is available in sandboxed builds and even hardcoded in Nix), so that
whenever someone uses Skopeo from all-packages.nix the path is still
/var/tmp.

The reason why this is hardcoded to /var/tmp can be seen in a comment in
vendor/github.com/containers/image/storage/storage_image.go:

  Do not use the system default of os.TempDir(), usually /tmp, because
  with systemd it could be a tmpfs.

With sandboxed builds this isn't the case, however for using Nix without
NixOS this could turn into a problem if this indeed is the case.

So in the long term this needs to have a proper solution.

In addition to that, I cleaned up the expression a bit.

Tested by building dockerTools.examples.nixFromDockerHub and the
docker-tools NixOS VM test.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @nlewo, @Mic92, @Profpatsch, @globin, @LnL7
---
 pkgs/build-support/docker/default.nix | 50 +++++++++++++++++----------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 584beb3d89b..374b71d42a3 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -32,28 +32,42 @@ rec {
     inherit pkgs buildImage pullImage shadowSetup buildImageWithNixDb;
   };
 
-  pullImage =
-    let
-      fixName = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name;
-    in {
-      imageName,
+  pullImage = let
+    fixName = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name;
+  in
+    { imageName
       # To find the digest of an image, you can use skopeo:
       # skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'
       # sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
-      imageDigest,
-      sha256,
+    , imageDigest
+    , sha256
       # This used to set a tag to the pulled image
-      finalImageTag ? "latest",
-      name ? (fixName "docker-image-${imageName}-${finalImageTag}.tar") }:
-      runCommand name {
-        impureEnvVars=pkgs.stdenv.lib.fetchers.proxyImpureEnvVars;
-        outputHashMode="flat";
-        outputHashAlgo="sha256";
-        outputHash=sha256;
-      }
-      ''
-        ${pkgs.skopeo}/bin/skopeo copy docker://${imageName}@${imageDigest} docker-archive://$out:${imageName}:${finalImageTag}
-      '';
+    , finalImageTag ? "latest"
+    , name ? fixName "docker-image-${imageName}-${finalImageTag}.tar"
+    }:
+
+    runCommand name {
+      impureEnvVars = pkgs.stdenv.lib.fetchers.proxyImpureEnvVars;
+      outputHashMode = "flat";
+      outputHashAlgo = "sha256";
+      outputHash = sha256;
+
+      # One of the dependencies of Skopeo uses a hardcoded /var/tmp for storing
+      # big image files, which is not available in sandboxed builds.
+      nativeBuildInputs = lib.singleton (pkgs.skopeo.overrideAttrs (drv: {
+        postPatch = (drv.postPatch or "") + ''
+          sed -i -e 's!/var/tmp!/tmp!g' \
+            vendor/github.com/containers/image/storage/storage_image.go \
+            vendor/github.com/containers/image/internal/tmpdir/tmpdir.go
+        '';
+      }));
+      SSL_CERT_FILE = "${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt";
+
+      sourceURL = "docker://${imageName}@${imageDigest}";
+      destNameTag = "${imageName}:${finalImageTag}";
+    } ''
+      skopeo copy "$sourceURL" "docker-archive://$out:$destNameTag"
+    '';
 
   # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
   # And we cannot untar it, because then we cannot preserve permissions ecc.
-- 
GitLab


From 8ce802e8c8e99a0a7aed26e4f22725c56dd4cf80 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 6 May 2018 05:07:39 +0200
Subject: [PATCH 0178/1085] gopass: Add xclip to wrapperPath

This is another dependency needed when invoked with "gopass -c".

I opted for xclip instead of xsel, because xclip is tried first in
order.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @andir, @suvash, @mkaito
---
 pkgs/tools/security/gopass/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 743f9136ae5..1bbd4169f2e 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, makeWrapper }:
+{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }:
 
 buildGoPackage rec {
   version = "1.6.11";
@@ -18,6 +18,7 @@ buildGoPackage rec {
   wrapperPath = with stdenv.lib; makeBinPath ([
     git
     gnupg
+    xclip
   ]);
 
   postInstall = ''
-- 
GitLab


From f8351ba5f0cf067579ceac19b67a797d0a4de3fc Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 5 May 2018 23:28:36 -0500
Subject: [PATCH 0179/1085] pythonPackages.scrapy: enable darwin build

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

diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 005d02e6047..f33acc79a2b 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore,
+{ stdenv, buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore,
   testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
   service-identity, parsel, pydispatcher, cssselect, lib }:
 buildPythonPackage rec {
@@ -20,8 +20,9 @@ buildPythonPackage rec {
     LC_ALL="en_US.UTF-8";
 
     checkPhase = ''
-      py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py
+      py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py ${lib.optionalString stdenv.isDarwin "--ignore=tests/test_utils_iterators.py"}
       # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
+      # Ignore iteration test, because lxml can't find encodings on darwin https://bugs.launchpad.net/lxml/+bug/707396
     '';
 
     src = fetchurl {
@@ -34,6 +35,6 @@ buildPythonPackage rec {
       homepage = http://scrapy.org/;
       license = licenses.bsd3;
       maintainers = with maintainers; [ drewkett ];
-      platforms = platforms.linux;
+      platforms = platforms.unix;
     };
 }
-- 
GitLab


From 4e906935ccb27ccdfcc2bc5af8bd2867dcbc679e Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sun, 6 May 2018 07:28:42 +0200
Subject: [PATCH 0180/1085] powerline-rs: 0.1.6 -> 0.1.7

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

diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index 1a386a9f619..ff020d45101 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -1,14 +1,14 @@
 { lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, libgit2, openssl_1_1_0, libssh2, libzip }:
 rustPlatform.buildRustPackage rec {
   name = "powerline-rs-${version}";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "jD91mZM2";
     repo = "powerline-rs";
     rev = version;
 
-    sha256 = "11rhirnk8zh4vf00df9cgy9vw5h8n7kgnhjbjbnlpl9i6wal9nvl";
+    sha256 = "0ry1axia78sp9vmn6p119l69sj3dqx2san1k71a5npf60rf4gfkc";
   };
 
   cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
@@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "powerline-shell rewritten in Rust, inspired by powerline-go";
+    license = licenses.mit;
     maintainers = with maintainers; [ jD91mZM2 ];
     platforms = platforms.unix;
   };
-- 
GitLab


From f76301c6cb2a4eaeb4364aa2480bd0c7a2cb1115 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sun, 6 May 2018 09:43:01 +0300
Subject: [PATCH 0181/1085] emby: 3.3.1.0 -> 3.4.0.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 964fa77c31a..4defe9787ba 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.3.1.0";
+  version = "3.4.0.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "04qq3rl3pwxnsr8z6x3dwplh6brn1nd0jpmmnvizln4ffx9wspb8";
+    sha256 = "1936d5bcrf23av5nc8yh6708gxngsbkh86gvmzpsv3d33jgqv1nl";
   };
 
   buildInputs = with pkgs; [
-- 
GitLab


From 560e91f1a79f8bae58ce609da26cdbc981b14704 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Sun, 6 May 2018 11:49:04 +0200
Subject: [PATCH 0182/1085] nixos/matrix-synapse service:
 url_preview_url_blacklist fix (#40027)

Moved list of ip ranges to url_preview_ip_range_blacklist defaults.
Fixes #40017
---
 nixos/modules/services/misc/matrix-synapse.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 7e880ad09b8..10901e10222 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -395,7 +395,14 @@ in {
       };
       url_preview_ip_range_blacklist = mkOption {
         type = types.listOf types.str;
-        default = [];
+        default = [
+          "127.0.0.0/8"
+          "10.0.0.0/8"
+          "172.16.0.0/12"
+          "192.168.0.0/16"
+          "100.64.0.0/10"
+          "169.254.0.0/16"
+        ];
         description = ''
           List of IP address CIDR ranges that the URL preview spider is denied
           from accessing.
@@ -412,14 +419,7 @@ in {
       };
       url_preview_url_blacklist = mkOption {
         type = types.listOf types.str;
-        default = [
-          "127.0.0.0/8"
-          "10.0.0.0/8"
-          "172.16.0.0/12"
-          "192.168.0.0/16"
-          "100.64.0.0/10"
-          "169.254.0.0/16"
-        ];
+        default = [];
         description = ''
           Optional list of URL matches that the URL preview spider is
           denied from accessing.
-- 
GitLab


From f57986597fb287478db18445e785e7dcb708b997 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 6 May 2018 12:27:31 +0200
Subject: [PATCH 0183/1085] mkcast: drop and replace with `xscast` (#40026)

The package has been declared as unmaintained, `xscast` is the way to
go: https://github.com/KeyboardFire/mkcast#obsolete

Replacement for `mkcast` (https://github.com/KeyboardFire/mkcast#obsolete)
---
 pkgs/applications/video/mkcast/default.nix | 37 ----------------------
 pkgs/applications/video/xscast/default.nix | 35 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 +--
 3 files changed, 37 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/applications/video/mkcast/default.nix
 create mode 100644 pkgs/applications/video/xscast/default.nix

diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix
deleted file mode 100644
index 2d5d2d3b102..00000000000
--- a/pkgs/applications/video/mkcast/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchFromGitHub, wmctrl, pythonPackages, byzanz
-, xdpyinfo, makeWrapper, gtk2, xorg, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "mkcast-2015-03-13";
-
-  src = fetchFromGitHub {
-    owner = "KeyboardFire";
-    repo = "mkcast";
-    rev = "cac22cb6c6f8ec2006339698af5e9199331759e0";
-    sha256 = "15wp3n3z8gw7kjdxs4ahda17n844awhxsqbql5ipsdhqfxah2d8p";
-  };
-
-  buildInputs = with pythonPackages; [ makeWrapper pygtk gtk2 xlib ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  postInstall = ''
-    for f in $out/bin/*; do #*/
-      wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome-terminal ]}:$out/bin"
-    done
-
-    rm -r screenkey/.bzr
-    cp -R screenkey $out/bin
-
-    wrapProgram $out/bin/screenkey/screenkey \
-      --prefix PATH : "${xorg.xmodmap}/bin"\
-      --prefix PYTHONPATH : "$PYTHONPATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A tool for creating GIF screencasts of a terminal, with key presses overlaid";
-    homepage = https://github.com/KeyboardFire/mkcast;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ domenkozar pSub ];
-  };
-}
diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix
new file mode 100644
index 00000000000..ae048f1bdac
--- /dev/null
+++ b/pkgs/applications/video/xscast/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "xscast-unstable-${version}";
+  version = "2016-07-26";
+
+  src = fetchFromGitHub {
+    owner = "KeyboardFire";
+    repo = "xscast";
+    rev = "9e6fd3c28d3f5ae630619f6dbccaf1f6ca594b21";
+    sha256 = "0br27bq9bpglfdpv63h827bipgvhlh10liyhmhcxls4227kagz72";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 xscast.sh $out/bin/xscast
+    install -Dm644 xscast.1 $out/share/man/man1/xscast.1
+    patchShebangs $out/bin
+
+    wrapProgram "$out/bin/xscast" \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]}
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/KeyboardFire/xscast;
+    license = licenses.mit;
+    description = "Screencasts of windows with list of keystrokes overlayed";
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c4d182d2d3..9199f7af2f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3334,8 +3334,6 @@ with pkgs;
 
   motion = callPackage ../applications/video/motion { };
 
-  mkcast = callPackage ../applications/video/mkcast { };
-
   mtail = callPackage ../servers/monitoring/mtail { };
 
   multitail = callPackage ../tools/misc/multitail { };
@@ -5576,6 +5574,8 @@ with pkgs;
 
   xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {};
 
+  xscast = callPackage ../applications/video/xscast { };
+
   xsettingsd = callPackage ../tools/X11/xsettingsd { };
 
   xsensors = callPackage ../os-specific/linux/xsensors { };
-- 
GitLab


From 5fada46e88dca3ae889b29ffd4bf410d0e94b232 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sun, 6 May 2018 13:17:32 +0200
Subject: [PATCH 0184/1085] powerline-rs: add bash & fish completion

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

diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index ff020d45101..e48816db935 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -1,6 +1,7 @@
-{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, libgit2, openssl_1_1_0, libssh2, libzip }:
+{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, openssl_1_1_0, libssh2, libgit2, libzip }:
 rustPlatform.buildRustPackage rec {
-  name = "powerline-rs-${version}";
+  pname = "powerline-rs";
+  name = "${pname}-${version}";
   version = "0.1.7";
 
   src = fetchFromGitHub {
@@ -14,8 +15,12 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
 
   nativeBuildInputs = [ pkgconfig file perl cmake ];
-  buildInputs = [ libgit2 ];
-  propagatedBuildInputs = [ openssl_1_1_0 libssh2 libzip ];
+  buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ];
+
+  postInstall = ''
+    install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}"
+    install -Dm 755 "${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}"
+  '';
 
   meta = with lib; {
     description = "powerline-shell rewritten in Rust, inspired by powerline-go";
-- 
GitLab


From 2d08df417fa9008440081a6d2d1cd6db9d854ff9 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sat, 5 May 2018 20:15:59 +0200
Subject: [PATCH 0185/1085] termplay: init at 2.0.4

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

diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix
new file mode 100644
index 00000000000..5771ec6aff1
--- /dev/null
+++ b/pkgs/tools/misc/termplay/default.nix
@@ -0,0 +1,38 @@
+{ rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }:
+rustPlatform.buildRustPackage rec {
+  name = "termplay-${version}";
+  version = "2.0.4";
+
+  src = fetchFromGitHub {
+    owner = "jD91mZM2";
+    repo = "termplay";
+    rev = version;
+
+    sha256 = "0qgx9xmi8n3sq5n5m6gai777sllw9hyki2kwsj2k4h1ykibzq9r0";
+  };
+
+  cargoBuildFlags = ["--features" "bin"];
+  cargoSha256 = "1ghvp4n6mvckamvn3hk672wh29jlrwmhrd4hv3mh98li1x9ssbmf";
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-ugly
+    gst_all_1.gst-plugins-bad
+    libsixel
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/termplay --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
+  '';
+
+  meta = with lib; {
+    description = "Play an image/video in your terminal";
+    homepage = https://jd91mzm2.github.io/termplay/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jD91mZM2 ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e502294289f..47619b28cfa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5143,6 +5143,8 @@ with pkgs;
 
   telepresence = callPackage ../tools/networking/telepresence { };
 
+  termplay = callPackage ../tools/misc/termplay { };
+
   tewisay = callPackage ../tools/misc/tewisay { };
 
   texmacs = if stdenv.isDarwin
-- 
GitLab


From f92cf4b93fecdd6b9ff91640ed6062dbd43aafd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 6 May 2018 14:06:15 +0200
Subject: [PATCH 0186/1085] pythonPackages.pyopengl: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4da4910bbbd..75cf7561ab6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11567,11 +11567,15 @@ in {
       sha256 = "9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf";
     };
     propagatedBuildInputs = [ pkgs.libGLU_combined pkgs.freeglut self.pillow ];
-    patchPhase = ''
-      sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py
-      sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py
-      sed -i "s|'GLU',|'${pkgs.libGLU_combined}/lib/libGLU.so',|" OpenGL/platform/glx.py
-      sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py
+    patchPhase = let
+      ext = stdenv.hostPlatform.extensions.sharedLibrary; in ''
+      substituteInPlace OpenGL/platform/glx.py \
+        --replace "'GL'" "'${pkgs.libGL}/lib/libGL${ext}'" \
+        --replace "'GLU'" "'${pkgs.libGLU}/lib/libGLU${ext}'" \
+        --replace "'glut'" "'${pkgs.freeglut}/lib/libglut${ext}'"
+      substituteInPlace OpenGL/platform/darwin.py \
+        --replace "'OpenGL'" "'${pkgs.libGL}/lib/libGL${ext}'" \
+        --replace "'GLUT'" "'${pkgs.freeglut}/lib/libglut${ext}'"
     '';
     meta = {
       homepage = http://pyopengl.sourceforge.net/;
-- 
GitLab


From 80ea03ee79e66fc1ebbe48ac36d02fd82b880171 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Sat, 5 May 2018 21:41:54 -0400
Subject: [PATCH 0187/1085] draftsight: 2017-SP2 -> 2018-SP2, remove gstreamer

Also, fixed URL scheme to link directly.

Addressing https://github.com/NixOS/nixpkgs/issues/39975
---
 .../graphics/draftsight/default.nix           | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index b604099096f..d817424c452 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, requireFile, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
+{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
   dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12,
-  xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc,
+  xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc,
   libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
   libXrender, libXcomposite }:
 
-let version = "2017-SP2"; in
+let version = "2018SP2"; in
 stdenv.mkDerivation {
   name = "draftsight-${version}";
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
           $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
+    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
@@ -41,6 +41,19 @@ stdenv.mkDerivation {
         echo "Ignoring broken link $lib"
       fi
     done
+    for lib in $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/lib/cpp/*.so*; do
+      if [ -f $(readlink $lib) ]
+      then
+        echo "Patching $lib..."
+        chmod u+w $lib
+        patchelf --set-rpath $libPath:\$ORIGIN/../Libraries $lib
+      else
+        echo "Ignoring broken link $lib"
+      fi
+    done
+    # These libraries shouldn't really be here anyway:
+    find $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/Samples/C++ \
+         -type d -name _lib | xargs rm -r
   '';
 
   # TODO: Figure out why HelpGuide segfaults at startup.
@@ -51,15 +64,15 @@ stdenv.mkDerivation {
   # that it dlopen()'s libraries in paths removed by shrinking RPATH.
   dontPatchELF = true;
 
-  src = requireFile {
+  src = fetchurl {
     name = "draftSight.deb";
-    url = "https://www.3ds.com/?eID=3ds_brand_download&uid=41&pidDown=13426&L=0";
-    sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr";
+    url = "http://dl-ak.solidworks.com/nonsecure/draftsight/${version}/draftSight.deb";
+    sha256 = "05lrvml0zkzqg0sj6sj2h8h66hxdmsw5fg9fwz923r1y8j48qxdx";
   };
 
   libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils
     dbus_tools alsaLib cups.lib fontconfig glib icu libpng12
-    xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11
+    xkeyboard_config zlib libxslt libxml2 sqlite orc libX11
     libXcursor libXrandr libxcb libXi libSM libICE libXrender
     libXcomposite ];
 
-- 
GitLab


From cf09900bbcca8f09a4af4927e3d6554647d695db Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Thu, 3 May 2018 16:58:32 +0200
Subject: [PATCH 0188/1085] xidlehook: init at 0.4.6

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

diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
new file mode 100644
index 00000000000..a71531eebc5
--- /dev/null
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -0,0 +1,32 @@
+{ lib, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf }:
+
+rustPlatform.buildRustPackage rec {
+  name = "xidlehook-${version}";
+  version = "0.4.6";
+
+  src = fetchFromGitHub {
+    owner = "jD91mZM2";
+    repo = "xidlehook";
+    rev = version;
+
+    sha256 = "0h84ichm1v2wdmm4w1n7jr70yfb9hhi7kykvd99ppg00h1x9lr7w";
+  };
+
+  cargoSha256 = "0a1bl6fnfw6xy71q3b5zij52p9skylj1ivqj8my44bfsid2qfn7d";
+
+  buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ];
+  nativeBuildInputs = [ pkgconfig patchelf ];
+
+  postFixup = ''
+    RPATH="$(patchelf --print-rpath $out/bin/xidlehook)"
+    patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook
+  '';
+
+  meta = with lib; {
+    description = "xautolock rewrite in Rust, with a few extra features";
+    homepage = https://github.com/jD91mZM2/xidlehook;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jD91mZM2 ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c4d182d2d3..bd6e3086f43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5770,6 +5770,8 @@ with pkgs;
 
   xiccd = callPackage ../tools/misc/xiccd { };
 
+  xidlehook = callPackage ../tools/X11/xidlehook {};
+
   xorriso = callPackage ../tools/cd-dvd/xorriso { };
 
   xpf = callPackage ../tools/text/xml/xpf {
-- 
GitLab


From 17950abc787d00451b3e5dd5a15a8bcffd351a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 6 May 2018 15:05:11 +0100
Subject: [PATCH 0189/1085] wllvm: 1.1.5 -> 1.2.0

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

diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix
index c78767e115a..399a8e66860 100644
--- a/pkgs/development/tools/wllvm/default.nix
+++ b/pkgs/development/tools/wllvm/default.nix
@@ -1,13 +1,13 @@
 { stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.1.5";
+  version = "1.2.0";
   pname = "wllvm";
   name = "${pname}-${version}";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "02lnilhqz7mq0w6mp574rmjxiszp1wyla16jqr89r0z9vjg2j9rv";
+    sha256 = "1hriyv5gfkcxjqk71l3030qfy3scsjr3mp12hkxfknh65inlqs5z";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 71a8d0ca59a081299aa15391a04518a35ead0b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 6 May 2018 15:15:04 +0100
Subject: [PATCH 0190/1085] particl-core: replace utillinux with
 unixtools.hexdump

to make it platform agnostic
---
 pkgs/applications/altcoins/particl/particl-core.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
index c9454963b22..2524408429c 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -1,6 +1,4 @@
 { stdenv
-, autoconf
-, automake
 , autoreconfHook
 , boost
 , db48
@@ -14,6 +12,7 @@
 , zeromq
 , zlib
 , withGui
+, unixtools
 }:
 
 with stdenv.lib;
@@ -28,9 +27,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [ openssl db48 boost zlib
-                  miniupnpc libevent zeromq ]
-                  ++ optionals stdenv.isLinux [ utillinux ];
+  buildInputs = [
+    openssl db48 boost zlib miniupnpc libevent zeromq
+    unixtools.hexdump
+  ];
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
 
-- 
GitLab


From 716d877d0f8449f66ef7824460823711fb653aa7 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 6 May 2018 17:10:35 +0100
Subject: [PATCH 0191/1085] gitea: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index da9ee9b4081..71b59ed4aef 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gitea-${version}";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "07fbcd134n7giwxpqli5hfywmi0vb8awgdh3gyiwyzhjwwzfrxkq";
+    sha256 = "1mid67c4021m7mi4ablx1w5v43831gzn8xpg8n30a4zmr70781wm";
   };
 
   patches = [ ./static-root-path.patch ];
-- 
GitLab


From 472f21951a6e5bf4170594a5dc3c2616c7af316d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 6 May 2018 16:46:55 +0200
Subject: [PATCH 0192/1085] qt5.qtwebkit: Reduce log size to fix hydra build

This should fix the darwin build of qtwebkit.
---
 pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 6834b7ce87b..d73bc370f99 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -28,10 +28,15 @@ qtModule {
   preConfigure = ''
     QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
     fixQtBuiltinPaths . '*.pr?'
+    # Fix hydra's "Log limit exceeded"
+    export qmakeFlags="$qmakeFlags CONFIG+=silent"
   '';
 
   NIX_CFLAGS_COMPILE =
-    [ "-Wno-expansion-to-defined" ] # with gcc7 this warning blows the log over Hydra's limit
+    # with gcc7 this warning blows the log over Hydra's limit
+    [ "-Wno-expansion-to-defined" ]
+    # with clang this warning blows the log over Hydra's limit
+    ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override"
     ++ optionals flashplayerFix
       [
         ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"''
-- 
GitLab


From 11096b2cfef32136132361fabeb38cd1baed8a11 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 May 2018 18:08:44 +0200
Subject: [PATCH 0193/1085] hackage2nix: disable failing Hydra builds

@gebner: hledger-diff no longer compiles
---
 .../configuration-hackage2nix.yaml            | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c602d312a3b..412c3bfd57e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2479,8 +2479,6 @@ package-maintainers:
     - streamproc
     - structured-haskell-mode
     - titlecase
-  gebner:
-    - hledger-diff
   gridaphobe:
     - ghc-srcspan-plugin
     - located-base
@@ -2740,6 +2738,7 @@ dont-distribute-packages:
   alerta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alex-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   alfred:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   alga:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic-prelude:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3089,6 +3088,7 @@ dont-distribute-packages:
   barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-compat-batteries:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  base-compat-migrate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-noprelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3168,6 +3168,7 @@ dont-distribute-packages:
   bindings-friso:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-gsl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-gts:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-hamlib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-hdf5:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-K8055:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-levmar:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3294,6 +3295,7 @@ dont-distribute-packages:
   bson-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree-concurrent:                             [ 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:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3327,6 +3329,7 @@ dont-distribute-packages:
   c-dsl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   c-io:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   c2hsc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ca:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-audit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-bounds:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-cargs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3427,7 +3430,9 @@ dont-distribute-packages:
   categorical-algebra:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   category-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   category-traced:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  category:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   catnplus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cautious-gen:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cayley-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cblrepo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   CBOR:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3693,6 +3698,7 @@ dont-distribute-packages:
   constrained-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   constrained-monads:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   constraint-manip:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  constraint:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   consul-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3896,6 +3902,7 @@ dont-distribute-packages:
   data-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   database-study:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   datadog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  datafix:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   datalog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   DataTreeView:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   datetime-sb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3910,6 +3917,7 @@ dont-distribute-packages:
   dbmigrations-sqlite:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dbus-hslogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-th-introspection:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   DBus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4318,6 +4326,7 @@ dont-distribute-packages:
   exp-extended:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   expat-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expiring-containers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   explain:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-determinant:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-iomodes-bytestring:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4326,6 +4335,7 @@ dont-distribute-packages:
   explicit-sharing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   explore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exposed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expressions-z3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   extended-categories:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4957,6 +4967,7 @@ dont-distribute-packages:
   gore-and-ash-actor:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-async:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-demo:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gore-and-ash-glfw:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-lambdacube:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-network:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-sdl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5019,6 +5030,7 @@ dont-distribute-packages:
   gridfs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridland:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   grm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  groot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gross:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GroteTrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-converters:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5037,6 +5049,7 @@ dont-distribute-packages:
   gtfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-serialized-event:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-sni-tray:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-strut:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-toy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-glade:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5594,6 +5607,7 @@ dont-distribute-packages:
   HLearn-datastructures:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-diff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-irr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5619,7 +5633,9 @@ dont-distribute-packages:
   hmatrix-nipals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-nlopt:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-quadprogpp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-sparse:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-static:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-sundials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-syntax:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5720,6 +5736,7 @@ dont-distribute-packages:
   hpqtypes-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpqtypes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hprotoc-fork:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hprotoc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hps-cairo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hps-kmeans:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6088,6 +6105,7 @@ dont-distribute-packages:
   instant-hashable:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   instant-zipper:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   instapaper-sender:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  int-multimap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   integer-pure:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   intel-aes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableGen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6262,6 +6280,7 @@ dont-distribute-packages:
   katip-syslog:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   katt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kawaii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kazura-queue:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kd-tree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdesrc-build-extra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6700,6 +6719,7 @@ dont-distribute-packages:
   mattermost-api-qc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   mattermost-api:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   maude:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  maxent-learner-hw-gui:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxent:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxsharing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   maybench:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6766,6 +6786,7 @@ dont-distribute-packages:
   MHask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Michelangelo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  microaeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   microformats2-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   microlens-each:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   micrologger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6962,6 +6983,7 @@ dont-distribute-packages:
   mvc-updates:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvclient:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mxnet-dataiter:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet-nn:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet-nnvm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7279,6 +7301,7 @@ dont-distribute-packages:
   pandoc-unlit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   PandocAgda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pang-a-lambda:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pangraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   panpipe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pansite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-export:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7394,6 +7417,7 @@ dont-distribute-packages:
   pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   phasechange:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   phaser:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  phoityne:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   phone-metadata:                               [ 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 ]
@@ -7410,6 +7434,7 @@ dont-distribute-packages:
   picoparsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   picosat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pictikz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pier:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   piet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pig:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pinchot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7570,6 +7595,7 @@ dont-distribute-packages:
   preprocessor:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   press:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   presto-hdbc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pretty-relative-time:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   prettyprinter-vty:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   primesieve:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-simd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7597,6 +7623,7 @@ dont-distribute-packages:
   procrastinating-variable:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   procstat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   producer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  product:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2pretty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   profiteur:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7666,6 +7693,7 @@ dont-distribute-packages:
   puzzle-draw-cmdline:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   puzzle-draw:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pvd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PyF:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pyffi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pyfi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   python-pickle:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7746,6 +7774,7 @@ dont-distribute-packages:
   rand-vars:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   randfile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-access-list:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  random-class:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-eff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-effin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8514,6 +8543,8 @@ dont-distribute-packages:
   stable-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-bump:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-hpc-coveralls:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-network:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run-auto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8587,6 +8618,7 @@ dont-distribute-packages:
   stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-base64:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-benchmarks:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-concurrency:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-eversion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8784,6 +8816,7 @@ dont-distribute-packages:
   termplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   terntup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tersmu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-doctest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-sandbox:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9015,6 +9048,7 @@ dont-distribute-packages:
   twitter-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  txt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   txtblk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   TYB:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tyfam-witnesses:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9133,6 +9167,7 @@ dont-distribute-packages:
   utc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   utf8-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   UTFTConverter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  util:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   uu-options:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   uuagc-diagrams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   uuid-aeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9206,6 +9241,7 @@ dont-distribute-packages:
   vk-aws-route53:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   vowpal-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   voyeur:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vpq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vrpn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   vte:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vtegtk3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-- 
GitLab


From fe95c5c64f9eb8a8766a6ea1ddcf69ca9436fb46 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 May 2018 02:30:40 +0200
Subject: [PATCH 0194/1085] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/d2c0010babe227d411d0f5c207ae391c5b56b5e6.
---
 .../haskell-modules/hackage-packages.nix      | 1017 +++++++++++++----
 1 file changed, 797 insertions(+), 220 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e9d076343f8..f0b8c3d6316 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -15223,6 +15223,7 @@ self: {
        ];
        description = "Quasiquotations for a python like interpolated string formater";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QIO" = callPackage
@@ -19370,12 +19371,12 @@ self: {
          shell32 = null; shfolder = null; shlwapi = null; user32 = null; 
          winmm = null;};
 
-  "Win32_2_7_0_0" = callPackage
+  "Win32_2_8_0_0" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "Win32";
-       version = "2.7.0.0";
-       sha256 = "1583c2x208bpwgvk0gyy2931604vikx57kyiiaxf7mp8shh13fhi";
+       version = "2.8.0.0";
+       sha256 = "0ppvpf2zx6547bqx7ysbq9ld99hf1v9rfa9s4f57hkn758l9ldm4";
        homepage = "https://github.com/haskell/win32";
        description = "A binding to Windows Win32 API";
        license = stdenv.lib.licenses.bsd3;
@@ -19800,6 +19801,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) xinput;};
 
+  "XML" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, smallcheck, tasty
+     , tasty-smallcheck, txt, util, vector
+     }:
+     mkDerivation {
+       pname = "XML";
+       version = "0.0.0.0";
+       sha256 = "1arlnyzj3zdzqrsr9lhicx2y1ag00cgf6jzn6nyxa7d7avp42025";
+       libraryHaskellDepends = [
+         base base-unicode-symbols txt util vector
+       ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       description = "Extensible Markup Language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "XMLParser" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -23476,8 +23493,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-distributed";
-       version = "1.3";
-       sha256 = "1sm56b6z8ajkap3nlcrsl592m40vgb5zmhhnc8al6arrra2j21pc";
+       version = "1.4";
+       sha256 = "0fpl6xa32w4f1bl4l8b5pwagm68k42nn45w7d1hsh9ffy4bfsq0k";
        libraryHaskellDepends = [
          aivika aivika-transformers array base binary containers
          distributed-process exceptions mtl mwc-random random stm time
@@ -23820,6 +23837,7 @@ self: {
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alga" = callPackage
@@ -27269,6 +27287,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ansi-terminal_0_8_0_3" = callPackage
+    ({ mkDerivation, base, colour }:
+     mkDerivation {
+       pname = "ansi-terminal";
+       version = "0.8.0.3";
+       sha256 = "18466bjgsmn2f96i3q6sp5f72paa2flqh40n9h137z29kvr53sva";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base colour ];
+       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-terminal-game" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal
      , clock, hspec, linebreak, split, terminal-size, timers-tick
@@ -30181,8 +30214,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.4.6.0";
-       sha256 = "1yyc5cp10zqhmi2hay0hiz526lxfcn56g13ikfh25pqzayrxnd8b";
+       version = "0.4.7.0";
+       sha256 = "0n9a0bkf525gw1fcik6gmaarf5l7zmn29whiyrcp3dv7afqdfhwa";
        libraryHaskellDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -30509,8 +30542,10 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.10.0.20";
-       sha256 = "0k73jcj2za79wvb6nki1k02d6rj7zrnl0vz494ajh4d96gwdwacp";
+       version = "2.10.1.5";
+       sha256 = "14y4mpk6hkqvw8jh49idj9gx2wxcy2ppz00abny6fsbw6iff4xrs";
+       revision = "1";
+       editedCabalFile = "0ff0nslsi5b4g8gp63x6js3c026ajgfamd8pg2k1aygwx8x3zqk9";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -30551,21 +30586,21 @@ self: {
 
   "ats-storable" = callPackage
     ({ mkDerivation, base, bytestring, composition-prelude, hspec
-     , microlens, microlens-th, text
+     , storable, text
      }:
      mkDerivation {
        pname = "ats-storable";
-       version = "0.3.0.1";
-       sha256 = "1apzmyq9a4hjn9d0fz7pxvxflq61kp26fa6gz3c50pdjby55zhns";
+       version = "0.3.0.3";
+       sha256 = "1a9id432vhvr3n69m1f7iyc899nc2wa4w8jpa7s7aqkixw2vqlr2";
        libraryHaskellDepends = [
-         base bytestring composition-prelude microlens microlens-th text
+         base bytestring composition-prelude text
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com//ats-generic#readme";
+       testSystemDepends = [ storable ];
        description = "Marshal ATS types into Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {storable = null;};
 
   "attempt" = callPackage
     ({ mkDerivation, base, failure }:
@@ -30927,6 +30962,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attoparsec-varword" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring
+     , bytestring-builder-varword, hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "attoparsec-varword";
+       version = "0.1.0.0";
+       sha256 = "1rrc4pqi7slsq2rhiasid7m7fm489vd851jvakb8z5z64mrxc409";
+       libraryHaskellDepends = [ attoparsec base ];
+       testHaskellDepends = [
+         attoparsec base bytestring bytestring-builder-varword hspec
+         QuickCheck
+       ];
+       homepage = "https://github.com/concert/hs-varword#readme";
+       description = "Variable-length integer decoding for Attoparsec";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "attosplit" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring }:
      mkDerivation {
@@ -31542,8 +31595,8 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.3.0.0";
-       sha256 = "0sfi6jc7pcigpwgkfqq9ckwm7bzhfc9kf2rhznrrsy9qw5i7xrll";
+       version = "0.3.0.1";
+       sha256 = "1day4zpypk1jirkn0zfvmfwy0pnsvggibi9k2gk23kqnn904sv77";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -33098,6 +33151,7 @@ self: {
        homepage = "https://github.com/bergmark/base-compat-migrate#readme";
        description = "Helps migrating projects to base-compat(-batteries)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-encoding" = callPackage
@@ -35779,6 +35833,7 @@ self: {
        homepage = "https://github.com/relrod/hamlib-haskell";
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) hamlib;};
 
   "bindings-hdf5" = callPackage
@@ -37432,6 +37487,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "blank-canvas_0_6_2" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
+     , bytestring, colour, containers, data-default-class, directory
+     , http-types, kansas-comet, mime-types, process, scotty, semigroups
+     , shake, stm, text, text-show, time, transformers, unix, vector
+     , wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "blank-canvas";
+       version = "0.6.2";
+       sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84";
+       revision = "4";
+       editedCabalFile = "03l1k5b58b9p8ajm2aiq5xfryj45zipzv04mxc2qnl5xk9jz0iqw";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base base-compat base64-bytestring bytestring colour
+         containers data-default-class http-types kansas-comet mime-types
+         scotty semigroups stm text text-show transformers vector wai
+         wai-extra warp
+       ];
+       testHaskellDepends = [
+         base containers directory process shake stm text time unix vector
+       ];
+       homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
+       description = "HTML5 Canvas Graphics Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blank-canvas" = callPackage
     ({ mkDerivation, aeson, base, base-compat-batteries
      , base64-bytestring, bytestring, colour, containers
@@ -39836,6 +39920,7 @@ self: {
        homepage = "http://johannesgerer.com/buchhaltung";
        description = "Automates most of your plain text accounting data entry in ledger format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buffer" = callPackage
@@ -40565,6 +40650,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytestring-builder-varword" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-varword, base, bytestring
+     , hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "bytestring-builder-varword";
+       version = "0.1.0.0";
+       sha256 = "1lpcy47z3jf023iv0vdwsy5l2bsjb4i8vbnzjk9hzg0n9866f2g1";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         attoparsec attoparsec-varword base bytestring hspec QuickCheck
+       ];
+       homepage = "https://github.com/concert/hs-varword#readme";
+       description = "Variable-length integer encoding";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "bytestring-class" = callPackage
     ({ mkDerivation, base, bytestring, utf8-string }:
      mkDerivation {
@@ -41207,6 +41309,7 @@ self: {
        libraryHaskellDepends = [ alg base ];
        description = "Cellular Automata";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cab" = callPackage
@@ -44002,6 +44105,7 @@ self: {
        libraryHaskellDepends = [ alg base ];
        description = "Categorical types and classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "category-extras" = callPackage
@@ -44119,6 +44223,7 @@ self: {
        ];
        homepage = "https://github.com/Nickske666/cautious#readme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cayley-client" = callPackage
@@ -44291,8 +44396,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.0.2";
-       sha256 = "1yd1ahf2ri31lwcs0mvhn6wgpglgk3vsf5698qw6asm8rl1gcaz9";
+       version = "0.1.1.0";
+       sha256 = "1pgarp84p757jyx71qma64g84fcyg6rrhrmrh4c1sszykqjnw7g0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44836,22 +44941,23 @@ self: {
   "cgrep" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, async, base
      , bytestring, cmdargs, containers, directory, dlist, either
-     , filepath, ghc-prim, mtl, process, regex-base, regex-pcre
-     , regex-posix, safe, split, stm, stringsearch, transformers
-     , unicode-show, unix-compat, unordered-containers, utf8-string
-     , yaml
+     , exceptions, filepath, ghc-prim, mtl, process, regex-base
+     , regex-pcre, regex-posix, safe, split, stm, stringsearch
+     , transformers, unicode-show, unix-compat, unordered-containers
+     , utf8-string, yaml
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.6.24";
-       sha256 = "0clnnhr5srrl3z2crfrs7csihrgcq5p9d9vgqbgxsf741jnfmhcx";
+       version = "6.6.25";
+       sha256 = "0cary2b5jg8151n48a4vij32g68mrql791mhw43v44wvhlag8plw";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson ansi-terminal array async base bytestring cmdargs containers
-         directory dlist either filepath ghc-prim mtl process regex-base
-         regex-pcre regex-posix safe split stm stringsearch transformers
-         unicode-show unix-compat unordered-containers utf8-string yaml
+         directory dlist either exceptions filepath ghc-prim mtl process
+         regex-base regex-pcre regex-posix safe split stm stringsearch
+         transformers unicode-show unix-compat unordered-containers
+         utf8-string yaml
        ];
        homepage = "http://awgn.github.io/cgrep/";
        description = "Command line tool";
@@ -50918,8 +51024,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "concurrent-utilities";
-       version = "0.2.0.1";
-       sha256 = "168prywiw4fhh2syzj452pyqj8byy4sb929mgkv5srgwkzqr6g0f";
+       version = "0.2.0.2";
+       sha256 = "1phc9a90nvx6dk741hmg3w5m9y8ra5a7zsgmzw173ibaapr2yhqi";
        libraryHaskellDepends = [ base ];
        homepage = "-";
        description = "More utilities and broad-used datastructures for concurrency";
@@ -52126,6 +52232,7 @@ self: {
        libraryHaskellDepends = [ base category ];
        description = "Reified constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constraint-classes" = callPackage
@@ -52190,12 +52297,12 @@ self: {
      }) {};
 
   "constrictor" = callPackage
-    ({ mkDerivation, base, transformers }:
+    ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
        pname = "constrictor";
-       version = "0.1.1.0";
-       sha256 = "0vid1m5lsmpdx9bpc78ad3nk720z62chd0j9rx03laiz2fjzx2bh";
-       libraryHaskellDepends = [ base transformers ];
+       version = "0.1.1.1";
+       sha256 = "0rw36xbrrqm40rqacl8zps7hm424nqwkhxr82c98b16n182zvnan";
+       libraryHaskellDepends = [ base ghc-prim transformers ];
        homepage = "https://github.com/chessai/constrictor.git";
        description = "strict versions of many things in base";
        license = stdenv.lib.licenses.mit;
@@ -52503,8 +52610,8 @@ self: {
     ({ mkDerivation, base, criterion, hspec, recursion-schemes }:
      mkDerivation {
        pname = "continued-fraction";
-       version = "0.1.0.8";
-       sha256 = "1izjdvm65zj960dcgg8xamg6ysfhn04qjxb9q7mpgzg8yi6f326c";
+       version = "0.1.0.9";
+       sha256 = "1831a093wnbf7kvplsp59xkdhj0g8wva08ixf9w12x6vl0yyj6sb";
        libraryHaskellDepends = [ base recursion-schemes ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -56298,21 +56405,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "curl-runnings_0_3_0" = callPackage
+  "curl-runnings_0_6_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , case-insensitive, cmdargs, directory, hspec, hspec-expectations
-     , http-conduit, http-types, text, unordered-containers, vector
-     , yaml
+     , http-conduit, http-types, megaparsec, text, unordered-containers
+     , vector, yaml
      }:
      mkDerivation {
        pname = "curl-runnings";
-       version = "0.3.0";
-       sha256 = "0bcapr5kcwlc65bkg6w3aq69jzrb2rydkw13v99dcf9fn43kwcfj";
+       version = "0.6.0";
+       sha256 = "06dcxwhmzsinmay63m9wnsjsy1cgwyms64c0jicndnc3nhbl0824";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring case-insensitive directory hspec
-         hspec-expectations http-conduit http-types text
+         hspec-expectations http-conduit http-types megaparsec text
          unordered-containers vector yaml
        ];
        executableHaskellDepends = [ base cmdargs text ];
@@ -57886,14 +57993,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse_3_0_0_0" = callPackage
+  "data-diverse_3_1_0_0" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
      , hspec, tagged
      }:
      mkDerivation {
        pname = "data-diverse";
-       version = "3.0.0.0";
-       sha256 = "1sxv9pyggdpwba0771vpvrawnycjrnvpayq0fjf7ly57mrdi3zd0";
+       version = "3.1.0.0";
+       sha256 = "0jg8g8zp8s14qalrmqa3faspg9kfifzdv0mi8a25xmqgi6rz64aq";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim tagged
        ];
@@ -57924,14 +58031,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse-lens_3_1_0_0" = callPackage
+  "data-diverse-lens_3_1_1_0" = callPackage
     ({ mkDerivation, base, data-diverse, data-has, generic-lens, hspec
      , lens, profunctors, tagged
      }:
      mkDerivation {
        pname = "data-diverse-lens";
-       version = "3.1.0.0";
-       sha256 = "0g1cnn1kw36ac68wm8qmd8pdzjpl4xcil7shailxwawldi52v549";
+       version = "3.1.1.0";
+       sha256 = "1ynw9j8a92ny8327i0r037swsc3rj3723dnlar77x640849nif0p";
        libraryHaskellDepends = [
          base data-diverse data-has generic-lens lens profunctors tagged
        ];
@@ -59177,6 +59284,7 @@ self: {
        homepage = "https://github.com/sgraf812/datafix";
        description = "Fixing data-flow problems";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dataflow" = callPackage
@@ -59683,6 +59791,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dbus-hslogger" = callPackage
+    ({ mkDerivation, base, dbus, hslogger, optparse-applicative }:
+     mkDerivation {
+       pname = "dbus-hslogger";
+       version = "0.1.0.1";
+       sha256 = "0i2y69kagp53cmlb7p3y6ysr9k5wvfd0vcnpwsasyn1jpk6g80zi";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base dbus hslogger ];
+       executableHaskellDepends = [
+         base dbus hslogger optparse-applicative
+       ];
+       homepage = "https://github.com/IvanMalison/dbus-hslogger#readme";
+       description = "Expose a dbus server to control hslogger";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dbus-qq" = callPackage
     ({ mkDerivation, base, containers, dbus, parsec, QuickCheck
      , template-haskell
@@ -60659,8 +60785,8 @@ self: {
     ({ mkDerivation, base, foldl }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.2.3";
-       sha256 = "0v3nr8svnsqgj4rmbki4f38fndq03gxghkwb9q6qjd9w2m2hx3y1";
+       version = "0.4.0.1";
+       sha256 = "1n2wr03bqpp2yfm1jl54b3xrq4q2dwdj0ijssk8hbk3mzr4pac00";
        libraryHaskellDepends = [ base foldl ];
        homepage = "https://github.com/metrix-ai/deferred-folds";
        description = "Abstractions over deferred folds";
@@ -61698,7 +61824,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_13_0" = callPackage
+  "dhall_1_13_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
      , containers, contravariant, cryptonite, deepseq, directory
      , exceptions, filepath, formatting, haskeline, http-client
@@ -61710,8 +61836,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.13.0";
-       sha256 = "1fn3yi2zv2l88jjapk0zhij247cy4yh0w07icyr41g341wx7gfv4";
+       version = "1.13.1";
+       sha256 = "1mjhxkdpw7blcdci6cmm3x2c9ascp7djc8c77dblfpzyqa3sqxf0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61932,8 +62058,8 @@ self: {
      }:
      mkDerivation {
        pname = "di";
-       version = "0.2";
-       sha256 = "1vmhd8zph5ai13n2cfrjaxcdifwqv7wiggqbfi5ifhancxwlfq7p";
+       version = "0.3";
+       sha256 = "1kwkr2lb4vii530sijlrll9nj1k93pixcqk4bn96877bzf5963wj";
        libraryHaskellDepends = [ base stm time transformers ];
        testHaskellDepends = [
          base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck
@@ -63467,6 +63593,8 @@ self: {
        pname = "directory";
        version = "1.3.2.2";
        sha256 = "0m4dhcz7d1y0y08hn8ny378ly67gqbx676srgardq6800w2iqhzj";
+       revision = "1";
+       editedCabalFile = "1qdpglb2xzgcm1yja9d9hvw75cg85wai292f7rb6h0hsjnhrans3";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -68137,8 +68265,8 @@ self: {
        pname = "ekg";
        version = "0.4.0.15";
        sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8";
-       revision = "1";
-       editedCabalFile = "05995gywwysmfhrvalvqnkvw7gh6z85jrb91a1knnvi0jwq4c6m3";
+       revision = "2";
+       editedCabalFile = "0dn8xysffy7pgz88h4h6lpjpl5n978dm3yxlzyxbk2k1byhzzx7d";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath network snap-core
@@ -68379,6 +68507,8 @@ self: {
        pname = "ekg-statsd";
        version = "0.2.3.0";
        sha256 = "05lakyb0sp6g8nziy6jzk2l19v2371cdnih6pp6myyj6iflx9smf";
+       revision = "1";
+       editedCabalFile = "1k4sndkjg1prvzhiii9gcgkx8zfkk9c4nf548x0hrbmj1laj8d62";
        libraryHaskellDepends = [
          base bytestring ekg-core network text time unordered-containers
        ];
@@ -71281,8 +71411,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.8.2.6";
-       sha256 = "1f3dmkrxjfj128pdkarrc6mka09jmh360bn6vgbp4qm2xv5hl16s";
+       version = "0.8.2.7";
+       sha256 = "0rqgb224v9zy2kkchk2v3zwpdwh805ff03j5y5vswmc0l52bkw7w";
        libraryHaskellDepends = [
          aeson base bytestring concurrent-utilities deepseq network stm
          suspend text timers websockets
@@ -71672,6 +71802,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "exception-transformers_0_4_0_7" = callPackage
+    ({ mkDerivation, base, HUnit, stm, test-framework
+     , test-framework-hunit, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "exception-transformers";
+       version = "0.4.0.7";
+       sha256 = "1vzjy6mz6y9jacpwq2bax86nwzq9mk4b9y3r3r98l50r7pmn2nwj";
+       libraryHaskellDepends = [
+         base stm transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit transformers
+         transformers-compat
+       ];
+       description = "Type classes and monads for unchecked extensible exceptions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "exceptional" = callPackage
     ({ mkDerivation, base, exceptions }:
      mkDerivation {
@@ -72152,6 +72302,7 @@ self: {
        homepage = "https://github.com/metrix-ai/expiring-containers";
        description = "Expiring containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expiring-mvar" = callPackage
@@ -72355,6 +72506,7 @@ self: {
        ];
        description = "Encode and Decode expressions from Z3 ASTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extcore" = callPackage
@@ -79627,6 +79779,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fuzzy-dates" = callPackage
+    ({ mkDerivation, base, hourglass, hspec, lens, parsec }:
+     mkDerivation {
+       pname = "fuzzy-dates";
+       version = "0.1.1.1";
+       sha256 = "1hanmwzr1g11am4z3r9wrkzfycvk76a03cg9bqpifidv7y9hcd73";
+       libraryHaskellDepends = [ base hourglass hspec lens parsec ];
+       testHaskellDepends = [ base hourglass hspec lens parsec ];
+       homepage = "https://github.com/ReedOei/fuzzy-dates#readme";
+       description = "Libary for parsing dates in strings in varied formats";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fuzzy-timings" = callPackage
     ({ mkDerivation, base, containers, glpk-hs, HUnit, mtl, QuickCheck
      , random, test-framework, test-framework-hunit
@@ -81456,14 +81621,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec_0_6_0_1" = callPackage
+  "genvalidity-hspec_0_6_0_2" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
      , hspec, hspec-core, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.6.0.1";
-       sha256 = "18srjw0c8li10nbnxwbnhrggkl9nhdfjy02jpxd6hpij345y3j47";
+       version = "0.6.0.2";
+       sha256 = "0l14vn5hddkvyzhch8l9abwh3naya27p9f6lz918zd8i5l5pd32n";
        libraryHaskellDepends = [
          base genvalidity genvalidity-property hspec hspec-core QuickCheck
          validity
@@ -81695,14 +81860,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "genvalidity-property_0_2_0_0" = callPackage
+  "genvalidity-property_0_2_0_1" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, genvalidity
      , hspec, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-property";
-       version = "0.2.0.0";
-       sha256 = "10przvvqrmjyr9cmbna79kj15wjhi0r4j64qn5824gslyy7g39pa";
+       version = "0.2.0.1";
+       sha256 = "02ypm53llfdrqasji79bng3ybkjs8ak7klcrhkg15k6jgk0ca877";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
@@ -81851,15 +82016,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-unordered-containers_0_2_0_0" = callPackage
+  "genvalidity-unordered-containers_0_2_0_2" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
      , hspec, QuickCheck, unordered-containers, validity
      , validity-unordered-containers
      }:
      mkDerivation {
        pname = "genvalidity-unordered-containers";
-       version = "0.2.0.0";
-       sha256 = "1kfn6g3h33g215qy0iffhr35vd2np9nsf6634fjk40mbz1san0m8";
+       version = "0.2.0.2";
+       sha256 = "0sjs06qf0pk6xvgc38qayzfqk6wm1qgpx3yzglpkhdy809gl5pfa";
        libraryHaskellDepends = [
          base genvalidity hashable QuickCheck unordered-containers validity
          validity-unordered-containers
@@ -81893,14 +82058,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-uuid_0_1_0_0" = callPackage
+  "genvalidity-uuid_0_1_0_1" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, uuid, validity, validity-uuid
      }:
      mkDerivation {
        pname = "genvalidity-uuid";
-       version = "0.1.0.0";
-       sha256 = "1j4q3smhz812cfgsv6vmjgng068knd9v7xg0hkvx868wbndgk37h";
+       version = "0.1.0.1";
+       sha256 = "1ssihh980iz9kx2apygbw0r5qdb40hnvjkpsn2qw55r8d5hc4sa6";
        libraryHaskellDepends = [
          base genvalidity QuickCheck uuid validity validity-uuid
        ];
@@ -81933,14 +82098,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-vector_0_2_0_0" = callPackage
+  "genvalidity-vector_0_2_0_1" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, validity, validity-vector, vector
      }:
      mkDerivation {
        pname = "genvalidity-vector";
-       version = "0.2.0.0";
-       sha256 = "0ww3hzkzhblx8qp062vz74vwaqvv38l0sl0dwyxrqra68qglxr4f";
+       version = "0.2.0.1";
+       sha256 = "1xinffnzcaws7i6k0l3x89g6kzkg1vhiwkngh5ag69wvpzq3if7n";
        libraryHaskellDepends = [
          base genvalidity QuickCheck validity validity-vector vector
        ];
@@ -85481,6 +85646,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "github-webhooks_0_10_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "github-webhooks";
+       version = "0.10.0";
+       sha256 = "1pvif863yi6qxwjd43insjvrzizaz78b3kf8l13rmy3irjlqljh8";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptonite deepseq
+         deepseq-generics memory text time vector
+       ];
+       testHaskellDepends = [ aeson base bytestring hspec text vector ];
+       homepage = "https://github.com/onrock-eng/github-webhooks#readme";
+       description = "Aeson instances for GitHub Webhook payloads";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "githud" = callPackage
     ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck, text, unix
@@ -89074,6 +89259,7 @@ self: {
        homepage = "https://github.com/Teaspot-Studio/gore-and-ash-glfw";
        description = "Core module for Gore&Ash engine for GLFW input events";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gore-and-ash-lambdacube" = callPackage
@@ -90526,6 +90712,7 @@ self: {
        homepage = "https://github.com/alonsodomin/groot#readme";
        description = "Command line utility to manage AWS ECS resources";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gross" = callPackage
@@ -91135,20 +91322,22 @@ self: {
 
   "gtk-sni-tray" = callPackage
     ({ mkDerivation, base, bytestring, containers, dbus, directory
-     , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut
-     , gtk3, haskell-gi, haskell-gi-base, hslogger, optparse-applicative
+     , enclosed-exceptions, filepath, gi-dbusmenugtk3, gi-gdk
+     , gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut, gtk3, haskell-gi
+     , haskell-gi-base, hslogger, optparse-applicative
      , status-notifier-item, text, transformers, unix
      }:
      mkDerivation {
        pname = "gtk-sni-tray";
-       version = "0.1.1.0";
-       sha256 = "16wif6b94ipw49810jyjgl6h8mhx7bkz0pkl8ri6ir9ljp0mnvp0";
+       version = "0.1.2.0";
+       sha256 = "1imgna34fdsg2fwlxk5xb0dvw8sbqjk7qgvh1p3wc8q9yx8zl0qm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers dbus directory gi-dbusmenugtk3 gi-gdk
-         gi-gdkpixbuf gi-glib gi-gtk gtk-strut haskell-gi haskell-gi-base
-         hslogger status-notifier-item text transformers unix
+         base bytestring containers dbus directory enclosed-exceptions
+         filepath gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib gi-gtk
+         gtk-strut haskell-gi haskell-gi-base hslogger status-notifier-item
+         text transformers unix
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        executableHaskellDepends = [
@@ -91158,6 +91347,7 @@ self: {
        homepage = "https://github.com/IvanMalison/gtk-sni-tray#readme";
        description = "A standalone StatusNotifierItem/AppIndicator tray";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gtk-strut" = callPackage
@@ -91627,20 +91817,23 @@ self: {
      }) {};
 
   "h-gpgme" = callPackage
-    ({ mkDerivation, base, bindings-gpgme, bytestring, either, HUnit
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time
+    ({ mkDerivation, base, bindings-gpgme, bytestring, data-default
+     , directory, email-validate, exceptions, filepath, HUnit
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, temporary, time
      , transformers, unix
      }:
      mkDerivation {
        pname = "h-gpgme";
-       version = "0.4.0.0";
-       sha256 = "0v85bz57jn265v5pnr0xjw838qmiy7v6vinvvd6m7pj5zls5hx9m";
+       version = "0.5.0.0";
+       sha256 = "0fvkj7cz7nfz52a2zccngb8gbs8p94whvgccvnxpwmkg90m45mfp";
        libraryHaskellDepends = [
-         base bindings-gpgme bytestring either time unix
+         base bindings-gpgme bytestring data-default email-validate time
+         transformers unix
        ];
        testHaskellDepends = [
-         base bindings-gpgme bytestring either HUnit QuickCheck tasty
-         tasty-hunit tasty-quickcheck time transformers unix
+         base bindings-gpgme bytestring data-default directory
+         email-validate exceptions filepath HUnit QuickCheck tasty
+         tasty-hunit tasty-quickcheck temporary time transformers unix
        ];
        homepage = "https://github.com/rethab/h-gpgme";
        description = "High Level Binding for GnuPG Made Easy (gpgme)";
@@ -97440,7 +97633,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp_0_2_1_0" = callPackage
+  "haskell-lsp_0_2_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
      , lens, mtl, network-uri, parsec, sorted-list, stm, text, time
@@ -97448,8 +97641,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-lsp";
-       version = "0.2.1.0";
-       sha256 = "09wv2ic66lc03pndpx4xsmmv3zxwram5i82483j340avm2rp06c0";
+       version = "0.2.2.0";
+       sha256 = "1h3ibwd0i0z2c35fxw0m0gyd6dj45pf17x9hc5cgf3sql4qr5yxd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97499,8 +97692,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-lsp-types";
-       version = "0.2.1.0";
-       sha256 = "0byslqf8qw7rc1kva3inm8bsm9z12h19y3b3yzgwz1hlkshjl2d0";
+       version = "0.2.2.0";
+       sha256 = "0wchy8qrd450s90j6d26psznrd3n245lvn01qxa42l5akljmlymx";
        libraryHaskellDepends = [
          aeson base bytestring data-default filepath hashable lens
          network-uri text unordered-containers
@@ -104823,6 +105016,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hint_0_8_0" = callPackage
+    ({ mkDerivation, base, directory, exceptions, extensible-exceptions
+     , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix
+     }:
+     mkDerivation {
+       pname = "hint";
+       version = "0.8.0";
+       sha256 = "0h8wan0hb16m1gcil1csaay9f9f1pq3kfgbzfsfpjszmr1i2sw1f";
+       libraryHaskellDepends = [
+         base directory exceptions filepath ghc ghc-boot ghc-paths mtl
+         random unix
+       ];
+       testHaskellDepends = [
+         base directory exceptions extensible-exceptions filepath HUnit unix
+       ];
+       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
      }:
@@ -104839,6 +105053,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hinter" = callPackage
+    ({ mkDerivation, base, directory, exceptions, extensible-exceptions
+     , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix
+     }:
+     mkDerivation {
+       pname = "hinter";
+       version = "0.1.0.0";
+       sha256 = "0r790y7j64y79rqg7ip4dk5a8pbpryisp008lcmswzc0si35jfgl";
+       libraryHaskellDepends = [
+         base directory exceptions filepath ghc ghc-boot ghc-paths mtl
+         random unix
+       ];
+       testHaskellDepends = [
+         base directory exceptions extensible-exceptions filepath HUnit unix
+       ];
+       homepage = "https://github.com/strake/hint.hs";
+       description = "Runtime Haskell interpreter (GHC API wrapper)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hinterface" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, containers
      , cryptonite, exceptions, hspec, lifted-async, lifted-base, memory
@@ -105708,7 +105942,7 @@ self: {
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ gebner ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-iadd" = callPackage
@@ -106002,8 +106236,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.4";
-       sha256 = "01qgnljgsd331zx9df2diijnfvy78p1j6ysqqq317v66yxpz6vlh";
+       version = "2.1.5";
+       sha256 = "00kib9b80s0bhdv267dgybl68knmzzmq7n0maygzc0kxc9k1bwj1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -106260,6 +106494,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hmatrix-backprop_0_1_2_1" = callPackage
+    ({ mkDerivation, backprop, base, finite-typelits
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
+     , hmatrix, hmatrix-vector-sized, microlens, microlens-platform
+     , vector, vector-sized
+     }:
+     mkDerivation {
+       pname = "hmatrix-backprop";
+       version = "0.1.2.1";
+       sha256 = "0qcm2hkdh50xgvxhs6nr303h0gs1x9apiklgnk8xjzgibsy8vb1n";
+       libraryHaskellDepends = [
+         backprop base finite-typelits ghc-typelits-knownnat
+         ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens
+         vector vector-sized
+       ];
+       testHaskellDepends = [
+         backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized
+         microlens microlens-platform vector-sized
+       ];
+       homepage = "https://github.com/mstksg/hmatrix-backprop#readme";
+       description = "hmatrix operations lifted for backprop";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hmatrix-banded" = callPackage
     ({ mkDerivation, base, hmatrix, liblapack, transformers }:
      mkDerivation {
@@ -106450,6 +106709,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Sparse linear solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;};
 
   "hmatrix-special" = callPackage
@@ -106515,6 +106775,7 @@ self: {
        homepage = "https://github.com/idontgetoutmuch/hmatrix/tree/sundials";
        description = "hmatrix interface to sundials";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {sundials_arkode = null;};
 
   "hmatrix-svdlibc" = callPackage
@@ -109203,6 +109464,7 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -115230,6 +115492,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-streams_0_8_6_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
+     , base64-bytestring, blaze-builder, bytestring, Cabal
+     , case-insensitive, directory, ghc-prim, HsOpenSSL, hspec
+     , hspec-expectations, http-common, HUnit, io-streams, lifted-base
+     , mtl, network, network-uri, openssl-streams, snap-core
+     , snap-server, system-fileio, system-filepath, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "http-streams";
+       version = "0.8.6.1";
+       sha256 = "18vxd35n7s3z4gjvad94bknc8z1w9d7ccgphnhsxlz5cackizmxq";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-builder bytestring
+         case-insensitive directory HsOpenSSL http-common io-streams mtl
+         network network-uri openssl-streams text transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty attoparsec base base64-bytestring blaze-builder
+         bytestring case-insensitive directory ghc-prim HsOpenSSL hspec
+         hspec-expectations http-common HUnit io-streams lifted-base mtl
+         network network-uri openssl-streams snap-core snap-server
+         system-fileio system-filepath text transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/afcowie/http-streams/";
+       description = "An HTTP client using io-streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-test" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client, lens
      , lens-aeson, mtl, tasty, tasty-hunit, text, time, wreq
@@ -116569,7 +116865,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-rankselect_0_12_0_0" = callPackage
+  "hw-rankselect_0_12_0_1" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
      , directory, hedgehog, hspec, hw-balancedparens, hw-bits
      , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens
@@ -116577,8 +116873,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.12.0.0";
-       sha256 = "1yp9fmxk55ikhrrpkff4r1sgqadg4b0yfz2w1xardxb3n09n4xpa";
+       version = "0.12.0.1";
+       sha256 = "0jg27cpdw341gr1mjnqm5rq66q84q1rzwa5bp8czzws71m5kpfpy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120924,18 +121220,24 @@ self: {
      }) {};
 
   "int-multimap" = callPackage
-    ({ mkDerivation, base, containers, hashable, unordered-containers
+    ({ mkDerivation, base, containers, hashable, tasty, tasty-hunit
+     , tasty-quickcheck, unordered-containers
      }:
      mkDerivation {
        pname = "int-multimap";
-       version = "0.2";
-       sha256 = "17hwqly7v5224fddan9nkywv4pp478nby7iswaj32x27qwn9p11f";
+       version = "0.2.1";
+       sha256 = "080ypcd99pvw0wsrydz6hzd9hrr18v4kcb3wihz6v8ylfn08d6ci";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
+       testHaskellDepends = [
+         base containers hashable tasty tasty-hunit tasty-quickcheck
+         unordered-containers
+       ];
        homepage = "https://github.com/metrix-ai/int-multimap";
        description = "A data structure that associates each Int key with a set of values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "integer-gmp_1_0_2_0" = callPackage
@@ -126520,6 +126822,7 @@ self: {
        homepage = "http://github.com/asakamirai/kazura-queue";
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kbq-gu" = callPackage
@@ -132637,6 +132940,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lift-read-show" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "lift-read-show";
+       version = "0.1.0.0";
+       sha256 = "0sp725nflvqzxvhycjj1v9j46y4cx1vvbr9k6pfwz585n35gs1a0";
+       libraryHaskellDepends = [ base ];
+       description = "Helper methods to define `Read1`, `Read2`, `Show1`, `Show2` instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lifted-async" = callPackage
     ({ mkDerivation, async, base, constraints, criterion, deepseq
      , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
@@ -134599,7 +134913,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {llvm-config = null;};
 
-  "llvm-hs_6_0_0" = callPackage
+  "llvm-hs_6_1_1" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
      , containers, exceptions, llvm-config, llvm-hs-pure, mtl
      , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -134607,10 +134921,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-hs";
-       version = "6.0.0";
-       sha256 = "1hll3s40bbrzyylyfnh0w907cpkbxx6qn3a6wv7kfi107zfx2rgd";
-       revision = "1";
-       editedCabalFile = "1apyscxr48g37qw15wmqb98si8gcnx8cky6bj68ai3jfjfphbjly";
+       version = "6.1.1";
+       sha256 = "0vlp1rgddgavs4kg0s1qmny6mlx4rpz12ybcrqg6vmv68w1qyr5r";
        setupHaskellDepends = [ base Cabal containers ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -134629,22 +134941,22 @@ self: {
 
   "llvm-hs-pretty" = callPackage
     ({ mkDerivation, array, base, bytestring, directory, filepath
-     , llvm-hs, llvm-hs-pure, mtl, pretty-show, tasty, tasty-golden
-     , tasty-hspec, tasty-hunit, text, transformers, wl-pprint-text
+     , llvm-hs, llvm-hs-pure, mtl, tasty, tasty-golden, tasty-hspec
+     , tasty-hunit, text, transformers, wl-pprint-text
      }:
      mkDerivation {
        pname = "llvm-hs-pretty";
-       version = "0.2.0.0";
-       sha256 = "133kyksbp88q0wavp3wdjg69h9fpwi7nq626nvikdy46cf7lgklh";
+       version = "0.2.1.0";
+       sha256 = "1v8nz7c7wvvh29c48li10m12lj8y3yn5b8rs1b86y351s11vsag6";
        libraryHaskellDepends = [
          array base bytestring llvm-hs-pure text wl-pprint-text
        ];
        testHaskellDepends = [
-         base directory filepath llvm-hs llvm-hs-pure mtl pretty-show tasty
-         tasty-golden tasty-hspec tasty-hunit text transformers
+         base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden
+         tasty-hspec tasty-hunit text transformers
        ];
        homepage = "https://github.com/llvm-hs/llvm-hs-pretty";
-       description = "Pretty printer for LLVM IR";
+       description = "A pretty printer for LLVM IR";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -134671,24 +134983,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "llvm-hs-pure_6_0_0" = callPackage
+  "llvm-hs-pure_6_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, fail
-     , hspec, mtl, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, transformers, unordered-containers
+     , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "llvm-hs-pure";
-       version = "6.0.0";
-       sha256 = "005414p1jv5nyf3awiybksc1paf092a9070x23l2y6fvd9jhy0sl";
-       revision = "1";
-       editedCabalFile = "05idczj2c9iv3kb7fyfhc0ypfsmcjkf9n46w24ivarjbs8fykrb3";
+       version = "6.1.0";
+       sha256 = "12fivm5w4nz306p7w0bxsmgb2cnbkp06dyrdfi64vrsgm9kgbqmw";
        libraryHaskellDepends = [
          attoparsec base bytestring containers fail mtl template-haskell
          transformers unordered-containers
        ];
        testHaskellDepends = [
-         base bytestring containers hspec mtl tasty tasty-hunit
-         tasty-quickcheck text transformers unordered-containers
+         base containers mtl tasty tasty-hunit tasty-quickcheck transformers
        ];
        homepage = "http://github.com/llvm-hs/llvm-hs/";
        description = "Pure Haskell LLVM functionality (no FFI)";
@@ -135090,19 +135399,16 @@ self: {
      }) {};
 
   "locators" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, cryptohash
-     , hspec, hspec-expectations, HUnit, QuickCheck
+    ({ mkDerivation, base, bytestring, containers, cryptohash, hspec
+     , HUnit, QuickCheck
      }:
      mkDerivation {
        pname = "locators";
-       version = "0.2.4.3";
-       sha256 = "0wcp56hy8zs7sngspzywyq4j39y0pji0xwqj7x1i26rg77wi7xw4";
-       libraryHaskellDepends = [
-         base bytestring cereal containers cryptohash
-       ];
+       version = "0.2.4.4";
+       sha256 = "19csw13qbxxv7lr3blx856k2y21sidgpnv56dq45la3f4100jv9d";
+       libraryHaskellDepends = [ base bytestring containers cryptohash ];
        testHaskellDepends = [
-         base bytestring cereal containers cryptohash hspec
-         hspec-expectations HUnit QuickCheck
+         base bytestring containers cryptohash hspec HUnit QuickCheck
        ];
        description = "Human exchangable identifiers and locators";
        license = stdenv.lib.licenses.bsd3;
@@ -139482,17 +139788,17 @@ self: {
      , brick, brick-skylighting, bytestring, cheapskate, checkers
      , config-ini, connection, containers, directory, filepath, gitrev
      , hashable, Hclip, mattermost-api, mattermost-api-qc
-     , microlens-platform, mtl, process, quickcheck-text, semigroups
-     , skylighting-core, stm, stm-delay, strict, string-conversions
-     , tasty, tasty-hunit, tasty-quickcheck, temporary, text
-     , text-zipper, time, timezone-olson, timezone-series, transformers
-     , Unique, unix, unordered-containers, utf8-string, vector, vty
-     , word-wrap, xdg-basedir
+     , microlens-platform, mtl, process, quickcheck-text, random
+     , semigroups, skylighting-core, stm, stm-delay, strict
+     , string-conversions, tasty, tasty-hunit, tasty-quickcheck
+     , temporary, text, text-zipper, time, timezone-olson
+     , timezone-series, transformers, Unique, unix, unordered-containers
+     , utf8-string, uuid, vector, vty, word-wrap, xdg-basedir
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "40900.0.1";
-       sha256 = "1ygnh27dv5hprb5fqqxwjxsf43ik784pwdagndn3sdiddy2k3yf7";
+       version = "40901.0.0";
+       sha256 = "1ra1ikivf5y17mzwjvfsvg1kz4438wllv2qwxzaigb9cirrz0n4r";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -139500,9 +139806,9 @@ self: {
          aeson aspell-pipe async base base-compat brick brick-skylighting
          bytestring cheapskate config-ini connection containers directory
          filepath gitrev hashable Hclip mattermost-api microlens-platform
-         mtl process semigroups skylighting-core stm stm-delay strict
+         mtl process random semigroups skylighting-core stm stm-delay strict
          temporary text text-zipper time timezone-olson timezone-series
-         transformers unix unordered-containers utf8-string vector vty
+         transformers unix unordered-containers utf8-string uuid vector vty
          word-wrap xdg-basedir
        ];
        testHaskellDepends = [
@@ -139511,8 +139817,8 @@ self: {
          mattermost-api mattermost-api-qc microlens-platform mtl process
          quickcheck-text semigroups stm strict string-conversions tasty
          tasty-hunit tasty-quickcheck text text-zipper time timezone-olson
-         timezone-series transformers Unique unordered-containers vector vty
-         xdg-basedir
+         timezone-series transformers Unique unordered-containers uuid
+         vector vty xdg-basedir
        ];
        description = "Terminal client for the Mattermost chat system";
        license = stdenv.lib.licenses.bsd3;
@@ -139648,6 +139954,7 @@ self: {
        homepage = "https://github.com/george-steel/maxent-learner";
        description = "GUI for maxent-learner-hw";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maximal-cliques" = callPackage
@@ -141195,6 +141502,7 @@ self: {
        ];
        description = "A tiny JSON library with light dependency footprint";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microbench" = callPackage
@@ -143298,8 +143606,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-classes";
-       version = "0.3.2.0";
-       sha256 = "0r6wfl7xd870ml1mysznih1yly9rnj869cpr30fjwy9dsybkbfwr";
+       version = "0.3.2.1";
+       sha256 = "0vclcwxy0qc9y1i3iw0ysymcvikn12mi5lfbarxykdhygmi1w5m5";
        libraryHaskellDepends = [
          base ghc-prim mmorph monad-control peano reflection transformers
          transformers-base transformers-compat
@@ -144118,6 +144426,8 @@ self: {
        pname = "monad-ste";
        version = "0.1.0.0";
        sha256 = "0yqkx7rlrfms7wiymb41y5nxh8fyi4049729iamwablx6hdpsrw6";
+       revision = "1";
+       editedCabalFile = "17xfha8zn0snlqwi8cr44my3d1zbyvhh83qlmb747dblhmj1rdi1";
        libraryHaskellDepends = [ base exceptions ghc-prim primitive ];
        testHaskellDepends = [ base hspec HUnit ];
        homepage = "http://github.com/cartazio/monad-ste";
@@ -144696,6 +145006,38 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "mongoDB_2_4_0_0" = callPackage
+    ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
+     , binary, bson, bytestring, conduit, conduit-extra, containers
+     , criterion, cryptohash, data-default-class, hashtables, hspec
+     , lifted-base, monad-control, mtl, network, nonce, old-locale
+     , parsec, pureMD5, random, random-shuffle, resourcet, stm, tagged
+     , text, time, tls, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "mongoDB";
+       version = "2.4.0.0";
+       sha256 = "06g7mvazsymbyzm1zhsyfpbmhvlizidb4lp5l6axfw2wh90h5f7x";
+       libraryHaskellDepends = [
+         array base base16-bytestring base64-bytestring binary bson
+         bytestring conduit conduit-extra containers cryptohash
+         data-default-class hashtables lifted-base monad-control mtl network
+         nonce parsec pureMD5 random random-shuffle resourcet stm tagged
+         text time tls transformers transformers-base
+       ];
+       testHaskellDepends = [ base hspec mtl old-locale text time ];
+       benchmarkHaskellDepends = [
+         array base base16-bytestring base64-bytestring binary bson
+         bytestring containers criterion cryptohash data-default-class
+         hashtables lifted-base monad-control mtl network nonce parsec
+         random random-shuffle stm text transformers-base
+       ];
+       homepage = "https://github.com/mongodb-haskell/mongodb";
+       description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mongodb-queue" = callPackage
     ({ mkDerivation, base, data-default, hspec, lifted-base
      , monad-control, mongoDB, network, text, transformers
@@ -146615,6 +146957,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "multivector" = callPackage
+    ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck, Vector
+     , vector
+     }:
+     mkDerivation {
+       pname = "multivector";
+       version = "0.1.0.0";
+       sha256 = "183i59ri20fci2f2w4algmr8crz6q2aj1yirhgwjilkj3f4h6h4d";
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [
+         base smallcheck tasty tasty-smallcheck Vector
+       ];
+       description = "Vectors of packed tuples";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {Vector = null;};
+
   "muon" = callPackage
     ({ mkDerivation, base, blaze-html, ConfigFile, directory, Glob
      , happstack-server, HStringTemplate, markdown, MissingH, process
@@ -147340,6 +147700,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mxnet;};
 
+  "mxnet-dataiter" = callPackage
+    ({ mkDerivation, base, conduit, conduit-combinators, hspec, mxnet
+     , mxnet-nn, streaming, template-haskell
+     }:
+     mkDerivation {
+       pname = "mxnet-dataiter";
+       version = "0.1.0.0";
+       sha256 = "1cicxgasx0s840vvkc6n6v6rsrr8rk9jhpqh96kiy6dk0m4k02s9";
+       libraryHaskellDepends = [
+         base conduit conduit-combinators mxnet mxnet-nn streaming
+         template-haskell
+       ];
+       testHaskellDepends = [ base hspec mxnet streaming ];
+       homepage = "https://github.com/pierric/mxnet-dataiter#readme";
+       description = "mxnet dataiters";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mxnet-examples" = callPackage
     ({ mkDerivation, base, mxnet }:
      mkDerivation {
@@ -147359,16 +147738,17 @@ self: {
     ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
      , exceptions, ghc-prim, lens, mmorph, mtl, mxnet, resourcet
      , streaming, streaming-bytestring, streaming-utils
-     , unordered-containers, vector
+     , transformers-base, unordered-containers, vector
      }:
      mkDerivation {
        pname = "mxnet-nn";
-       version = "0.0.1.2";
-       sha256 = "0w5ri77ccav65dza3a4aanzvylcwscs4rf4yqylc12w03xh0rshp";
+       version = "0.0.1.3";
+       sha256 = "0693ca7rwai4s8i8vqbmmq3q50pd23svcnnnd1cxjbqxh6hgsbs1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base lens mtl mxnet resourcet unordered-containers vector
+         base lens mtl mxnet resourcet transformers-base
+         unordered-containers vector
        ];
        executableHaskellDepends = [
          attoparsec attoparsec-binary base bytestring exceptions ghc-prim
@@ -148860,8 +149240,8 @@ self: {
      }:
      mkDerivation {
        pname = "nest";
-       version = "0.0.1";
-       sha256 = "1ndd93z9yqa1slhb8wq3j5fr3rc2fna0cb5xqh9s3dynb966zqqk";
+       version = "0.0.2";
+       sha256 = "15q7c2ppw1ajnhglfawlc2a65k7d2cvcpav88y8kjqmp68hvgpic";
        libraryHaskellDepends = [
          base bytestring containers text transformers unix
        ];
@@ -156573,18 +156953,18 @@ self: {
 
   "pandoc-placetable" = callPackage
     ({ mkDerivation, aeson, base, bytestring, explicit-exception
-     , http-conduit, pandoc-types, spreadsheet, utf8-string
+     , http-conduit, pandoc-types, spreadsheet, text, utf8-string
      }:
      mkDerivation {
        pname = "pandoc-placetable";
-       version = "0.4.2";
-       sha256 = "0y8mz2jgnfzr8ib7w4bfwwdsljs3a2qpq3pxgvl2jwi7wdrcslai";
+       version = "0.5";
+       sha256 = "0kjlx2krgwf32y30cca09xnf1h3c91s0pzsv5xf7l8zw85jikxah";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring explicit-exception http-conduit pandoc-types
-         spreadsheet utf8-string
+         spreadsheet text utf8-string
        ];
        homepage = "https://github.com/mb21/pandoc-placetable";
        description = "Pandoc filter to include CSV files";
@@ -156786,6 +157166,7 @@ self: {
        homepage = "https://github.com/tuura/pangraph#readme";
        description = "A set of parsers for graph languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "panhandle" = callPackage
@@ -158362,8 +158743,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.6.1.1";
-       sha256 = "153d2ij27jjsh0h014d1v3y06diri1njbmwzvq2kgwdbdqgkhf0y";
+       version = "0.7.0.0";
+       sha256 = "0w7k1s8nma0bp4cvacmpa3fxxslarcijpxvbvasjyik3inazqhsd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160954,6 +161335,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Deprecated - ghci debug viewer with simple editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phoityne-vscode" = callPackage
@@ -161177,6 +161559,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pi-hoole" = callPackage
+    ({ mkDerivation, aeson, base, base58-bytestring, blaze-html
+     , bytestring, containers, directory, filepath, http-types
+     , megaparsec, optparse-generic, process, regex-pcre, shakespeare
+     , text, unix, wai, warp, yaml
+     }:
+     mkDerivation {
+       pname = "pi-hoole";
+       version = "0.2.0.0";
+       sha256 = "0qjs8b7ljybvklx9s5xmb9kg2mxlaqfwjf7d52c31y3f21d5q8q0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers directory filepath megaparsec process text
+       ];
+       executableHaskellDepends = [
+         aeson base base58-bytestring blaze-html bytestring containers
+         directory filepath http-types megaparsec optparse-generic
+         regex-pcre shakespeare text unix wai warp yaml
+       ];
+       testHaskellDepends = [ base ];
+       description = "Lightweight access control solution for the pijul vcs";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "pi-lcd" = callPackage
     ({ mkDerivation, base, bytestring, clock, deepseq, text, unix
      , unordered-containers
@@ -161396,6 +161803,7 @@ self: {
        homepage = "https://github.com/judah/pier#readme";
        description = "Yet another Haskell build system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "piet" = callPackage
@@ -162159,6 +162567,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pipes-group_1_0_10" = callPackage
+    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
+     , pipes-parse, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-group";
+       version = "1.0.10";
+       sha256 = "1j37sj0i7lkmk228lchp5kkvf86fiwrkikwwrfibpb6xwixjmlr8";
+       libraryHaskellDepends = [
+         base free pipes pipes-parse transformers
+       ];
+       testHaskellDepends = [ base doctest lens-family-core ];
+       description = "Group streams into substreams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-http" = callPackage
     ({ mkDerivation, base, bytestring, http-client, http-client-tls
      , pipes
@@ -162981,8 +163406,8 @@ self: {
      }:
      mkDerivation {
        pname = "planb-token-introspection";
-       version = "0.1.1.0";
-       sha256 = "0b54sr1zvrczjxlx9xrb5zcy1kmybv396cigqvm652k9q16zifc5";
+       version = "0.1.2.0";
+       sha256 = "09b54m2m90g8ci6sxsgayvfxd9gmkwp2xw16gk1afxnha39lzwlq";
        libraryHaskellDepends = [
          aeson aeson-casing base bytestring containers http-client
          http-client-tls http-types mtl safe-exceptions text transformers
@@ -163714,6 +164139,8 @@ self: {
        pname = "pointfree-fancy";
        version = "1.1.1.7";
        sha256 = "1xw2p96ghclfxmc12kwxyh25r5k9k6h3zriaf38wz5d3j36npa7w";
+       revision = "1";
+       editedCabalFile = "0mdanymbifnxc85z3aixmn5v08kxa1fjazadrhc0jjf5y110sxc2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165510,8 +165937,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki";
-       version = "0.11.2";
-       sha256 = "1c07q872d6k75cah1rfjw7wfam76fn8dc4x265v0xrngys6k9iwh";
+       version = "0.11.3";
+       sha256 = "134wy711qnkrwa9c78d7lv8vnc3b5a2dqyslzvs59xqx4csh61xj";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring directory foldl hashable
          potoki-core profunctors ptr text transformers unagi-chan
@@ -166331,6 +166758,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "preprocessor-tools_2_0_2" = callPackage
+    ({ mkDerivation, base, mtl, parsec, syb }:
+     mkDerivation {
+       pname = "preprocessor-tools";
+       version = "2.0.2";
+       sha256 = "0m825wnz7vs3as10glfzy7j0laf6j9w566isly95005gj2sb0lwp";
+       libraryHaskellDepends = [ base mtl parsec syb ];
+       homepage = "https://github.com/tov/preprocessor-tools-hs";
+       description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "presburger" = callPackage
     ({ mkDerivation, base, containers, pretty, QuickCheck }:
      mkDerivation {
@@ -166516,6 +166956,7 @@ self: {
        homepage = "https://github.com/NorfairKing/pretty-relative-time#readme";
        description = "Pretty relative time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-show" = callPackage
@@ -166798,6 +167239,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "prim-ref" = callPackage
+    ({ mkDerivation, base, ghc-prim, primitive, semigroups }:
+     mkDerivation {
+       pname = "prim-ref";
+       version = "0.1";
+       sha256 = "0fyjxpk4xllkh3r5b7fbb4sb6whxwbdm5lr9zn44qb9v4g0nx2d8";
+       libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
+       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
@@ -167532,6 +167985,7 @@ self: {
        libraryHaskellDepends = [ base category ];
        description = "Product category";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "product-isomorphic" = callPackage
@@ -170940,15 +171394,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-classes_0_4_9" = callPackage
+  "quickcheck-classes_0_4_10" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, containers, primitive
      , QuickCheck, semigroupoids, semigroups, tagged, transformers
      , vector
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.9";
-       sha256 = "1m5qszs50hjfycds84arfcfqj7z4l622479bd2w55vin49mp12pn";
+       version = "0.4.10";
+       sha256 = "1x01746853wbfrfry807gva15wn02jcd0cfqbag7f5xm1fd8nlss";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups tagged transformers
@@ -171189,6 +171643,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quickcheck-state-machine-distributed" = callPackage
+    ({ mkDerivation, base, binary, containers, directory
+     , distributed-process, mtl, network-transport
+     , network-transport-tcp, QuickCheck, random, stm, strict, tasty
+     , tasty-quickcheck, temporary
+     }:
+     mkDerivation {
+       pname = "quickcheck-state-machine-distributed";
+       version = "0.0.1";
+       sha256 = "0451xx4c3698nk3c2jhq7xmc0nnaxlj422i30sh7cgyrfrbdw9wj";
+       libraryHaskellDepends = [
+         base binary containers distributed-process mtl network-transport
+         network-transport-tcp QuickCheck random stm
+       ];
+       testHaskellDepends = [
+         base binary containers directory distributed-process mtl
+         network-transport network-transport-tcp QuickCheck random stm
+         strict tasty tasty-quickcheck temporary
+       ];
+       homepage = "https://github.com/advancedtelematic/quickcheck-state-machine-distributed#readme";
+       description = "Test monadic programs using state machine based models";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "quickcheck-string-random" = callPackage
     ({ mkDerivation, base, QuickCheck, string-random, tasty
      , tasty-quickcheck, text
@@ -172213,6 +172691,7 @@ self: {
        libraryHaskellDepends = [ base primitive transformers util ];
        description = "Class of random value generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-derive" = callPackage
@@ -173557,8 +174036,8 @@ self: {
     ({ mkDerivation, base, doctest, reactive-banana, stm, time }:
      mkDerivation {
        pname = "reactive-banana-automation";
-       version = "0.1.1";
-       sha256 = "0fn3frv0idgdg9faysri7x5nzrxrzhpy41s5nm6v8ckqcnzq7vvv";
+       version = "0.3.0";
+       sha256 = "1f752kmfmgdx9mhvzljm37vrn18jn7wgz0m4byl3v4npcv502cyr";
        libraryHaskellDepends = [ base reactive-banana stm time ];
        testHaskellDepends = [ base doctest ];
        description = "home (etc) automation using reactive-banana";
@@ -174119,6 +174598,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "record-dot-preprocessor" = callPackage
+    ({ mkDerivation, base, extra, filepath }:
+     mkDerivation {
+       pname = "record-dot-preprocessor";
+       version = "0.1";
+       sha256 = "1py5bkwxwwq1jjsa16rmjm92hxnil0clim5579h5mizzq47fczrd";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base extra filepath ];
+       homepage = "https://github.com/ndmitchell/record-dot-preprocessor#readme";
+       description = "Preprocessor to allow record.field syntax";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "record-gl" = callPackage
     ({ mkDerivation, base, base-prelude, containers, GLUtil, HUnit
      , linear, OpenGL, record, tagged, template-haskell, test-framework
@@ -180329,21 +180822,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "s3-signer_0_4_0_0" = callPackage
+  "s3-signer_0_5_0_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, byteable
      , bytestring, case-insensitive, cryptohash, http-types, time
      , utf8-string
      }:
      mkDerivation {
        pname = "s3-signer";
-       version = "0.4.0.0";
-       sha256 = "1s1l5zj4azbgl0p6w52498d6shc5c0yqnzrbjfz1hh45hh2182qf";
+       version = "0.5.0.0";
+       sha256 = "1r48j7ni8byzdi0girkj6lf2hp4q85ir2xnqpckzdxd0ppap2dnp";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder byteable bytestring
          case-insensitive cryptohash http-types time utf8-string
        ];
-       testHaskellDepends = [ base blaze-builder bytestring time ];
-       doHaddock = false;
+       testHaskellDepends = [
+         base base64-bytestring blaze-builder byteable bytestring
+         case-insensitive cryptohash http-types time utf8-string
+       ];
        homepage = "https://github.com/dmjio/s3-signer";
        description = "Pre-signed Amazon S3 URLs";
        license = stdenv.lib.licenses.bsd3;
@@ -183655,15 +184150,16 @@ self: {
 
   "semirings" = callPackage
     ({ mkDerivation, base, constrictor, containers, hashable
-     , integer-gmp, unordered-containers, vector
+     , integer-gmp, semigroups, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "semirings";
-       version = "0.1.1";
-       sha256 = "1vrvid3ix80vwmf7qmp5f1f97nyzkq4a01bxf62kpqlbri2m9mz3";
+       version = "0.1.2";
+       sha256 = "1fn1hbrnljgx8kdnmk0c01zi1r0pk59cildla9gb6bykqs4rwmws";
        libraryHaskellDepends = [
-         base constrictor containers hashable integer-gmp
-         unordered-containers vector
+         base constrictor containers hashable integer-gmp semigroups
+         transformers unordered-containers vector
        ];
        homepage = "http://github.com/chessai/semirings";
        description = "two monoids as one, in holy haskimony";
@@ -187151,8 +187647,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.8.0.2";
-       sha256 = "16gmyn1rbfx33dxxkyxrswa8cvjpiq3i2vm59hy4y9lag10nq9xn";
+       version = "1.8.0.4";
+       sha256 = "036clj4q6rwgzjc3abirir5yqrn78vnj7c5w8p9b82jkrlka8w6g";
        libraryHaskellDepends = [
          base binary dependency directory hashable hs2ats language-ats lens
          shake shake-ext text
@@ -187186,8 +187682,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ext";
-       version = "2.11.0.2";
-       sha256 = "1wmvk91gfmrd1cqj3k70h3lc2xypiqs2d2dh4xlq97fsqm2kmfmy";
+       version = "2.11.0.3";
+       sha256 = "0v5n7l3xx1a0y4vvrn0zi61pb3wd41pqh1g3vnq1dr12dhrrx1ac";
        libraryHaskellDepends = [
          base Cabal cdeps composition-prelude cpphs directory shake
          template-haskell
@@ -195465,6 +195961,7 @@ self: {
        homepage = "https://github.com/clintonmead/stack-lib#readme";
        description = "Wrapper to use stack as a library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-network" = callPackage
@@ -195507,6 +196004,7 @@ self: {
        homepage = "https://github.com/McGizzle/stack-network#readme";
        description = "A program for extending Stack to add distributed capabilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-prism" = callPackage
@@ -197817,6 +198315,7 @@ self: {
        ];
        description = "Streaming conversion from/to base64";
        license = stdenv.lib.licenses.cc0;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-benchmarks" = callPackage
@@ -201410,8 +201909,8 @@ self: {
     ({ mkDerivation, attoparsec, base, process, text }:
      mkDerivation {
        pname = "system-info";
-       version = "0.4.0.0";
-       sha256 = "1sl1m19ia5n8rws49596lipjzx5q3jn9yjqhjlfs4vvh9rc2dnkh";
+       version = "0.4.0.1";
+       sha256 = "1v18ds9k7vnvzghpyqkh1ixskf27cb94f9r696982h2vp373zh43";
        libraryHaskellDepends = [ attoparsec base process text ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/ChaosGroup/system-info";
@@ -201931,34 +202430,37 @@ self: {
 
   "taffybar" = callPackage
     ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers
-     , dbus, directory, dyre, either, enclosed-exceptions, filepath
-     , gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-gtk, glib, gtk-traymanager
-     , gtk3, haskell-gi-base, HStringTemplate, HTTP, mtl, multimap
-     , network, network-uri, old-locale, parsec, process, rate-limit
-     , safe, split, stm, text, time, time-locale-compat, time-units
-     , transformers, transformers-base, tuple, unix, utf8-string, X11
-     , xdg-basedir, xml, xml-helpers, xmonad, xmonad-contrib
+     , dbus, dbus-hslogger, directory, dyre, either, enclosed-exceptions
+     , filepath, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-glib
+     , gi-gtk, glib, gtk-sni-tray, gtk-strut, gtk-traymanager, gtk3
+     , haskell-gi, haskell-gi-base, hslogger, HStringTemplate, HTTP, mtl
+     , multimap, network, network-uri, old-locale, optparse-applicative
+     , parsec, process, rate-limit, regex-compat, safe, split
+     , status-notifier-item, stm, text, time, time-locale-compat
+     , time-units, transformers, transformers-base, tuple, unix
+     , utf8-string, X11, xdg-basedir, xml, xml-helpers, xmonad
+     , xmonad-contrib
      }:
      mkDerivation {
        pname = "taffybar";
-       version = "1.0.2";
-       sha256 = "05061nfnp0m833z1hqz8q6v4gphal03w4prvpfb12vwvsvsvsin9";
-       revision = "1";
-       editedCabalFile = "02ip0c6fq3ra6zhhq2adxjx8j4w07x19zndkk0jj6jn6kj5qggf3";
+       version = "2.0.0";
+       sha256 = "1s3nqvsivi4wgi6hi7b3f83r75sl5qp0hsqr0cdwd7s8fqai3wia";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         alsa-mixer base cairo ConfigFile containers dbus directory dyre
-         either enclosed-exceptions filepath gi-gdk gi-gdkpixbuf gi-gdkx11
-         gi-gtk glib gtk-traymanager gtk3 haskell-gi-base HStringTemplate
-         HTTP mtl multimap network network-uri old-locale parsec process
-         rate-limit safe split stm text time time-locale-compat time-units
+         alsa-mixer base cairo ConfigFile containers dbus dbus-hslogger
+         directory dyre either enclosed-exceptions filepath gi-cairo gi-gdk
+         gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk glib gtk-sni-tray gtk-strut
+         gtk-traymanager gtk3 haskell-gi haskell-gi-base hslogger
+         HStringTemplate HTTP mtl multimap network network-uri old-locale
+         parsec process rate-limit regex-compat safe split
+         status-notifier-item stm text time time-locale-compat time-units
          transformers transformers-base tuple unix utf8-string X11
          xdg-basedir xml xml-helpers xmonad xmonad-contrib
        ];
-       executableHaskellDepends = [ base ];
-       homepage = "http://github.com/travitch/taffybar";
+       executableHaskellDepends = [ base hslogger optparse-applicative ];
+       homepage = "http://github.com/taffybar/taffybar";
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -203769,16 +204271,16 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "teardown_0_4_1_0" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, gauge, rio, tasty
+  "teardown_0_5_0_0" = callPackage
+    ({ mkDerivation, base, gauge, prettyprinter, rio, tasty
      , tasty-hunit, typed-process, unliftio
      }:
      mkDerivation {
        pname = "teardown";
-       version = "0.4.1.0";
-       sha256 = "1w8yblzn0i8i03bfg97qgq4c6i6l2p04krvwg41q157rcgb91gq0";
+       version = "0.5.0.0";
+       sha256 = "0p1rjvl36gl4dqpvcjsb06jyiwsxg2qyha8rfdiddljb4ixw1sjh";
        libraryHaskellDepends = [
-         ansi-wl-pprint base rio typed-process unliftio
+         base prettyprinter rio typed-process unliftio
        ];
        testHaskellDepends = [
          base rio tasty tasty-hunit typed-process unliftio
@@ -204775,6 +205277,7 @@ self: {
        homepage = "http://mbays.freeshell.org/tersmu";
        description = "A semantic parser for lojban";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-fixture" = callPackage
@@ -212608,6 +213111,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "txt" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, smallcheck, tasty
+     , tasty-smallcheck, utf8-string, util
+     }:
+     mkDerivation {
+       pname = "txt";
+       version = "0.0.2.1";
+       sha256 = "0cdng6qlskycpmr1yxvr25q5j876nji5iw3hlx2xb7n0rvk3ylh5";
+       libraryHaskellDepends = [
+         base bytestring deepseq utf8-string util
+       ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       description = "Text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "txt-sushi" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , parsec, regex-posix
@@ -216712,6 +217232,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "util-plus" = callPackage
@@ -217422,14 +217943,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-aeson_0_2_0_0" = callPackage
+  "validity-aeson_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, validity, validity-scientific
      , validity-text, validity-unordered-containers, validity-vector
      }:
      mkDerivation {
        pname = "validity-aeson";
-       version = "0.2.0.0";
-       sha256 = "01ck9kbclrjxbjb7rvr1y95cizbdq5lzdd0xfpbpaf4rfgjd3w56";
+       version = "0.2.0.1";
+       sha256 = "001smpck69y4bmrzrykjvjnrwjllny83kh1l1c2fyy4zzjw14lpy";
        libraryHaskellDepends = [
          aeson base validity validity-scientific validity-text
          validity-unordered-containers validity-vector
@@ -219408,6 +219929,28 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "voicebase" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, http-client
+     , http-client-openssl, json-autotype, lens, mime-types, options
+     , text, wreq
+     }:
+     mkDerivation {
+       pname = "voicebase";
+       version = "0.1.1.1";
+       sha256 = "1nc2cmfmdalggb7f9xw4xrhms31cky478wxxkq50as6bryl3k3q3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring HsOpenSSL http-client http-client-openssl
+         json-autotype lens mime-types text wreq
+       ];
+       executableHaskellDepends = [ base bytestring mime-types options ];
+       testHaskellDepends = [ base ];
+       homepage = "https://bitbucket.org/daisee/voicebase";
+       description = "Upload audio files to voicebase to get a transcription";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "void" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -219460,6 +220003,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vpq" = callPackage
+    ({ mkDerivation, base, primitive, smallcheck, tasty
+     , tasty-smallcheck, util, vector
+     }:
+     mkDerivation {
+       pname = "vpq";
+       version = "0.1.0.0";
+       sha256 = "1qa3l71ch96slan8s2zx9wc4ljsl4jgl83m7h0rfb9nd9cawflf7";
+       libraryHaskellDepends = [ base primitive util vector ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       description = "Priority queue based on vector";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vrpn" = callPackage
     ({ mkDerivation, base, vrpn }:
      mkDerivation {
@@ -222871,14 +223429,15 @@ self: {
      }:
      mkDerivation {
        pname = "weeder";
-       version = "1.0.4";
-       sha256 = "0xcqhc09v81ynpfxyqb2nyjypcxw84b7ac7cwmkfwf1i71ixf28q";
-       isLibrary = false;
+       version = "1.0.5";
+       sha256 = "0blaknr11j95sxdm6k2pyfmq1f2llg4hdmy24rvjy9jb82d3vrsi";
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring cmdargs deepseq directory extra filepath
          foundation hashable process text unordered-containers vector yaml
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/ndmitchell/weeder#readme";
        description = "Detect dead code";
        license = stdenv.lib.licenses.bsd3;
@@ -223990,6 +224549,8 @@ self: {
        pname = "wordchoice";
        version = "0.1.2.6";
        sha256 = "16x595vv9fbq6j634a8wqnd1agmzbv09372sc99lq1a997crmq2w";
+       revision = "1";
+       editedCabalFile = "1igc5fc91ilva7yqhcmdsd6yq6q974ybb2hwk856cpqpmas0402j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -224033,21 +224594,21 @@ self: {
 
   "wordpass" = callPackage
     ({ mkDerivation, base, containers, deepseq, directory, filepath
-     , hflags, random-fu, random-source, text, unix-compat, vector
+     , optparse-applicative, QuickCheck, text, unix-compat, vector
      }:
      mkDerivation {
        pname = "wordpass";
-       version = "1.0.0.7";
-       sha256 = "1n6r47ki83xzvms90sxnyqfyqzrs7j705ji2832mf5160xld30r2";
+       version = "1.0.0.9";
+       sha256 = "0gkcqcfl0n9z94bjg2ajzlwjm55qxsc9yd2q97azw4g2c69sn8lq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers deepseq directory filepath random-fu random-source
-         text unix-compat vector
+         base containers deepseq directory filepath optparse-applicative
+         QuickCheck text unix-compat vector
        ];
        executableHaskellDepends = [
-         base containers deepseq directory filepath hflags random-fu
-         random-source text unix-compat vector
+         base containers deepseq directory filepath optparse-applicative
+         QuickCheck text unix-compat vector
        ];
        homepage = "https://github.com/mgajda/wordpass";
        description = "Dictionary-based password generator";
@@ -224844,6 +225405,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wuss_1_1_9" = callPackage
+    ({ mkDerivation, base, bytestring, connection, network, websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.1.9";
+       sha256 = "1la0zvdsb1w0k2sj8f9wrnsirljjnbx0a1kalzwalh6d82h2jd9z";
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       homepage = "https://github.com/tfausak/wuss#readme";
+       description = "Secure WebSocket (WSS) clients";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wx" = callPackage
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
-- 
GitLab


From 4764a6e2e9d375ec7ecba642fe5f2666ca0c6256 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sat, 5 May 2018 07:33:37 -0400
Subject: [PATCH 0195/1085] haskell-gi, gi-gdkx11: fix builds

The `haskell-gi` build fails its doctests because of a missing
library; I'm not 100% convinced that setting it to `dontCheck` is the
right thing to do, but I don't have a better idea at the moment.

The `gi-gdkx11` build fails because, surprise, Gdk-X11 isn't found; by
looking around in my store, I found that that that library seems to
live in gtk3 these days; this override is just a stop-gap, though,
I've also submitted the change to cabal2nix that I believe will fix
the automatic generation of the package in the future.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8c7ef561f17..84c08aaffdd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -422,6 +422,9 @@ self: super: {
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
 
+  haskell-gi = dontCheck super.haskell-gi;
+  gi-gdkx11 = super.gi-gdkx11.override { gdk-x11 = pkgs.gtk3; };
+
   # https://github.com/basvandijk/threads/issues/10
   threads = dontCheck super.threads;
 
-- 
GitLab


From 127de7480e8dfc6c29aae06eb4669bb08c41763e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 May 2018 18:05:08 +0200
Subject: [PATCH 0196/1085] haskell-attoparsec-varword: fix infinite recursion
 in test dependencies

---
 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 84c08aaffdd..7dc1145411b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -47,12 +47,12 @@ self: super: {
   hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; };
 
   # Break infinite recursions.
+  attoparsec-varword = super.attoparsec-varword.override { bytestring-builder-varword = dontCheck self.bytestring-builder-varword; };
   clock = dontCheck super.clock;
   Dust-crypto = dontCheck super.Dust-crypto;
   hasql-postgres = dontCheck super.hasql-postgres;
   hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; };
   hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; };
-
   hspec-expectations = dontCheck super.hspec-expectations;
   HTTP = dontCheck super.HTTP;
   http-streams = dontCheck super.http-streams;
-- 
GitLab


From bd7c16e9c3e392950b7e8d7b2574aac170ea735b Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sun, 6 May 2018 21:10:24 +0300
Subject: [PATCH 0197/1085] iwd: 0.1 -> 0.2

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

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index a1c577d2bb5..792c7bcb084 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -3,17 +3,17 @@
 let
   ell = fetchgit {
      url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
-     rev = "0.4";
-     sha256 = "0l203n1jnqa2mcifir8ydxhcvbiwlvk89ailm0lida83l9vdlwpv";
+     rev = "0.5";
+     sha256 = "0xw53bigh99nhacjb67qs1g145fwls7065l8vsrziwzpkyd5s6a8";
   };
 in stdenv.mkDerivation rec {
   name = "iwd-${version}";
-  version = "0.1";
+  version = "0.2";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     rev = version;
-    sha256 = "1f8c6xvcvqw8z78mskynd2fkghggcl7vfz8vxzvpx0fkqcprn5n0";
+    sha256 = "0khc017s27n6y6c6wbqhmcghzggnagxbi8j36hl5g73y6s44vx42";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From ca9ea31ae1052c7b563e9ab48129dcfc9173fe00 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 6 May 2018 21:09:56 +0200
Subject: [PATCH 0198/1085] liblapack: 3.4.1 -> 3.8.0

---
 .../science/math/liblapack/3.5.0.nix          | 64 -------------------
 .../science/math/liblapack/default.nix        |  7 +-
 pkgs/top-level/all-packages.nix               |  5 +-
 3 files changed, 4 insertions(+), 72 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/liblapack/3.5.0.nix

diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
deleted file mode 100644
index 61a45cbab94..00000000000
--- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  stdenv,
-  fetchurl,
-  gfortran,
-  cmake,
-  python2,
-  atlas ? null,
-  shared ? false
-}:
-let
-  atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
-                     else null;
-  usedLibExtension = if shared then ".so" else ".a";
-  inherit (stdenv.lib) optional optionals concatStringsSep;
-  inherit (builtins) hasAttr attrNames;
-  version = "3.5.0";
-in
-
-stdenv.mkDerivation rec {
-  name = "liblapack-${version}";
-  src = fetchurl {
-    url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
-    sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s";
-  };
-
-  propagatedBuildInputs = [ atlasMaybeShared ];
-  buildInputs = [ gfortran cmake ];
-  nativeBuildInputs = [ python2 ];
-
-  cmakeFlags = [
-    "-DUSE_OPTIMIZED_BLAS=ON"
-    "-DCMAKE_Fortran_FLAGS=-fPIC"
-  ]
-  ++ (optionals (atlas != null) [
-    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
-    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
-  ])
-  ++ (optional shared "-DBUILD_SHARED_LIBS=ON")
-  # If we're on darwin, CMake will automatically detect impure paths. This switch
-  # prevents that.
-  ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''")
-  ;
-
-  doCheck = ! shared;
-
-  checkPhase = "
-    sed -i 's,^#!.*,#!${python2.interpreter},' lapack_testing.py
-    ctest
-  ";
-
-  enableParallelBuilding = true;
-
-  passthru = {
-    blas = atlas;
-  };
-
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Linear Algebra PACKage";
-    homepage = http://www.netlib.org/lapack/;
-    license = licenses.bsd3;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index baf77696b16..c68454fbe4a 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -13,14 +13,14 @@ let
   usedLibExtension = if shared then ".so" else ".a";
   inherit (stdenv.lib) optional optionals concatStringsSep;
   inherit (builtins) hasAttr attrNames;
-  version = "3.4.1";
+  version = "3.8.0";
 in
 
 stdenv.mkDerivation rec {
   name = "liblapack-${version}";
   src = fetchurl {
-    url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
-    sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
+    url = "http://www.netlib.org/lapack/lapack-${version}.tar.gz";
+    sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny";
   };
 
   propagatedBuildInputs = [ atlasMaybeShared ];
@@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
   doCheck = ! shared;
 
   checkPhase = "
-    sed -i 's,^#!.*,#!${python2.interpreter},' lapack_testing.py
     ctest
   ";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fb532e14c4..f4bc65ad478 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19943,7 +19943,7 @@ with pkgs;
     # great feature, but it's of limited use with pre-built binaries
     # coming from a central build farm.
     tolerateCpuTimingInaccuracy = true;
-    liblapack = liblapack_3_5_0WithoutAtlas;
+    liblapack = liblapackWithoutAtlas;
     withLapack = false;
   };
 
@@ -19966,10 +19966,7 @@ with pkgs;
   # without atlas. Etc.
   liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {};
   liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; };
-  liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {};
-  liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; };
   liblapack = liblapackWithAtlas;
-  liblapack_3_5_0 = liblapack_3_5_0WithAtlas;
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 
-- 
GitLab


From c642fce38277c4ebd53067fce348e50f498d0972 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 6 May 2018 22:03:53 +0200
Subject: [PATCH 0199/1085] lynx: enable IPv6 support

---
 pkgs/applications/networking/browsers/lynx/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 9cad2838a39..2a6abfb945b 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -23,7 +23,10 @@ stdenv.mkDerivation rec {
 
   hardeningEnable = [ "pie" ];
 
-  configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";
+  configureFlags = [
+    "--enable-widec"
+    "--enable-ipv6"
+  ] ++ stdenv.lib.optional sslSupport "--with-ssl";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ nukeReferences ]
-- 
GitLab


From b131db5f9b0f9314a2deab3cfd1c1738bd02b67c Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 6 May 2018 22:04:09 +0200
Subject: [PATCH 0200/1085] lynx: 2.8.9dev.16 -> 2.8.9dev.17

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

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 2a6abfb945b..9cdd32d2aae 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -9,14 +9,14 @@ assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
   name = "lynx-${version}";
-  version = "2.8.9dev.16";
+  version = "2.8.9dev.17";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2"
       "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2"
     ];
-    sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84";
+    sha256 = "1lvfsnrw5mmwrmn1m76q9mx287xwm3h5lg8sv7bcqilc0ywi2f54";
   };
 
   enableParallelBuilding = true;
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A text-mode web browser";
-    homepage = http://lynx.invisible-island.net/;
+    homepage = https://lynx.invisible-island.net/;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };
-- 
GitLab


From faa0d2fa78310bd6331543d2657d773e9805df3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Sun, 6 May 2018 22:13:15 +0200
Subject: [PATCH 0201/1085] todiff: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix
index 049a9eff347..6af7fae3497 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/pkgs/applications/misc/todiff/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "todiff-${version}";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "Ekleog";
     repo = "todiff";
     rev = version;
-    sha256 = "0n3sifinwhny651q1v1a6y9ybim1b0nd5s1z26sigjdhdvxckn65";
+    sha256 = "0xnqw98nccnkqfdmbkblm897v981rw1fagbi5q895bpwfg0p71lk";
   };
 
-  cargoSha256 = "0mxdpn98fvmxrp656vwxvzl9vprz5mvqj7d1hvvs4gsjrsiyp0fy";
+  cargoSha256 = "0ih7lw5hbayvc66fjqwga0i7l3sb9qn0m26vnham5li39f5i3rqp";
 
   meta = with stdenv.lib; {
     description = "Human-readable diff for todo.txt files";
-- 
GitLab


From 300af6677760944a3c27f7bf33a1366c380c3317 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 2 May 2018 04:16:27 +0200
Subject: [PATCH 0202/1085] gnome3.gdm: fix session chooser

We are patching GDM to respect GDM_SESSIONS_DIR environment
variable, which we are setting in the GDM module. Previously, we
only took care of a single code path, the one that handled session
start-up; missing the one obtaining the list of sessions.

This commit patches the second code path, and also whitelists the
GDM_SESSIONS_DIR so that it can be passed to the greeter.

Fixes #34101
---
 .../gnome-3/core/gdm/sessions_dir.patch       | 39 ++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
index bbc803d49c1..7722e2550bd 100644
--- a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
+++ b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
@@ -1,8 +1,17 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index ff3a1acb..b8705d8f 100644
+--- a/daemon/gdm-launch-environment.c
++++ b/daemon/gdm-launch-environment.c
+@@ -126,7 +126,7 @@
+                 "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER",
+                 "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT",
+                 "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH",
+-                "XDG_CONFIG_DIRS", NULL
++                "XDG_CONFIG_DIRS", "GDM_SESSIONS_DIR", NULL
+         };
+         char *system_data_dirs;
+         int i;
 --- a/daemon/gdm-session.c
 +++ b/daemon/gdm-session.c
-@@ -344,6 +344,7 @@ get_system_session_dirs (GdmSession *self)
+@@ -345,12 +345,17 @@
          char **search_dirs;
  
          static const char *x_search_dirs[] = {
@@ -10,8 +19,7 @@ index ff3a1acb..b8705d8f 100644
                  "/etc/X11/sessions/",
                  DMCONFDIR "/Sessions/",
                  DATADIR "/gdm/BuiltInSessions/",
-@@ -351,6 +352,10 @@ get_system_session_dirs (GdmSession *self)
-                 NULL
+                 DATADIR "/xsessions/",
          };
  
 +        if (getenv("GDM_SESSIONS_DIR") != NULL) {
@@ -21,3 +29,24 @@ index ff3a1acb..b8705d8f 100644
          static const char *wayland_search_dir = DATADIR "/wayland-sessions/";
  
          search_array = g_array_new (TRUE, TRUE, sizeof (char *));
+--- a/libgdm/gdm-sessions.c
++++ b/libgdm/gdm-sessions.c
+@@ -217,6 +217,7 @@
+ {
+         int         i;
+         const char *xorg_search_dirs[] = {
++                "/var/empty/",
+                 "/etc/X11/sessions/",
+                 DMCONFDIR "/Sessions/",
+                 DATADIR "/gdm/BuiltInSessions/",
+@@ -224,6 +225,10 @@
+                 NULL
+         };
+ 
++        if (g_getenv("GDM_SESSIONS_DIR") != NULL) {
++                xorg_search_dirs[0] = g_getenv("GDM_SESSIONS_DIR");
++        };
++
+ #ifdef ENABLE_WAYLAND_SUPPORT
+         const char *wayland_search_dirs[] = {
+                 DATADIR "/wayland-sessions/",
-- 
GitLab


From 85b5fc7c9854d5b147fca2399d8ca6c3412afa2f Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com>
Date: Sun, 6 May 2018 22:34:05 +0100
Subject: [PATCH 0203/1085] xcodeenv: fix typo

---
 pkgs/development/mobile/xcodeenv/simulate-app.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix
index 5f71b599408..04b6f2cbc83 100644
--- a/pkgs/development/mobile/xcodeenv/simulate-app.nix
+++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
         echo "Please provide a UDID of a simulator:"
         read udid
     else
-        # If a parameter has been provided, consider that a device UDID an use that
+        # If a parameter has been provided, consider that a device UDID and use that
         udid="$1"
     fi
     
-- 
GitLab


From ef8996f15ea2dd5aace0f61f9ab03f3dfa3d4975 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 9 Mar 2018 13:41:55 +0100
Subject: [PATCH 0204/1085] lib/types: Fix coercedTo check

Without this change

  (coercedTo str toInt int).check "foo"

would evaluate to true, even though

  (coercedTo str toInt int).merge {} [{ value = "foo"; }]

will throw an error because "foo" can't be coerced to an int.
---
 lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index a334db5c724..45b0ae5042c 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -420,7 +420,7 @@ rec {
       mkOptionType rec {
         name = "coercedTo";
         description = "${finalType.description} or ${coercedType.description}";
-        check = x: finalType.check x || coercedType.check x;
+        check = x: finalType.check x || (coercedType.check x && finalType.check (coerceFunc x));
         merge = loc: defs:
           let
             coerceVal = val:
-- 
GitLab


From b16a69289aae7a8aeb7d0410649764d9d2328e2f Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 4 Apr 2018 16:51:46 +0200
Subject: [PATCH 0205/1085] lib/types: Add coercedTo unsound tests

---
 lib/tests/modules.sh                                |  5 +++++
 lib/tests/modules/declare-coerced-value-unsound.nix | 10 ++++++++++
 lib/tests/modules/define-value-string-arbitrary.nix |  3 +++
 lib/tests/modules/define-value-string-bigint.nix    |  3 +++
 4 files changed, 21 insertions(+)
 create mode 100644 lib/tests/modules/declare-coerced-value-unsound.nix
 create mode 100644 lib/tests/modules/define-value-string-arbitrary.nix
 create mode 100644 lib/tests/modules/define-value-string-bigint.nix

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 96a91c0fffb..45fd2d624e1 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -138,6 +138,11 @@ checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix
 checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix
 checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix
 
+# Check coerced value with unsound coercion
+checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix
+checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string.*' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
+checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
+
 cat <<EOF
 ====== module tests ======
 $pass Pass
diff --git a/lib/tests/modules/declare-coerced-value-unsound.nix b/lib/tests/modules/declare-coerced-value-unsound.nix
new file mode 100644
index 00000000000..7a017f24e77
--- /dev/null
+++ b/lib/tests/modules/declare-coerced-value-unsound.nix
@@ -0,0 +1,10 @@
+{ lib, ... }:
+
+{
+  options = {
+    value = lib.mkOption {
+      default = "12";
+      type = lib.types.coercedTo lib.types.str lib.toInt lib.types.ints.s8;
+    };
+  };
+}
diff --git a/lib/tests/modules/define-value-string-arbitrary.nix b/lib/tests/modules/define-value-string-arbitrary.nix
new file mode 100644
index 00000000000..8e3abaf536a
--- /dev/null
+++ b/lib/tests/modules/define-value-string-arbitrary.nix
@@ -0,0 +1,3 @@
+{
+  value = "foobar";
+}
diff --git a/lib/tests/modules/define-value-string-bigint.nix b/lib/tests/modules/define-value-string-bigint.nix
new file mode 100644
index 00000000000..f27e31985c9
--- /dev/null
+++ b/lib/tests/modules/define-value-string-bigint.nix
@@ -0,0 +1,3 @@
+{
+  value = "1000";
+}
-- 
GitLab


From cd5736116c971ed08826b71a15a2221233b3d44f Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 4 Apr 2018 16:55:45 +0200
Subject: [PATCH 0206/1085] lib/types: clear up coercedTo description

---
 lib/tests/modules.sh | 4 ++--
 lib/types.nix        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 45fd2d624e1..c6b3fd912a9 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -136,11 +136,11 @@ checkConfigOutput "true" "$@" ./define-module-check.nix
 # Check coerced value.
 checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix
 checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix
-checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix
+checkConfigError 'The option value .* in .* is not.*string or signed integer convertible to it' config.value ./declare-coerced-value.nix ./define-value-list.nix
 
 # Check coerced value with unsound coercion
 checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix
-checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string.*' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
+checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
 checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
 
 cat <<EOF
diff --git a/lib/types.nix b/lib/types.nix
index 45b0ae5042c..4ee9affcb29 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -256,7 +256,7 @@ rec {
       functor = (defaultFunctor name) // { wrapped = elemType; };
     };
 
-    nonEmptyListOf = elemType: 
+    nonEmptyListOf = elemType:
       let list = addCheck (types.listOf elemType) (l: l != []);
       in list // { description = "non-empty " + list.description; };
 
@@ -419,7 +419,7 @@ rec {
       assert coercedType.getSubModules == null;
       mkOptionType rec {
         name = "coercedTo";
-        description = "${finalType.description} or ${coercedType.description}";
+        description = "${finalType.description} or ${coercedType.description} convertible to it";
         check = x: finalType.check x || (coercedType.check x && finalType.check (coerceFunc x));
         merge = loc: defs:
           let
-- 
GitLab


From facd51575e23ef485ef233d76327a0a82b230aa0 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 4 Apr 2018 17:40:47 +0200
Subject: [PATCH 0207/1085] lib/types: remove unnecessary coerceFunc assertion

---
 lib/types.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index 4ee9affcb29..17acb92a944 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -425,10 +425,7 @@ rec {
           let
             coerceVal = val:
               if finalType.check val then val
-              else let
-                coerced = coerceFunc val;
-              in assert finalType.check coerced; coerced;
-
+              else coerceFunc val;
           in finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs);
         getSubOptions = finalType.getSubOptions;
         getSubModules = finalType.getSubModules;
-- 
GitLab


From 6e7f4f99d152fef88ed70654f7946d55d2643fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Mon, 7 May 2018 00:35:45 +0200
Subject: [PATCH 0208/1085] manual: Document `types.attrs`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
---
 nixos/doc/manual/development/option-types.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 7969d812473..5cb747e6d9f 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -21,6 +21,15 @@
   </para>
 
   <variablelist>
+   <varlistentry>
+    <term><varname>types.attrs</varname>
+    </term>
+    <listitem>
+     <para>
+      A free-form attribute set.
+     </para>
+    </listitem>
+   </varlistentry>
    <varlistentry>
     <term><varname>types.bool</varname>
     </term>
-- 
GitLab


From d79609ac93662396064454d9f67431ce2b80ca66 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 7 May 2018 01:17:16 +0200
Subject: [PATCH 0209/1085] firefox-bin: use native notifications

---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 6b2bb541a3a..eaf304ca9fd 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -28,6 +28,7 @@
 , libcanberra-gtk2
 , libgnome
 , libgnomeui
+, libnotify
 , defaultIconTheme
 , libGLU_combined
 , nspr
@@ -112,6 +113,7 @@ stdenv.mkDerivation {
       libcanberra-gtk2
       libgnome
       libgnomeui
+      libnotify
       libGLU_combined
       nspr
       nss
-- 
GitLab


From 5855459f49b56a0f4e59a08583be1d1f5d111c47 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 7 May 2018 01:42:37 +0200
Subject: [PATCH 0210/1085] modules/system/boot/luksroot: remove comment about
 input_leds for caps lock

Since f2a9f9aeab5016d28ab4bcf6da81924ceecdd676, we already load
"input_leds", so this comment isn't useful anymore.
---
 nixos/modules/system/boot/luksroot.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 54dfb53fd30..7ebfdb134d7 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -454,7 +454,6 @@ in
       ["firewire_ohci" "firewire_core" "firewire_sbp2"];
 
     # Some modules that may be needed for mounting anything ciphered
-    # Also load input_leds to get caps lock light working (#12456)
     boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ]
       ++ luks.cryptoModules
       # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged
-- 
GitLab


From 4d0ab5d698fcb198c462adedff47e15c4edea36e Mon Sep 17 00:00:00 2001
From: Andrew Scott <3648487+ayyjayess@users.noreply.github.com>
Date: Mon, 7 May 2018 00:39:32 +0100
Subject: [PATCH 0211/1085] polybar: add i3 to path

---
 pkgs/applications/misc/polybar/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index a3b87fd34f6..05ad3e2a906 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -1,6 +1,6 @@
 { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
 , python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil
-, xcbutilwm, xcbutilxrm, fetchpatch
+, xcbutilwm, xcbutilxrm, fetchpatch, makeWrapper
 
 # optional packages-- override the variables ending in 'Support' to enable or
 # disable modules
@@ -52,8 +52,15 @@ stdenv.mkDerivation rec {
       (if i3Support || i3GapsSupport then jsoncpp else null)
       (if i3Support then i3 else null)
       (if i3GapsSupport then i3-gaps else null)
+
+      (if i3Support || i3GapsSupport then makeWrapper else null)
     ];
 
+    fixupPhase = if (i3Support || i3GapsSupport) then ''
+    wrapProgram $out/bin/polybar \
+      --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin"
+  '' else null;
+
     nativeBuildInputs = [
       cmake pkgconfig
     ];
-- 
GitLab


From 2b499afa63f01473a19c7166c1f3750fa45a1bab Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 May 2018 03:00:22 +0200
Subject: [PATCH 0212/1085] wget: 1.19.4 -> 1.19.5 for CVE-2018-0494

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

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index e2d4712d5bc..5c1636ddb86 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -5,11 +5,11 @@
 , openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.19.4";
+  name = "wget-1.19.5";
 
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.lz";
-    sha256 = "16jmcqcasx3q9k4azssryli9qyxfq0sfijw998g8zp58cnwzzh1g";
+    sha256 = "0xfaxmlnih7dhkyks5wi4vrn0n1xshmy6gx6fb2k1120sprydyr9";
   };
 
   patches = [
-- 
GitLab


From 1eeeceb9c7e52734536a4e10323634d4ada2f27e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 7 May 2018 03:59:38 +0200
Subject: [PATCH 0213/1085] nixos/nsd: Allow to configure root zone

When trying to run NSD to serve the root zone, one gets the following
error message:

error: illegal name: '.'

This is because the name of the zone is used as the derivation name for
building the zone file. However, Nix doesn't allow derivation names
starting with a period.

So whenever the zone is "." now, the file name generated is "root"
instead of ".".

I also added an assertion that makes sure the user sets
services.nsd.rootServer, otherwise NSD will fail at runtime because it
prevents serving the root zone without an explicit compile-time option.

Tested this by adding a root zone to the "nsd" NixOS VM test.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @hrdinka, @qknight
---
 nixos/modules/services/networking/nsd.nix | 14 +++++++++++---
 nixos/tests/nsd.nix                       |  9 +++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 0b52b1d3e30..fc910e59c32 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -20,6 +20,7 @@ let
     zoneStats = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0;
   };
 
+  mkZoneFileName = name: if name == "." then "root" else name;
 
   nsdEnv = pkgs.buildEnv {
     name = "nsd-env";
@@ -50,8 +51,9 @@ let
   };
 
   writeZoneData = name: text: pkgs.writeTextFile {
-    inherit name text;
-    destination = "/zones/${name}";
+    name = "nsd-zone-${mkZoneFileName name}";
+    inherit text;
+    destination = "/zones/${mkZoneFileName name}";
   };
 
 
@@ -146,7 +148,7 @@ let
   zoneConfigFile = name: zone: ''
     zone:
       name:         "${name}"
-      zonefile:     "${stateDir}/zones/${name}"
+      zonefile:     "${stateDir}/zones/${mkZoneFileName name}"
       ${maybeString "outgoing-interface: " zone.outgoingInterface}
     ${forEach     "  rrl-whitelist: "      zone.rrlWhitelist}
       ${maybeString "zonestats: "          zone.zoneStats}
@@ -887,6 +889,12 @@ in
 
   config = mkIf cfg.enable {
 
+    assertions = singleton {
+      assertion = zoneConfigs ? "." -> cfg.rootServer;
+      message = "You have a root zone configured. If this is really what you "
+              + "want, please enable 'services.nsd.rootServer'.";
+    };
+
     environment.systemPackages = [ nsdPkg ];
 
     users.extraGroups = singleton {
diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix
index ad4d4f82243..c3c91e71b5c 100644
--- a/nixos/tests/nsd.nix
+++ b/nixos/tests/nsd.nix
@@ -41,6 +41,7 @@ in import ./make-test.nix ({ pkgs, ...} : {
         { address = "dead:beef::1"; prefixLength = 64; }
       ];
       services.nsd.enable = true;
+      services.nsd.rootServer = true;
       services.nsd.interfaces = lib.mkForce [];
       services.nsd.zones."example.com.".data = ''
         @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600
@@ -55,6 +56,11 @@ in import ./make-test.nix ({ pkgs, ...} : {
         @ A 9.8.7.6
         @ AAAA fedc::bbaa
       '';
+      services.nsd.zones.".".data = ''
+        @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600
+        root A 1.8.7.4
+        root AAAA acbd::4
+      '';
     };
   };
 
@@ -86,6 +92,9 @@ in import ./make-test.nix ({ pkgs, ...} : {
 
         assertHost($_, "a", "deleg.example.com", qr/address 9.8.7.6$/);
         assertHost($_, "aaaa", "deleg.example.com", qr/address fedc::bbaa$/);
+
+        assertHost($_, "a", "root", qr/address 1.8.7.4$/);
+        assertHost($_, "aaaa", "root", qr/address acbd::4$/);
       };
     }
   '';
-- 
GitLab


From 2f467dd584338fd3315e2bcd4dac7a6f12553024 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 19:49:06 -0700
Subject: [PATCH 0214/1085] xmrig: 2.5.3 -> 2.6.1

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.6.1 with grep in /nix/store/wsy4vdhmqcr0mydcgp77dncf2xq906kf-xmrig-2.6.1
- directory tree listing: https://gist.github.com/ff33b30777a95f9fa0654b4da0ae47c2
---
 pkgs/applications/misc/xmrig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 88adbfff3b9..9814ec92f02 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "xmrig-${version}";
-  version = "2.5.3";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "1f9z9akgaf27r5hjrsjw0clk47p7igi0slbg7z6c3rvy5q9kq0wp";
+    sha256 = "05gd3jl8nvj2b73l4x72rfbbxrkw3r8q1h761ly4z35v4f3lahk8";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 0fb4672113f014abc12f4805aec5288ef6fb2e03 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 19:52:46 -0700
Subject: [PATCH 0215/1085] xterm: 332 -> 333
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/koi8rxterm -h’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/koi8rxterm help’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/uxterm -h’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/uxterm help’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/xterm -h’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/xterm help’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.xterm-wrapped -h’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.xterm-wrapped help’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.koi8rxterm-wrapped -h’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.koi8rxterm-wrapped help’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.uxterm-wrapped -h’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.uxterm-wrapped help’ got 0 exit code
- found 333 with grep in /nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333
- directory tree listing: https://gist.github.com/1317219946b26e2c85846fe9e169a9e4
---
 pkgs/applications/misc/xterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index bcaf89797b4..8b15b030789 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-332";
+  name = "xterm-333";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.invisible-island.net/xterm/${name}.tgz"
      "https://invisible-mirror.net/archives/xterm/${name}.tgz"
    ];
-    sha256 = "0zdjiik4ravc3zld5c9i2ndrvazjmwiwbgl2c21348762wki2jsx";
+    sha256 = "0y7gl26mxw6kwqx9j9mi6lx1lp1v3nrlga19ddn07j2m9q0l479g";
   };
 
   buildInputs =
-- 
GitLab


From 81fc2c35097f81ecb29a576148486cc1ce5a5bcc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 7 May 2018 04:33:56 +0200
Subject: [PATCH 0216/1085] nixos/dhparams: Add a defaultBitSize option

This allows to set the default bit size for all the Diffie-Hellman
parameters defined in security.dhparams.params and it's particularly
useful so that we can set it to a very low value in tests (so it doesn't
take ages to generate).

Regardless for the use in testing, this also has an impact in production
systems if the owner wants to set all of them to a different size than
2048, they don't need to set it individually for every params that are
set.

I've added a subtest to the "dhparams" NixOS test to ensure this is
working properly.

Signed-off-by: aszlig <aszlig@nix.build>
---
 nixos/modules/security/dhparams.nix | 27 ++++++++++++++++++++++-----
 nixos/tests/dhparams.nix            | 14 ++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index beac125fc6e..e2b84c3e3b3 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -4,13 +4,15 @@ let
   inherit (lib) mkOption types;
   cfg = config.security.dhparams;
 
+  bitType = types.addCheck types.int (b: b >= 16) // {
+    name = "bits";
+    description = "integer of at least 16 bits";
+  };
+
   paramsSubmodule = { name, config, ... }: {
     options.bits = mkOption {
-      type = types.addCheck types.int (b: b >= 16) // {
-        name = "bits";
-        description = "integer of at least 16 bits";
-      };
-      default = 2048;
+      type = bitType;
+      default = cfg.defaultBitSize;
       description = ''
         The bit size for the prime that is used during a Diffie-Hellman
         key exchange.
@@ -70,6 +72,11 @@ in {
           existing ones won't be cleaned up. Of course this only applies if
           <option>security.dhparams.stateful</option> is
           <literal>true</literal>.</para></warning>
+
+          <note><title>For module implementers:</title><para>It's recommended
+          to not set a specific bit size here, so that users can easily
+          override this by setting
+          <option>security.dhparams.defaultBitSize</option>.</para></note>
         '';
       };
 
@@ -89,6 +96,16 @@ in {
         '';
       };
 
+      defaultBitSize = mkOption {
+        type = bitType;
+        default = 2048;
+        description = ''
+          This allows to override the default bit size for all of the
+          Diffie-Hellman parameters set in
+          <option>security.dhparams.params</option>.
+        '';
+      };
+
       path = mkOption {
         type = types.str;
         default = "/var/lib/dhparams";
diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix
index da75391e4ce..d11dfeec5d0 100644
--- a/nixos/tests/dhparams.nix
+++ b/nixos/tests/dhparams.nix
@@ -54,6 +54,13 @@ in import ./make-test.nix {
     security.dhparams.params.bar2.bits = 19;
   };
 
+  nodes.generation5 = {
+    imports = [ common ];
+    security.dhparams.defaultBitSize = 30;
+    security.dhparams.params.foo3 = {};
+    security.dhparams.params.bar3 = {};
+  };
+
   testScript = { nodes, ... }: let
     getParamPath = gen: name: let
       node = "generation${toString gen}";
@@ -126,5 +133,12 @@ in import ./make-test.nix {
         'expr match ${getParamPath 4 "bar2"} ${builtins.storeDir}',
       );
     };
+
+    ${switchToGeneration 5}
+
+    subtest "check whether defaultBitSize works as intended", sub {
+      ${assertParamBits 5 "foo3" 30}
+      ${assertParamBits 5 "bar3" 30}
+    };
   '';
 }
-- 
GitLab


From a8b7372380725af56c213cdb01893640d5097c16 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 7 May 2018 05:02:41 +0200
Subject: [PATCH 0217/1085] nixos: Add release notes about dhparams changes

This is not only to make users aware of the changes but also to give a
heads up to developers which are using the module. Specifically if they
rely on security.dhparams.path only.

Signed-off-by: aszlig <aszlig@nix.build>
---
 nixos/doc/manual/release-notes/rl-1809.xml | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 61f9ec8ba99..acf9db8f3e3 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -77,7 +77,57 @@ following incompatible changes:</para>
 <itemizedlist>
   <listitem>
     <para>
+      The module for <option>security.dhparams</option> has two new options
+      now:
     </para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>security.dhparams.stateless</option></term>
+        <listitem><para>
+          Puts the generated Diffie-Hellman parameters into the Nix store
+          instead of managing them in a stateful manner in
+          <filename class="directory">/var/lib/dhparams</filename>.
+        </para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>security.dhparams.defaultBitSize</option></term>
+        <listitem><para>
+          The default bit size to use for the generated Diffie-Hellman
+          parameters.
+        </para></listitem>
+      </varlistentry>
+    </variablelist>
+
+    <note><para>
+      The path to the actual generated parameter files should now be queried
+      using
+      <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>
+      because it might be either in the Nix store or in a directory configured
+      by <option>security.dhparams.path</option>.
+    </para></note>
+
+    <note>
+      <title>For developers:</title>
+      <para>
+        Module implementers should not set a specific bit size in order to let
+        users configure it by themselves if they want to have a different bit
+        size than the default (2048).
+      </para>
+      <para>
+        An example usage of this would be:
+<programlisting>
+{ config, ... }:
+
+{
+  security.dhparams.params.myservice = {};
+  environment.etc."myservice.conf".text = ''
+    dhparams = ${config.security.dhparams.params.myservice.path}
+  '';
+}
+</programlisting>
+      </para>
+    </note>
   </listitem>
 </itemizedlist>
 
-- 
GitLab


From 834b6049c0a9790a991235f3d725dd2a5a40276e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 20:45:38 -0700
Subject: [PATCH 0218/1085] snd: 18.2 -> 18.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/18mdi0m90asngnmnf313bbkpyyzjs96b-snd-18.3/bin/snd --help’ got 0 exit code
- found 18.3 with grep in /nix/store/18mdi0m90asngnmnf313bbkpyyzjs96b-snd-18.3
- directory tree listing: https://gist.github.com/3e3d90a56bba746c97163a9bc00919f2
---
 pkgs/applications/audio/snd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 660f342dc9d..cacc6e04429 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-18.2";
+  name = "snd-18.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "0b0ija3cf2c9sqh3cclk5a7i73vagfkyw211aykfd76w7ibirs3r";
+    sha256 = "117sgvdv0a03ys1v27bs99mgzpfm2a7xg6s0q6m1f79jniia12ss";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From b917daaf60fbc27f03822ee5e79eae5b34b806fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=ADas=20Lang?= <yo@matiaslang.me>
Date: Mon, 7 May 2018 00:42:05 -0300
Subject: [PATCH 0219/1085] fzf: fix vim plugin patch phase

During patch phase, the path to the fzf binary is overwritten in the vim
plugin source. The sed expression doing this wasn't working because the fzf
code changed in this commit:
https://github.com/junegunn/fzf/commit/02ceae15a235de6b5cd2aca9de070fb3fff78e5b
making the patch useless.

I fixed it and added a check to verify that the plugin was effecively
patched to prevent this to happen in the future.
---
 pkgs/tools/misc/fzf/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 1eb4393c978..d9da04c1fa1 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -23,8 +23,13 @@ buildGoPackage rec {
   goDeps = ./deps.nix;
 
   patchPhase = ''
-    sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim
-    sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim
+    sed -i -e "s|expand('<sfile>:h:h')|'$bin'|" plugin/fzf.vim
+
+    # Original and output files can't be the same
+    if cmp -s $src/plugin/fzf.vim plugin/fzf.vim; then
+      echo "Vim plugin patch not applied properly. Aborting" && \
+      exit 1
+    fi
   '';
 
   preInstall = ''
-- 
GitLab


From 871bffd98f41aa0e9d49fcabf74909b227366581 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 21:43:10 -0700
Subject: [PATCH 0220/1085] qutebrowser: 1.2.1 -> 1.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/qutebrowser -h’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/qutebrowser --help’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/..qutebrowser-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/..qutebrowser-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/.qutebrowser-wrapped -h’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/.qutebrowser-wrapped --help’ got 0 exit code
- found 1.3.0 with grep in /nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0
- directory tree listing: https://gist.github.com/b9f575b232cde51598aeed723a03f7ec
---
 pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 2e31f625f2e..0cebdd62140 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -29,13 +29,13 @@ let
 in python3Packages.buildPythonApplication rec {
   name = "qutebrowser-${version}${versionPostfix}";
   namePrefix = "";
-  version = "1.2.1";
+  version = "1.3.0";
   versionPostfix = "";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1svbski378x276033v07jailm81b0i6hxdakbiqkwvgh6hkczrhw";
+    sha256 = "159h669x60pfla71zx28wnrik8rvsrw5i8kbd3xccynk6klm3kw3";
   };
 
   # Needs tox
-- 
GitLab


From 5b3b3a1e83b32246c6093a878b9c299cfc4c3d36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 21:51:32 -0700
Subject: [PATCH 0221/1085] riot-web: 0.14.1 -> 0.14.2

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.14.2 with grep in /nix/store/zglwk185bfl8x2dmkqpl51801rk58gvi-riot-web-0.14.2
- directory tree listing: https://gist.github.com/eae072ce5bb48e5e8b59f7e04caf5b0d
---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index ce558130a6c..4946c065492 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.14.1";
+  version = "0.14.2";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "08paca7wc135hspkv97bgh2a29hbg8vxv0mrp68mgwscpyrl6vnf";
+    sha256 = "1qma49a6lvr9anrry3vbhjhvy06bgapknnvbdljnbb3l9c99nmxi";
   };
 
   installPhase = ''
-- 
GitLab


From cfdcc03feb7c22d6dffc55f7f9f6f0a611624077 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 22:00:49 -0700
Subject: [PATCH 0222/1085] qbittorrent: 4.0.4 -> 4.1.0

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.1.0 with grep in /nix/store/dyvbm73pl2qs0khv1yzyfsxsyf8kx7yi-qbittorrent-4.1.0
- directory tree listing: https://gist.github.com/a5b770d088c453aa2a25dc90cfc3c348
---
 pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 90d68a96e5c..b2e9333beb3 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "4.0.4";
+  version = "4.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "13sw0sdw2agm49plp9xvkg6wva274drpvgz76dqj4j2kfxx9s2jk";
+    sha256 = "0fdr74sc31x421sb69vlgal1hxpccjxxk8hrrzz9f5bg4jv895pw";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
-- 
GitLab


From a600e0c8a5f498a6518603a4495cc0fc38d826e7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 29 Apr 2018 05:57:32 +0000
Subject: [PATCH 0223/1085] ocaml: default to 4.06 on aarch64 (since 4.05 is
 broken there)

---
 pkgs/top-level/ocaml-packages.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 92f772bb25e..bce2662abfd 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1043,5 +1043,10 @@ in rec
 
   ocamlPackages_latest = ocamlPackages_4_06;
 
-  ocamlPackages = ocamlPackages_4_05;
+  ocamlPackages =
+    # OCaml 4.05 is broken on aarch64
+    if system == "aarch64-linux" then
+      ocamlPackages_4_06
+    else
+      ocamlPackages_4_05;
 }
-- 
GitLab


From abea0c6eebb427df3950e0c2f36c62b4e111a62a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 30 Apr 2018 09:52:30 +0000
Subject: [PATCH 0224/1085] jbuilder: 1.0+beta17 -> 1.0+beta20

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

diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix
index d48bc410111..38fd4323d5c 100644
--- a/pkgs/development/tools/ocaml/jbuilder/default.nix
+++ b/pkgs/development/tools/ocaml/jbuilder/default.nix
@@ -2,16 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "jbuilder-${version}";
-  version = "1.0+beta17";
+  version = "1.0+beta20";
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = "dune";
     rev = "${version}";
-    sha256 = "04pyry459hp2r2s9m5xkcq1glzp20ddz5wb1w8nzp3zgygy0431x";
+    sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f";
   };
 
   buildInputs = [ ocaml ];
 
+  dontAddPrefix = true;
+
   installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
 
   preFixup = "rm -rf $out/jbuilder";
-- 
GitLab


From e973188bcc9f35dbd12f00c0ef5dd9240da1d9d3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 7 May 2018 00:16:50 -0500
Subject: [PATCH 0225/1085] souffle: fix on darwin

Fixes #39854
---
 pkgs/development/compilers/souffle/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index 5289540e944..099a591b407 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz, libtool, lsb-release, ncurses, zlib, sqlite }:
+{ stdenv, fetchFromGitHub
+, boost, bison, flex, openjdk, doxygen
+, perl, graphviz, libtool, ncurses, zlib, sqlite
+, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
@@ -11,12 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "1g8yvm40h102mab8lacpl1cwgqsw1js0s1yn4l84l9fjdvlh2ygd";
   };
 
+  nativeBuildInputs = [ autoreconfHook bison flex ];
+
   buildInputs = [
-    autoconf automake boost bison flex openjdk
-    # Used for 1.2.0
-    libtool lsb-release ncurses zlib sqlite
-    # Used for docs
-    doxygen perl graphviz
+    boost openjdk ncurses zlib sqlite doxygen perl graphviz
   ];
 
   patchPhase = ''
@@ -29,8 +30,6 @@ stdenv.mkDerivation rec {
   # for boost and failing there, so we tell it what's what here.
   configureFlags = [ "--with-boost-libdir=${boost}/lib" ];
 
-  preConfigure = "./bootstrap";
-
   meta = with stdenv.lib; {
     description = "A translator of declarative Datalog programs into the C++ language";
     homepage    = "http://souffle-lang.github.io/";
-- 
GitLab


From 3b4ee14a834d791b07f1b597317cce5762cd568a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 22:49:59 -0700
Subject: [PATCH 0226/1085] pspg: 1.1.0 -> 1.1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/g5s0d7h461nd55hnzp5k6v74dlfcz6dh-pspg-1.1.1/bin/pspg --help’ got 0 exit code
- ran ‘/nix/store/g5s0d7h461nd55hnzp5k6v74dlfcz6dh-pspg-1.1.1/bin/pspg -V’ and found version 1.1.1
- ran ‘/nix/store/g5s0d7h461nd55hnzp5k6v74dlfcz6dh-pspg-1.1.1/bin/pspg --version’ and found version 1.1.1
- found 1.1.1 with grep in /nix/store/g5s0d7h461nd55hnzp5k6v74dlfcz6dh-pspg-1.1.1
- directory tree listing: https://gist.github.com/ba99487fab26f86a314d4a727749a490
---
 pkgs/tools/misc/pspg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index ddd76a344e0..0a261671872 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pspg-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "pspg";
     rev = "${version}";
-    sha256 = "10r6jfcqw4wclp84f07g3bda844csgm4sh7cjsnk2smmal7nhybs";
+    sha256 = "19jiixanyghasd2awkxx7c224fz01d9v0c4qxn4msvkny39m3gz9";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 9389f3f8b3c8acc4adb5535da8fb76320693ae89 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 23:05:28 -0700
Subject: [PATCH 0227/1085] osinfo-db: 20180416 -> 20180502

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 20180502 with grep in /nix/store/xsgfilzqf0fkahxgp24ivs90xy8mz6rs-osinfo-db-20180502
- directory tree listing: https://gist.github.com/38c69c0bcc2f185f90e5c56f329dc980
---
 pkgs/data/misc/osinfo-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 09c677c35bd..82122335f69 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "osinfo-db-20180416";
+  name = "osinfo-db-20180502";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
-    sha256 = "0qam3qbrwzrz40pikhb8y11lidpb6snsa80ym8s6hp5kh4icr1h6";
+    sha256 = "05036mpc5hapx616lfzc67xj157hw3mgyk0arv3brjcx0qmzaram";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
-- 
GitLab


From 716f4ab3a4765295c11f77ff16e7c3b543e9d5b1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 23:23:35 -0700
Subject: [PATCH 0228/1085] pdfpc: 4.1 -> 4.1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1/bin/pdfpc -h’ got 0 exit code
- ran ‘/nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1/bin/pdfpc --help’ got 0 exit code
- ran ‘/nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1/bin/.pdfpc-wrapped -h’ got 0 exit code
- ran ‘/nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1/bin/.pdfpc-wrapped --help’ got 0 exit code
- found 4.1.1 with grep in /nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1
- directory tree listing: https://gist.github.com/88ef2cda6a77852e5d7541ebd43e4fec
---
 pkgs/applications/misc/pdfpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 515127e12eb..f3fd091363f 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "pdfpc";
-  version = "4.1";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     repo = "pdfpc";
     owner = "pdfpc";
     rev = "v${version}";
-    sha256 = "02cp0x5prqrizxdp0sf2sk5ip0363vyw6fxsb3zwyx4dw0vz4g96";
+    sha256 = "1yjh9rx49d24wlwg44r2a6b5scybp8l1fi9wyf05sig6zfziw1mm";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From ce74ef08c8db63b92c01df3e5c478ae81c2d0e76 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 00:10:39 -0700
Subject: [PATCH 0229/1085] metabase: 0.28.6 -> 0.29.0

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/599c8c50c67bdbbb242bf3136072727a
---
 pkgs/servers/metabase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index d36810b9f5c..4eae86b00b0 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "metabase-${version}";
-  version = "0.28.6";
+  version = "0.29.0";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "1dzs57yyx6k93gvyva9y38xdb4pbvdliad3zzgk3vs74fp1zh2vq";
+    sha256 = "1dfq06cm8k36pkqpng4cd8ax8cdxbcssww4vapq2w9ccflpnlam2";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 7c8d500825ac1a0294ca7275d2a89345443dd823 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 00:14:33 -0700
Subject: [PATCH 0230/1085] mbedtls: 2.8.0 -> 2.9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_aescrypt2 -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_aescrypt2 --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_aescrypt2 help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_hello -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_hello --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_hello help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ecdh_curve25519 -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ecdh_curve25519 --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ecdh_curve25519 help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_key_app -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_key_app --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_key_app help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_mpi_demo -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_mpi_demo --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_mpi_demo help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pk_decrypt -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pk_decrypt --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pk_decrypt help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_genkey -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_genkey --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_genkey help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_sign -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_sign --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_sign help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_entropy -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_entropy --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_entropy help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_ctr_drbg -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_ctr_drbg --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_ctr_drbg help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_havege -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_havege --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_havege help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_mail_client -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_mail_client --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_mail_client help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_benchmark -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_benchmark --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_benchmark help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_cert_test -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_cert_test --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_cert_test help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pem2der -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pem2der --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pem2der help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_strerror -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_strerror --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_strerror help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_crl_app -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_crl_app --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_crl_app help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_req_app -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_req_app --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_req_app help’ got 0 exit code
- found 2.9.0 with grep in /nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0
- directory tree listing: https://gist.github.com/fc0f8e7848649388caae66bddc561fb8
---
 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 8c2a2a694b0..bd10824bfa1 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-2.8.0";
+  name = "mbedtls-2.9.0";
 
   src = fetchFromGitHub {
     owner = "ARMmbed";
     repo = "mbedtls";
     rev = name;
-    sha256 = "1pnwmy0qg8g9lz26fpr5fzpvrdjm59winxpwdjfp6d62qxdjbgmn";
+    sha256 = "1pb1my8wwa757hvd06qwidkj58fa1wayf16g98q600xhya5fj3vx";
   };
 
   nativeBuildInputs = [ perl ];
-- 
GitLab


From 8d2588fd16b43055ce6be56f36c5a9ff23f86383 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 00:16:15 -0700
Subject: [PATCH 0231/1085] mypy: 0.590 -> 0.600
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.dmypy-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.dmypy-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.dmypy-wrapped help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/dmypy -h’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/dmypy --help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/dmypy help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.mypy-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.mypy-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.mypy-wrapped -V’ and found version 0.600
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.mypy-wrapped --version’ and found version 0.600
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/mypy -h’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/mypy --help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/mypy -V’ and found version 0.600
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/mypy --version’ and found version 0.600
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.stubgen-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.stubgen-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.stubgen-wrapped help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/stubgen -h’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/stubgen --help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/stubgen help’ got 0 exit code
- found 0.600 with grep in /nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600
- directory tree listing: https://gist.github.com/157118da991905110fee19075e61f99b
---
 pkgs/development/tools/mypy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix
index fd21a8a23d3..d021f994e49 100644
--- a/pkgs/development/tools/mypy/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonApplication rec {
   pname = "mypy";
-  version = "0.590";
+  version = "0.600";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ynyrrj0wjyw130ay9x1ca88lbhbblp06bfsjrpzbcvp4grgxgq4";
+    sha256 = "1pd3kkz435wlvi9fwqbi3xag5zs59jcjqi6c9gzdjdn23friq9dw";
   };
 
   propagatedBuildInputs = [ lxml typed-ast psutil ];
-- 
GitLab


From 994307899020df62dc25528961a93ac3359a5370 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jb.giraudeau@lombardodier.com>
Date: Mon, 7 May 2018 09:31:02 +0200
Subject: [PATCH 0232/1085] blobfuse: 1.0.1-RC-Preview -> 1.0.2

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

diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix
index f847cde98a9..b5694535e94 100644
--- a/pkgs/tools/filesystems/blobfuse/default.nix
+++ b/pkgs/tools/filesystems/blobfuse/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "blobfuse-${version}";
-  version = "1.0.1-RC-Preview";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner  = "Azure";
     repo   = "azure-storage-fuse";
     rev    = "v${version}";
-    sha256 = "143rxgfmprir4a7frrv8llkv61jxzq50w2v8wn32vx6gl6vci1zs";
+    sha256 = "1qh04z1fsj1l6l12sz9yl2sy9hwlrnzac54hwrr7wvsgv90n9gbp";
   };
 
   buildInputs = [ curl gnutls libgcrypt libuuid fuse ];
@@ -20,4 +20,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ jbgi ];
     platforms = platforms.linux;
   };
-}
+}
\ No newline at end of file
-- 
GitLab


From 201dd87507d1fe5d77413ae740ce3e96e8df21c4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 01:37:54 -0700
Subject: [PATCH 0233/1085] mydumper: 0.9.3 -> 0.9.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/agcvkgqnz979a024p7brjgrz8cgagsh0-mydumper-0.9.5/bin/mydumper --help’ got 0 exit code
- ran ‘/nix/store/agcvkgqnz979a024p7brjgrz8cgagsh0-mydumper-0.9.5/bin/myloader --help’ got 0 exit code
- found 0.9.5 with grep in /nix/store/agcvkgqnz979a024p7brjgrz8cgagsh0-mydumper-0.9.5
- directory tree listing: https://gist.github.com/593eb6f7d15a3b04c925f61d0dc068e7
---
 pkgs/tools/backup/mydumper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix
index da8805bc226..b6c5bfd91fa 100644
--- a/pkgs/tools/backup/mydumper/default.nix
+++ b/pkgs/tools/backup/mydumper/default.nix
@@ -2,14 +2,14 @@
 , glib, zlib, pcre, mysql, libressl }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.3";
+  version = "0.9.5";
   name = "mydumper-${version}";
 
   src = fetchFromGitHub {
     owner  = "maxbube";
     repo   = "mydumper";
     rev    = "v${version}";
-    sha256 = "139v6707sxyslg7n1fii8b1ybdq50hbqhc8zf6p1cr3h2hhl6ns9";
+    sha256 = "0vbz0ri5hm6yzkrcgnaj8px6bf59myr5dbhyy7fd4cv44hr685k6";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From 7169c8a31accf8dc37deff9243f7499d2468924f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 01:42:32 -0700
Subject: [PATCH 0234/1085] miniupnpd: 2.0.20180422 -> 2.0.20180503

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/0808e377cf01f4f52c13c600fb4d5e22
---
 pkgs/tools/networking/miniupnpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 3a1bba4ce8c..2f907df8dca 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, iptables, libuuid, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-2.0.20180422";
+  name = "miniupnpd-2.0.20180503";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "03g9r519p127sj6rl2x535022bwj8vzvdwp4385v7vnjrd4dswzy";
+    sha256 = "031aw66b09ij2yv640xjbp302vkwr8ima5cz7a0951jzhqbfs6xn";
     name = "${name}.tar.gz";
   };
 
-- 
GitLab


From a45e8d962b72287a977456d529394d55043de500 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 01:50:49 -0700
Subject: [PATCH 0235/1085] libofx: 0.9.12 -> 0.9.13
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofx2qif -h’ got 0 exit code
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofx2qif --help’ got 0 exit code
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofx2qif help’ got 0 exit code
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump -h’ got 0 exit code
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump --help’ got 0 exit code
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump help’ got 0 exit code
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump -V’ and found version 0.9.13
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump --version’ and found version 0.9.13
- found 0.9.13 with grep in /nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13
- directory tree listing: https://gist.github.com/408d21f6a77f49bceb283d4730ff7884
---
 pkgs/development/libraries/libofx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix
index 1c8f33d82f7..86166ec608f 100644
--- a/pkgs/development/libraries/libofx/default.nix
+++ b/pkgs/development/libraries/libofx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }:
         
 stdenv.mkDerivation rec {
-  name = "libofx-0.9.12";
+  name = "libofx-0.9.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/libofx/${name}.tar.gz";
-    sha256 = "0wvkgffq9qjhjrggg8r1nbhmw65j3lcl4y4cdpmmkrqiz9ia0py1";
+    sha256 = "1r60pj1jn269mk4s4025qxllkzgvnbw5r3vby8j2ry5svmygksjp";
   };
 
   configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ];
-- 
GitLab


From a6670c01bfa6ca05d29c3246f2f3111d712e6986 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 01:57:17 -0700
Subject: [PATCH 0236/1085] libcouchbase: 2.8.6 -> 2.8.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-cat --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-create --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-observe --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-observe-seqno --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-incr --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-decr --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-mcflush --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-hash --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-lock --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-unlock --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-rm --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-stats --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-version -h’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-version --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-version help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-verbosity --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-view --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-n1ql --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-admin --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-admin help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-ping --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-create --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-create help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-delete --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-delete help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-flush --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-connstr --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-connstr help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-write-config --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-write-config help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-strerror --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-touch --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-role-list --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-role-list help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-list --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-list help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-upsert --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-delete --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-delete help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-watch --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-pillowfight --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-n1qlback --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-subdoc --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-proxy --help’ got 0 exit code
- found 2.8.7 with grep in /nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7
- directory tree listing: https://gist.github.com/9d8d235fa65642471ef25d1986614fab
---
 pkgs/development/libraries/libcouchbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index c3050bf8c67..d6447e449cf 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcouchbase-${version}";
-  version = "2.8.6";
+  version = "2.8.7";
 
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
     rev = version;
-    sha256 = "1in0fdl5mgzhwmd8kvniqkizi7isf2g2gvbknfbbdmxkki7a8p95";
+    sha256 = "1hx66dlbb3sc3xaj6nsav4rp7qghl9zyv796kxj1sammw9wp98b1";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";
-- 
GitLab


From 1c67dc2f35615d4f3f8bff71f6704db07cfb2357 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:08:52 -0700
Subject: [PATCH 0237/1085] libfm-extra: 1.3.0 -> 1.3.0.2

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.0.2 with grep in /nix/store/5am33wnj853b12vfyyccsm213yv686kg-libfm-extra-1.3.0.2
- directory tree listing: https://gist.github.com/21b078659a3a745638c69b3d9ef063c4
---
 pkgs/development/libraries/libfm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index 01bfe1653fe..ce1d3b138f8 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
   name = if extraOnly
     then "libfm-extra-${version}"
     else "libfm-${version}";
-  version = "1.3.0";
+  version = "1.3.0.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz";
-    sha256 = "151jyy8ipmp2h829gd9s4s429qafv1zxl7j6zaj1k1gzm9s5rmnb";
+    sha256 = "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From b8e09cdb1e08ca406c4b921b7f21d266bbe6a322 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:12:56 -0700
Subject: [PATCH 0238/1085] lynis: 2.6.3 -> 2.6.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4/bin/lynis -V’ and found version 2.6.4
- ran ‘/nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4/bin/lynis --version’ and found version 2.6.4
- ran ‘/nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4/bin/.lynis-wrapped -V’ and found version 2.6.4
- ran ‘/nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4/bin/.lynis-wrapped --version’ and found version 2.6.4
- found 2.6.4 with grep in /nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4
- directory tree listing: https://gist.github.com/bb3a08cde57013b3af4f2511af3cc77c
---
 pkgs/tools/security/lynis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index e0a11f57418..56a47ea3874 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "2.6.3";
+  version = "2.6.4";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "17xfs0jr0rf8xvk860l2wpxg0h1m2c1dq41lqnq6wga9jifxmzqd";
+    sha256 = "1p449gsackcavw5h9yn0ckk1fkakx9d55izi22gh8wfvijdfhw10";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];
-- 
GitLab


From 69bf313e74bc25245e377c68d4a2e7aea8d775c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 May 2018 10:19:16 +0100
Subject: [PATCH 0239/1085] nodePackages{v6,v8}: update

---
 .../node-packages/node-packages-v6.nix        | 81 ++++++++++---------
 .../node-packages/node-packages-v8.nix        | 34 ++++----
 2 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index e50628e014f..27f58d5ad1d 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -3514,13 +3514,13 @@ let
         sha1 = "8de37f5a300730c305fc3edd9f93348ee8a46288";
       };
     };
-    "bufferutil-3.0.4" = {
+    "bufferutil-3.0.5" = {
       name = "bufferutil";
       packageName = "bufferutil";
-      version = "3.0.4";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.4.tgz";
-        sha512 = "1q344kiig9b8ssskrp7r77kf3xk516bfcjlilgz0a8q5zflz35rnp8im2kx1y9smcp23hw2q1aqsi39i6cb7svzf40a7dk6h4ds54pf";
+        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.5.tgz";
+        sha512 = "2b5ha7z8v5gkanyakrbax9k9d00cv9gs2nfnk5g4d16ljmpv40jv3pljawxmnw2jj04z57cqlzbw1w8wr5kyblin8c2jz7a2av09xfi";
       };
     };
     "bufferview-1.0.1" = {
@@ -12355,13 +12355,13 @@ let
         sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1";
       };
     };
-    "iconv-lite-0.4.21" = {
+    "iconv-lite-0.4.22" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
-      version = "0.4.21";
+      version = "0.4.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz";
-        sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz";
+        sha512 = "1fdqcacbfr3yxs5i2kj9kn06lgx2a9yfrdps0hsmw96p1slawiqp3qyfnqczp570wbbi5sr8valqyll05a5gzj3ahppnkl32waaf26l";
       };
     };
     "iconv-lite-0.4.8" = {
@@ -16829,13 +16829,13 @@ let
         sha512 = "1slngp5z9rczjirv9lpdwiv1ap4xmp28jxl4r0i5hpds1khlm89qp70ziz8k5h2vwjph6srjqi3gb2yrwwsnnwli6p8yxvlyx7nn80p";
       };
     };
-    "minipass-2.2.4" = {
+    "minipass-2.3.0" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.2.4";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz";
-        sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz";
+        sha512 = "1p0pbj1iwnzb7kkqbh5h0vd6byh1l6na1yx69qmbb0wbmwm0qc5g4hn4z6lr8wkzb4kybvd1hjm4hxd93nrdr8ydbqqd9wd1w9bcq4d";
       };
     };
     "minizlib-1.1.0" = {
@@ -17180,6 +17180,15 @@ let
         sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a";
       };
     };
+    "mri-1.1.1" = {
+      name = "mri";
+      packageName = "mri";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mri/-/mri-1.1.1.tgz";
+        sha1 = "85aa26d3daeeeedf80dc5984af95cc5ca5cad9f1";
+      };
+    };
     "ms-0.1.0" = {
       name = "ms";
       packageName = "ms";
@@ -20445,13 +20454,13 @@ let
         sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505";
       };
     };
-    "prebuild-install-2.5.3" = {
+    "prebuild-install-4.0.0" = {
       name = "prebuild-install";
       packageName = "prebuild-install";
-      version = "2.5.3";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.3.tgz";
-        sha512 = "3z8bc2sx9ibs343jllm11azqkcc7vxpf0skfm68dqwz9l59z381vbqip00sgpzg9di2zagjm3wbx65s6g2kg5kj8b1vp0vnqglkgcpy";
+        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz";
+        sha512 = "2ffx8smnrj269a2r9lsiv4s71rvzhanb3a3hqg1i8daznmhl0w9lfsylh9hw5si1agsmbsn0j2syp8sn9r7cwxm8ps9b80vwv2v5mpf";
       };
     };
     "precond-0.2.3" = {
@@ -32480,7 +32489,7 @@ in
       sources."has-to-string-tag-x-1.4.1"
       sources."home-or-tmp-2.0.0"
       sources."hosted-git-info-2.6.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       (sources."import-jsx-1.3.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -32706,7 +32715,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ignore-3.3.8"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
@@ -32889,7 +32898,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ignore-3.3.8"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
@@ -34225,7 +34234,7 @@ in
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."minipass-2.2.4"
+      sources."minipass-2.3.0"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
@@ -35853,7 +35862,7 @@ in
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.6.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."imurmurhash-0.1.4"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
@@ -36087,10 +36096,10 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "3.0.2";
+    version = "3.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-3.0.2.tgz";
-      sha512 = "1hs3nj50rw6qlk3hjkd6ynhdv7mdlawwl4jzl3d43kbijkych51dm15ccb1ra7i9pmaq13nm24rkzf3bxv3fcpcrqq499cp0lbyg2cj";
+      url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz";
+      sha512 = "1qmi7lbjfq3w5ygilwf5sagk463c0j6kj2wsidzh6100v02bpfi05c8kbycf395hrdmmy5ffb5f0rsvkvqyhxw9hxrlyvnafc9b4x5b";
     };
     dependencies = [
       sources."ajv-5.5.2"
@@ -36150,7 +36159,7 @@ in
       sources."request-2.85.0"
       sources."safe-buffer-5.1.2"
       sources."sntp-2.1.0"
-      sources."source-map-0.5.7"
+      sources."source-map-0.6.1"
       sources."sshpk-1.14.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.4"
@@ -36976,7 +36985,7 @@ in
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimist-0.0.8"
-      sources."minipass-2.2.4"
+      sources."minipass-2.3.0"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
@@ -37500,7 +37509,7 @@ in
       sources."gauge-2.7.4"
       sources."glob-7.1.2"
       sources."has-unicode-2.0.1"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ignore-walk-3.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -37509,7 +37518,7 @@ in
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.2.4"
+      sources."minipass-2.3.0"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
@@ -38106,7 +38115,7 @@ in
         ];
       })
       sources."mqtt-packet-5.5.0"
-      sources."mri-1.1.0"
+      sources."mri-1.1.1"
       sources."ms-2.0.0"
       (sources."multer-1.3.0" // {
         dependencies = [
@@ -38777,7 +38786,7 @@ in
       sources."hoek-4.2.1"
       sources."hosted-git-info-2.6.0"
       sources."https-proxy-agent-2.2.1"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       (sources."inquirer-3.3.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -40699,7 +40708,7 @@ in
       sources."esprima-fb-13001.1001.0-dev-harmony-fb"
       sources."glob-5.0.15"
       sources."graceful-fs-4.1.11"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       (sources."jstransform-10.1.0" // {
@@ -43025,7 +43034,7 @@ in
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ieee754-1.1.11"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -43766,7 +43775,7 @@ in
       sources."buffer-fill-0.1.1"
       sources."buffer-from-1.0.0"
       sources."buffer-indexof-1.1.1"
-      (sources."bufferutil-3.0.4" // {
+      (sources."bufferutil-3.0.5" // {
         dependencies = [
           sources."simple-get-2.8.1"
         ];
@@ -43895,7 +43904,7 @@ in
       sources."piece-length-1.0.0"
       sources."pify-2.3.0"
       sources."plist-with-patches-0.5.1"
-      sources."prebuild-install-2.5.3"
+      sources."prebuild-install-4.0.0"
       sources."prettier-bytes-1.0.4"
       sources."process-nextick-args-2.0.0"
       sources."protobufjs-3.8.2"
@@ -44472,7 +44481,7 @@ in
       sources."http-proxy-agent-2.1.0"
       sources."http-signature-1.2.0"
       sources."https-proxy-agent-2.2.1"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ignore-3.3.8"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -45237,7 +45246,7 @@ in
       sources."http-cache-semantics-3.8.1"
       sources."http-signature-1.2.0"
       sources."humanize-string-1.0.2"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."indent-string-3.2.0"
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index e64364eb68b..cfaa4f0634f 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -3100,13 +3100,13 @@ let
         sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d";
       };
     };
-    "iconv-lite-0.4.21" = {
+    "iconv-lite-0.4.22" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
-      version = "0.4.21";
+      version = "0.4.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz";
-        sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz";
+        sha512 = "1fdqcacbfr3yxs5i2kj9kn06lgx2a9yfrdps0hsmw96p1slawiqp3qyfnqczp570wbbi5sr8valqyll05a5gzj3ahppnkl32waaf26l";
       };
     };
     "iconv-lite-0.4.8" = {
@@ -4549,13 +4549,13 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
-    "minipass-2.2.4" = {
+    "minipass-2.3.0" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.2.4";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz";
-        sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz";
+        sha512 = "1p0pbj1iwnzb7kkqbh5h0vd6byh1l6na1yx69qmbb0wbmwm0qc5g4hn4z6lr8wkzb4kybvd1hjm4hxd93nrdr8ydbqqd9wd1w9bcq4d";
       };
     };
     "minizlib-1.1.0" = {
@@ -6646,13 +6646,13 @@ let
         sha1 = "a4316ccb0d40a77d30dadf91f0f4db7e475f948a";
       };
     };
-    "swagger-test-templates-1.4.3" = {
+    "swagger-test-templates-1.5.0" = {
       name = "swagger-test-templates";
       packageName = "swagger-test-templates";
-      version = "1.4.3";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.4.3.tgz";
-        sha1 = "e047473aec06b938992e427665cafdbb6a01cfc0";
+        url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.5.0.tgz";
+        sha512 = "0jmilcls10zf18f7nlcdn29qdf21bl4xsk1kzzayp5h92ljkwx3c9jyy3a3p2yrd6pjnzh0k5c4yih3kbv6nxcd2rpf5vlfm44lg06l";
       };
     };
     "swagger-tools-0.9.16" = {
@@ -7635,7 +7635,7 @@ in
       sources."formidable-1.2.1"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."inherits-2.0.3"
       (sources."inquirer-3.3.0" // {
         dependencies = [
@@ -8370,7 +8370,7 @@ in
       sources."gauge-2.7.4"
       sources."glob-7.1.2"
       sources."has-unicode-2.0.1"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ignore-walk-3.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -8379,7 +8379,7 @@ in
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.2.4"
+      sources."minipass-2.3.0"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
@@ -8650,7 +8650,7 @@ in
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ieee754-1.1.11"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -9281,7 +9281,7 @@ in
       sources."supports-color-2.0.0"
       sources."swagger-converter-0.2.0"
       sources."swagger-editor-2.10.5"
-      (sources."swagger-test-templates-1.4.3" // {
+      (sources."swagger-test-templates-1.5.0" // {
         dependencies = [
           sources."camelcase-1.2.1"
           sources."is-extglob-1.0.0"
-- 
GitLab


From 639376aff6679e9add23f64089c95944bd2e6b41 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:24:49 -0700
Subject: [PATCH 0240/1085] lean: 3.3.0 -> 3.4.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/kdbjdracd2m6fv18k9kc5bcmr0p60glx-lean-3.4.1/bin/lean -h’ got 0 exit code
- ran ‘/nix/store/kdbjdracd2m6fv18k9kc5bcmr0p60glx-lean-3.4.1/bin/lean --help’ got 0 exit code
- ran ‘/nix/store/kdbjdracd2m6fv18k9kc5bcmr0p60glx-lean-3.4.1/bin/leanpkg help’ got 0 exit code
- found 3.4.1 with grep in /nix/store/kdbjdracd2m6fv18k9kc5bcmr0p60glx-lean-3.4.1
- directory tree listing: https://gist.github.com/198504c00746718749b3019653fe78fd
---
 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 095aa5a7f8c..16fdab59ea0 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.3.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "0irh9b4haz0pzzxrb4hwcss91a0xb499kjrcrmr2s59p3zq8bbd9";
+    sha256 = "0ww8azlyy3xikhd7nh96f507sg23r53zvayij1mwv5513vmblhhw";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 0e5d6a6644f63ab910cb1103b075148cce6e70d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 May 2018 10:28:09 +0100
Subject: [PATCH 0241/1085] nodePackages.imapnotify: init at 0.4.1

fixes #38025 #37179
---
 .../node-packages/node-packages-v6.json       |  1 +
 .../node-packages/node-packages-v6.nix        | 80 +++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 9b19a4f5a62..4e9d9e71e8d 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -38,6 +38,7 @@
 , "ionic"
 , "ios-deploy"
 , "istanbul"
+, "imapnotify"
 , "javascript-typescript-langserver"
 , "jayschema"
 , "jsdoc"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 27f58d5ad1d..039401c822f 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -20553,6 +20553,15 @@ let
         sha512 = "2x2535hml3hmhh6qbsl9r97mpa264mbpvmv0lbsqsfkv3sfd8wv7zw1b68555qsj5c6ma4b66qkgdsrr6355lhbmz052hqzq2qx082h";
       };
     };
+    "printf-0.2.5" = {
+      name = "printf";
+      packageName = "printf";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/printf/-/printf-0.2.5.tgz";
+        sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f";
+      };
+    };
     "private-0.1.8" = {
       name = "private";
       packageName = "private";
@@ -28699,6 +28708,15 @@ let
         sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
       };
     };
+    "xenvar-0.5.1" = {
+      name = "xenvar";
+      packageName = "xenvar";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xenvar/-/xenvar-0.5.1.tgz";
+        sha1 = "f82d2fedee63af76687b70115ce6274dc71310e9";
+      };
+    };
     "xhr-2.4.1" = {
       name = "xhr";
       packageName = "xhr";
@@ -34461,6 +34479,68 @@ in
     production = true;
     bypassCache = false;
   };
+  imapnotify = nodeEnv.buildNodePackage {
+    name = "imapnotify";
+    packageName = "imapnotify";
+    version = "0.4.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/imapnotify/-/imapnotify-0.4.1.tgz";
+      sha512 = "0fn58ydrck0mwpq48pj2in6aql522avzyabrddq4ixykr1h29ha3cvh1v0mga8ghg1v9zpkii81qqac74qwm9ikr1kll616fcz0cc0s";
+    };
+    dependencies = [
+      sources."async-0.2.10"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."bunyan-1.8.12"
+      sources."colors-0.6.2"
+      sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
+      sources."cycle-1.0.3"
+      sources."dtrace-provider-0.8.6"
+      sources."eyes-0.1.8"
+      sources."glob-6.0.4"
+      sources."imap-0.8.19"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."isarray-0.0.1"
+      sources."isstream-0.1.2"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.10"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."moment-2.22.1"
+      sources."mv-2.1.1"
+      sources."nan-2.10.0"
+      sources."ncp-2.0.0"
+      sources."once-1.4.0"
+      sources."optimist-0.6.1"
+      sources."path-is-absolute-1.0.1"
+      sources."pkginfo-0.3.1"
+      sources."printf-0.2.5"
+      sources."readable-stream-1.1.14"
+      sources."rimraf-2.4.5"
+      sources."safe-json-stringify-1.1.0"
+      sources."semver-5.3.0"
+      sources."stack-trace-0.0.10"
+      sources."string_decoder-0.10.31"
+      sources."utf7-1.0.2"
+      sources."winston-0.8.3"
+      sources."wordwrap-0.0.3"
+      sources."wrappy-1.0.2"
+      sources."xenvar-0.5.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Execute scripts on new messages using IDLE imap command";
+      homepage = "https://github.com/a-sk/node-imapnotify#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
     packageName = "javascript-typescript-langserver";
-- 
GitLab


From d3a8e055386bae4e0113e86adb11fe8bcabff854 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:28:31 -0700
Subject: [PATCH 0242/1085] libraw: 0.18.9 -> 0.18.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/raw-identify -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/raw-identify --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/raw-identify help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/unprocessed_raw -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/unprocessed_raw --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/unprocessed_raw help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/4channels -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/4channels --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/4channels help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/simple_dcraw -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/simple_dcraw --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/simple_dcraw help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/mem_image -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/mem_image --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/mem_image help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_half -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_half --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_half help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/half_mt -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/half_mt --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/half_mt help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/multirender_test -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/multirender_test --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/multirender_test help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/postprocessing_benchmark -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/postprocessing_benchmark help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_emu -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_emu help’ got 0 exit code
- found 0.18.10 with grep in /nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10
- directory tree listing: https://gist.github.com/8de105fd367301af8971e9bc3012a0d3
---
 pkgs/development/libraries/libraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 4ad2f7ba34d..1213f93112f 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.18.9";
+  version = "0.18.10";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "0kmjfdr409k9q9n17k9ywims5z4kqc16s81ba7y09n7669q1gvyj";
+    sha256 = "0klrzg1cn8ksxqbhx52dldi5bbmad190npnhhgkyr2jzpgrbpj88";
   };
 
   outputs = [ "out" "lib" "dev" "doc" ];
-- 
GitLab


From f343efcf9bb1b8c0a8c44b3417cfd52eb4d71565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 May 2018 10:30:25 +0100
Subject: [PATCH 0243/1085] nodePackages.elm-oracle: init at 1.1.1

fixes #38353 #31036
---
 .../node-packages/node-packages-v6.json         |  1 +
 .../node-packages/node-packages-v6.nix          | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 4e9d9e71e8d..5f18a286ad7 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -19,6 +19,7 @@
 , "dnschain"
 , "docker-registry-server"
 , "elasticdump"
+, "elm-oracle"
 , "elm-test"
 , "emoj"
 , "eslint"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 039401c822f..66a016ceb51 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -32223,6 +32223,23 @@ in
     production = true;
     bypassCache = false;
   };
+  elm-oracle = nodeEnv.buildNodePackage {
+    name = "elm-oracle";
+    packageName = "elm-oracle";
+    version = "1.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/elm-oracle/-/elm-oracle-1.1.1.tgz";
+      sha1 = "61f6d783221b4ad08e7d101d678b9d5a67d3961c";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Query for information about values in elm source files.";
+      homepage = "https://github.com/ElmCast/elm-oracle#readme";
+      license = "BSD-3-Clause";
+    };
+    production = true;
+    bypassCache = false;
+  };
   elm-test = nodeEnv.buildNodePackage {
     name = "elm-test";
     packageName = "elm-test";
-- 
GitLab


From d813ba2dbf86042d98abf472ead0c251c7a15d73 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:43:51 -0700
Subject: [PATCH 0244/1085] libx86emu: 1.12 -> 1.14

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/1727e070918ad2877736d62030608e9a
---
 pkgs/development/libraries/libx86emu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index b745098bd64..bbaa6b08961 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libx86emu-${version}";
-  version = "1.12";
+  version = "1.14";
 
   src = fetchFromGitHub {
     owner = "wfeldt";
     repo = "libx86emu";
     rev = version;
-    sha256 = "0dlzvwdkk0vc6qf0a0zzbxki3pig1mda8p3fa54rxqaxkwp4mqr6";
+    sha256 = "120a01jrrd4rwwjfr5f612xq9hbh35c87a6wnqn7zzw3fqydc2lw";
   };
 
   nativeBuildInputs = [ perl ];
-- 
GitLab


From f08e06ba2f955d7c900b6c0a18ad0102db363871 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:44:50 -0700
Subject: [PATCH 0245/1085] libcue: 2.2.0 -> 2.2.1

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.2.1 with grep in /nix/store/lqppvr2arq1jmmdil3519c2y7hhm0vq3-libcue-2.2.1
- directory tree listing: https://gist.github.com/49da59ef9dfe640d50f9bc6ee72a7457
---
 pkgs/development/libraries/libcue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix
index fb0f0d3d3f9..dbc5f1cf4ec 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/pkgs/development/libraries/libcue/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcue-${version}";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "lipnitsk";
     repo = "libcue";
     rev = "v${version}";
-    sha256 = "0znn9scamy1nsz1dzvsamqg46zr7ldfvpxiyzi1ss9d6gbcm0frs";
+    sha256 = "1iqw4n01rv2jyk9lksagyxj8ml0kcfwk67n79zy1r6zv1xfp5ywm";
   };
 
   nativeBuildInputs = [ cmake bison flex ];
-- 
GitLab


From fe89c1be0308390918f0b4efd384ee9be59d5c3e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:01:21 -0700
Subject: [PATCH 0246/1085] hwdata: 0.311 -> 0.312

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.312 with grep in /nix/store/sfzsz7mns2n1kj0s9wdhv38s5xm0a1c3-hwdata-0.312
- directory tree listing: https://gist.github.com/7c5e5f17dc28268564e6ebf71204803d
---
 pkgs/os-specific/linux/hwdata/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 15b3903ddd1..070ddfd7778 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hwdata-${version}";
-  version = "0.311";
+  version = "0.312";
 
   src = fetchurl {
-    url = "https://github.com/vcrhonek/hwdata/archive/v0.311.tar.gz";
-    sha256 = "159av9wvl3biryxd5pgqcwz6wkdaa0ydmcysmzznx939mfv7w18z";
+    url = "https://github.com/vcrhonek/hwdata/archive/v0.312.tar.gz";
+    sha256 = "04dbxfn40b8vyw49qpkslv20akbqm5hwl3cndmqacp6cik1l0gai";
   };
 
   preConfigure = "patchShebangs ./configure";
-- 
GitLab


From e3261386ba07a8db1d015a2d8654d89c793d1760 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:15:08 -0700
Subject: [PATCH 0247/1085] hiawatha: 10.7 -> 10.8.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/ssi-cgi -h’ got 0 exit code
- ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/ssi-cgi -v’ and found version 10.8.1
- ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/hiawatha -h’ got 0 exit code
- ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/wigwam -h’ got 0 exit code
- ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/wigwam -v’ and found version 10.8.1
- found 10.8.1 with grep in /nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1
- directory tree listing: https://gist.github.com/bed64b3bf49236cbbfafddbb1f63c00a
---
 pkgs/servers/http/hiawatha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
index 99900bbdb3e..277fa06a707 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -12,11 +12,11 @@ assert enableSSL -> openssl !=null;
 
 stdenv.mkDerivation rec {
   name = "hiawatha-${version}";
-  version = "10.7";
+  version = "10.8.1";
 
   src = fetchurl {
     url = "https://github.com/hsleisink/hiawatha/archive/v${version}.tar.gz";
-    sha256 = "1k0vgpfkmdxmkimq4ab70cqwhj5qwr4pzq7nnv957ah8cw2ijy1z";
+    sha256 = "1f2hlw2lp98b4dx87i7pz7h66vsy2g22b5adfrlij3kj0vfv61w8";
   };
 
   buildInputs =  [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ;
-- 
GitLab


From ee95ed11ca1e0df43caf927adb2287bbd7eeeb3a Mon Sep 17 00:00:00 2001
From: Wanja Chresta <wanja.chresta@finnova.com>
Date: Mon, 7 May 2018 12:18:06 +0200
Subject: [PATCH 0248/1085] tamarin-prover: Fix compile issues

---
 .../science/logic/tamarin-prover/default.nix      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index 7a9dcc23192..4461fa675e8 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -8,8 +8,8 @@ let
   src = fetchFromGitHub {
     owner  = "tamarin-prover";
     repo   = "tamarin-prover";
-    rev    = "120c7e706f3e1d4646b233faf2bc9936834ed9d3";
-    sha256 = "064blwjjwnkycwgsrdn1xkjya976wndpz9h5pjmgjqqirinc8c5x";
+    rev    = "ab8a155452e9e9c57ccb4bbe1b94d7677ea5ce21";
+    sha256 = "02ycxxkcpc0dzybaq63viciydq1ik8wiv2blk8mvnz3ssxw3sjik";
   };
 
   # tamarin has its own dependencies, but they're kept inside the repo,
@@ -65,6 +65,15 @@ mkDerivation (common "tamarin-prover" src // {
   enableSharedExecutables = false;
   postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
 
+  # Fix problem with MonadBaseControl not being found
+  patchPhase = ''
+    sed -ie 's,\(import *\)Control\.Monad$,&\
+    \1Control.Monad.Trans.Control,' src/Web/Handler.hs
+
+    sed -ie 's~\( *, \)mtl~&\
+    \1monad-control~' tamarin-prover.cabal
+  '';
+
   # wrap the prover to be sure it can find maude, sapic, etc
   executableToolDepends = [ makeWrapper which maude graphviz sapic ];
   postInstall = ''
@@ -79,7 +88,7 @@ mkDerivation (common "tamarin-prover" src // {
 
   executableHaskellDepends = (with haskellPackages; [
     base binary binary-orphans blaze-builder blaze-html bytestring
-    cmdargs conduit containers deepseq directory fclabels file-embed
+    cmdargs conduit containers monad-control deepseq directory fclabels file-embed
     filepath gitrev http-types HUnit lifted-base mtl parsec process
     resourcet safe shakespeare tamarin-prover-term
     template-haskell text threads time wai warp yesod-core yesod-static
-- 
GitLab


From 9ee600a06f600c91bc5afa90ff58e598ea7f0797 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:18:20 -0700
Subject: [PATCH 0249/1085] insomnia: 5.16.1 -> 5.16.2

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.16.2 with grep in /nix/store/9jcvxvs1y2jycaq8n26zidh7y3shicp0-insomnia-5.16.2
- directory tree listing: https://gist.github.com/a02ce6405af5678bfbbd0fd9a116e95e
---
 pkgs/development/web/insomnia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 4e5596fee66..6d1eb0dbe3e 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -15,11 +15,11 @@ let
   runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ];
 in stdenv.mkDerivation rec {
   name = "insomnia-${version}";
-  version = "5.16.1";
+  version = "5.16.2";
 
   src = fetchurl {
     url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "0r1l7pfcnif8vw9jnxbh5p9sih6wvgjpx8rpfmnvw21pr8cm0zyp";
+    sha256 = "1sjcbi45n10lf69a48447lfbxxjib7v2isshaykz43qqasqqrd18";
   };
 
   nativeBuildInputs = [ makeWrapper dpkg ];
-- 
GitLab


From 941b2a17cbc27535d65628f1a48731b9b3648619 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:41:32 -0700
Subject: [PATCH 0250/1085] gnuplot: 5.2.2 -> 5.2.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/gnuplot -h’ got 0 exit code
- ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/gnuplot --help’ got 0 exit code
- ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/.gnuplot-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/.gnuplot-wrapped --help’ got 0 exit code
- found 5.2.3 with grep in /nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3
- directory tree listing: https://gist.github.com/c09c0907f914e36a3f7c086d4b978dbf
---
 pkgs/tools/graphics/gnuplot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index a177f33bb37..b2b8508640b 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -20,11 +20,11 @@ let
   withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
 in
 stdenv.mkDerivation rec {
-  name = "gnuplot-5.2.2";
+  name = "gnuplot-5.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
-    sha256 = "18diyy7aib9mn098x07g25c7jij1x7wbfpicz0z8gwxx08px45m4";
+    sha256 = "0977vgjszjpqhz2jahq07zmcmi0k9d6v7wq70ph2klfrb29qrdgy";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools;
-- 
GitLab


From fcf66ef1d53850bf3cf8b95c204ceb82815fbb6b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:48:36 -0700
Subject: [PATCH 0251/1085] fswatch: 1.11.2 -> 1.11.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/c05hlqp57zslb3imjx6m5dary3ak601d-fswatch-1.11.3/bin/fswatch -h’ got 0 exit code
- ran ‘/nix/store/c05hlqp57zslb3imjx6m5dary3ak601d-fswatch-1.11.3/bin/fswatch --help’ got 0 exit code
- found 1.11.3 with grep in /nix/store/c05hlqp57zslb3imjx6m5dary3ak601d-fswatch-1.11.3
- directory tree listing: https://gist.github.com/cc22e26348bfd98159c6519a470d3bdb
---
 pkgs/development/tools/misc/fswatch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 2b26383ed31..9c0c357e186 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   name = "fswatch-${version}";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "05vgpd1fx9fy3vnnmq5gz236avgva82axix127xy98gaxrac52vq";
+    sha256 = "1w83bpgx0wsgn70jyxwrvh9dsivrq41ifcignjzdxdwz9j0rwhh1";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From fb5fbbe29e08eae9fb1cf4a87f6d41e7fdb1eb59 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:59:01 -0700
Subject: [PATCH 0252/1085] gsm: 1.0.17 -> 1.0.18
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/toast -h’ got 0 exit code
- ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/toast help’ got 0 exit code
- ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/tcat -h’ got 0 exit code
- ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/tcat help’ got 0 exit code
- ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/untoast -h’ got 0 exit code
- ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/untoast help’ got 0 exit code
- found 1.0.18 with grep in /nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18
- directory tree listing: https://gist.github.com/af6b37d2f0a0b0757d66e91dce102967
---
 pkgs/development/libraries/gsm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 57112e2825e..33583a4c6bb 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -9,11 +9,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "gsm-${version}";
-  version = "1.0.17";
+  version = "1.0.18";
 
   src = fetchurl {
     url = "http://www.quut.com/gsm/${name}.tar.gz";
-    sha256 = "00bns0d4wwrvc60lj2w7wz4yk49q1f6rpdrwqzrxsha9d78mfnl5";
+    sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4";
   };
 
   patchPhase = ''
-- 
GitLab


From fc509faa8786b5293a3fedb037eb2c16a8190a79 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 04:00:55 -0700
Subject: [PATCH 0253/1085] freeipmi: 1.6.1 -> 1.6.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/bmc-config --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/bmc-device --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/bmc-info --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-chassis --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-chassis-config --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-config --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-console --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-dcmi --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-detect --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-fru --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-locate --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-oem --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-oem help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-pef-config --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-pet --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-ping -V’ and found version 1.6.2
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-power --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-raw --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-sel --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-sensors --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-sensors-config --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmiconsole --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmidetect --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmidetectd --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmimonitoring --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmiping -V’ and found version 1.6.2
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmipower --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmiseld --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/pef-config --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/rmcp-ping -V’ and found version 1.6.2
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/rmcpping -V’ and found version 1.6.2
- found 1.6.2 with grep in /nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2
- directory tree listing: https://gist.github.com/15391c2b5273ea7e8b859877efa69d3b
---
 pkgs/tools/system/freeipmi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 6996d66abe0..9c7a5b36c5b 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, libgcrypt, readline, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.1";
+  version = "1.6.2";
   name = "freeipmi-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/freeipmi/${name}.tar.gz";
-    sha256 = "0jdm1nwsnkj0nzjmcqprmjk25449mhjj25khwzpq3mpjw440wmd2";
+    sha256 = "0jhjf21gn1m9lhjsc1ard9zymq25mk7rxcyygjfxgy0vb4j36l9i";
   };
 
   buildInputs = [ libgcrypt readline libgpgerror ];
-- 
GitLab


From 5ec51c5d7c863a335d31c6ea5bae3c1da37131ff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 04:20:37 -0700
Subject: [PATCH 0254/1085] fossil: 2.5 -> 2.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6/bin/fossil --help’ got 0 exit code
- ran ‘/nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6/bin/fossil help’ got 0 exit code
- found 2.6 with grep in /nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6
- directory tree listing: https://gist.github.com/673b50672a3bb2c22d7e37175d1f37d4
---
 pkgs/applications/version-management/fossil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index cadc72f0f87..f46a704ea9c 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   name = "fossil-${version}";
-  version = "2.5";
+  version = "2.6";
 
   src = fetchurl {
     urls =
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
         "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
       ];
     name = "${name}.tar.gz";
-    sha256 = "1lxawkhr1ki9fqw8076fxib2b1w673449yzb6vxjshqzh5h77c7r";
+    sha256 = "1nbfzxwnq66f8162nmddd22xn3nyazqr16kka2c1gghqb5ar99vn";
   };
 
   buildInputs = [ zlib openssl readline sqlite which ed ]
-- 
GitLab


From 5ef7241e1aaf4d55b8160d4fe1b168465cfe68e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 04:25:49 -0700
Subject: [PATCH 0255/1085] fwup: 1.0.0 -> 1.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/37baank8iw1ksnyhg0m90y0p9sazyhv7-fwup-1.1.0/bin/fwup -h’ got 0 exit code
- ran ‘/nix/store/37baank8iw1ksnyhg0m90y0p9sazyhv7-fwup-1.1.0/bin/fwup --help’ got 0 exit code
- ran ‘/nix/store/37baank8iw1ksnyhg0m90y0p9sazyhv7-fwup-1.1.0/bin/fwup --version’ and found version 1.1.0
- found 1.1.0 with grep in /nix/store/37baank8iw1ksnyhg0m90y0p9sazyhv7-fwup-1.1.0
- directory tree listing: https://gist.github.com/eafe4f2b1c0b7a6fac5a4910f383ee94
---
 pkgs/tools/misc/fwup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index e334a2a8813..3903fde3302 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "fwup-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     rev = "v${version}";
-    sha256 = "1v79q5s4lm8scrz9nmqcszyh40is6k7hkr15r4aljyfbp1gamsfs";
+    sha256 = "1jhl50yj5h6wl3fx1hcqi4vb7633srmbbcpsgajprc5fxscjgapm";
   };
 
   doCheck = true;
-- 
GitLab


From 95e317bf54ed5b78dafc4aa873615f33d123d714 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 04:32:20 -0700
Subject: [PATCH 0256/1085] dash: 0.5.9.1 -> 0.5.10

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/ac71c74097484baeb4301fc8048b372d
---
 pkgs/shells/dash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix
index 1de2a52634b..5f26801ca6d 100644
--- a/pkgs/shells/dash/default.nix
+++ b/pkgs/shells/dash/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dash-0.5.9.1";
+  name = "dash-0.5.10";
 
   src = fetchurl {
     url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
-    sha256 = "5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659";
+    sha256 = "1arimvc9zcghhb3nin9z3yr5706vxfri4a9r3j9j9d0n676f0w5d";
   };
 
   hardeningDisable = [ "format" ];
-- 
GitLab


From 7d915bd28d4e5cc91f9d0a1dd7d14c7974698119 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 04:59:30 -0700
Subject: [PATCH 0257/1085] fanficfare: 2.23.0 -> 2.25.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/.fanficfare-wrapped -h’ got 0 exit code
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/.fanficfare-wrapped --help’ got 0 exit code
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/.fanficfare-wrapped -v’ and found version 2.25.0
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/.fanficfare-wrapped --version’ and found version 2.25.0
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/fanficfare -h’ got 0 exit code
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/fanficfare --help’ got 0 exit code
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/fanficfare -v’ and found version 2.25.0
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/fanficfare --version’ and found version 2.25.0
- found 2.25.0 with grep in /nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0
- directory tree listing: https://gist.github.com/a5ca8fdb686eb942eb92828f63be5af0
---
 pkgs/tools/text/fanficfare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index cffce8e3b88..2ebab9d6390 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python27Packages }:
 
 python27Packages.buildPythonApplication rec {
-  version = "2.23.0";
+  version = "2.25.0";
   name = "fanficfare-${version}";
   nameprefix = "";
 
   src = fetchurl {
     url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
-    sha256 = "0589b5pg03rfv9x753cnbkz6pz508xs1n2lla3qfpagxc0pyg8i1";
+    sha256 = "1fval2jhrv3w762rmrbhbn8zj161aalvqy8n8q74yr8hzmpcvlwn";
   };
 
   propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];
-- 
GitLab


From fcb6a0a56ed34d43aa234eb1f3b717c3e24b695b Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 7 May 2018 14:04:15 +0200
Subject: [PATCH 0258/1085] spotify: remove/update gnome2 references

Part of #39976
---
 pkgs/applications/audio/spotify/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix             | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 1a4f2bdd1b5..fefab263065 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,6 +1,8 @@
 { fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype
-, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf
-, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }:
+, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng
+, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }:
+
+assert stdenv.system == "x86_64-linux";
 
 let
   # Please update the stable branch!
@@ -20,7 +22,6 @@ let
     ffmpeg_0_10
     fontconfig
     freetype
-    GConf
     gdk_pixbuf
     glib
     gtk2
@@ -93,7 +94,7 @@ stdenv.mkDerivation {
       librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir"
       wrapProgram $out/share/spotify/spotify \
         --prefix LD_LIBRARY_PATH : "$librarypath" \
-        --prefix PATH : "${gnome2.zenity}/bin"
+        --prefix PATH : "${gnome3.zenity}/bin"
 
       # Desktop file
       mkdir -p "$out/share/applications/"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ea5d55a281..a4d07741f1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17925,7 +17925,6 @@ with pkgs;
   };
 
   spotify = callPackage ../applications/audio/spotify {
-    inherit (gnome2) GConf;
     libgcrypt = libgcrypt_1_5;
     libpng = libpng12;
     curl = curl.override {
-- 
GitLab


From 2dbb29c3340b916ec83892bf514c457f9d88af01 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 7 May 2018 14:06:35 +0200
Subject: [PATCH 0259/1085] spotify: remove platform assertion

---
 pkgs/applications/audio/spotify/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index fefab263065..5f6772256ca 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -2,8 +2,6 @@
 , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng
 , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }:
 
-assert stdenv.system == "x86_64-linux";
-
 let
   # Please update the stable branch!
   # Latest version number can be found at:
-- 
GitLab


From 335931b012d1fcacd3dc908bc14d98b9001480f5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 05:13:43 -0700
Subject: [PATCH 0260/1085] certbot: 0.23.0 -> 0.24.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot -h’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot --help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot --version’ and found version 0.24.0
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped --version’ and found version 0.24.0
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped -h’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped --help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped --version’ and found version 0.24.0
- found 0.24.0 with grep in /nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0
- directory tree listing: https://gist.github.com/ecc49ff604fc592bc8d187e494c0e9cc
---
 pkgs/tools/admin/certbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index 3106552a661..7a26896bbc2 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -4,13 +4,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "certbot-${version}";
-  version = "0.23.0";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "certbot";
     repo = "certbot";
     rev = "v${version}";
-    sha256 = "0dv9d1byppnvx54rhi2w3gqjk01444m5hbr9553n9gin4ribviii";
+    sha256 = "0gsq4si0bqwzd7ywf87y7bbprqg1m72qdj11h64qmwb5zl4vh444";
   };
 
   propagatedBuildInputs = with pythonPackages; [
-- 
GitLab


From 1d5843550144b8293c2c84e3a8110881594647a4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 05:20:34 -0700
Subject: [PATCH 0261/1085] asdf: 3.3.1 -> 3.3.2

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.3.2 with grep in /nix/store/mcks1swd685sksr4yjrsyfhphzcrw9nk-asdf-3.3.2
- directory tree listing: https://gist.github.com/3a13d7343736c1454dc2701b3ea3009f
---
 pkgs/development/lisp-modules/asdf/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 27089ee3e52..c9d8d52b068 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asdf";
-    version="3.3.1";
+    version="3.3.2";
     name="${baseName}-${version}";
-    hash="1yhlhyllabsha84wycqk0mhbcq2w332jdlp19ccx4rplczzn2w3g";
-    url="http://common-lisp.net/project/asdf/archives/asdf-3.3.1.tar.gz";
-    sha256="1yhlhyllabsha84wycqk0mhbcq2w332jdlp19ccx4rplczzn2w3g";
+    hash="1bdrybn97qhny5192ifis8fp8m79djql2k4h9r9q2wnwxf9q2d4x";
+    url="http://common-lisp.net/project/asdf/archives/asdf-3.3.2.tar.gz";
+    sha256="1bdrybn97qhny5192ifis8fp8m79djql2k4h9r9q2wnwxf9q2d4x";
   };
   buildInputs = [
     texinfo texLive perl
-- 
GitLab


From 1e01a6ef38215dd4082bb4035b3e89c4dc94a9cc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 05:20:59 -0700
Subject: [PATCH 0262/1085] alfred: 2018.0 -> 2018.1

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2018.1 with grep in /nix/store/2fj5i6zd4mp4asxchsig266lqz8acliv-alfred-2018.1
- directory tree listing: https://gist.github.com/64f566e02d8018fe290dc3db29fd7c7f
---
 pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index 9b7484932eb..90489e12d69 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 = "2018.0";
+  ver = "2018.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 = "0mzjgjkmgdrrqa6fbpii9q1xqvg3kvwgq2k2kpdf0vy4xxnypky7";
+    sha256 = "0xkd842yp227jzfybjq8c5s7y5c7amm1f5ai80k8wyjwysnad3w0";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 253ea95d289221bcb72377b2fa33625ce2cc1dac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 May 2018 02:30:46 +0200
Subject: [PATCH 0263/1085] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/f60ac8c0ef62f4e6a5aae3dfb9c4ac25a79918a2.
---
 .../haskell-modules/hackage-packages.nix      | 234 ++++++++++++++----
 1 file changed, 181 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f0b8c3d6316..197f2d7cb75 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -33676,8 +33676,8 @@ self: {
      }:
      mkDerivation {
        pname = "battleplace";
-       version = "0.1.0.2";
-       sha256 = "0gkchw2dqg3cps5xf88qmmn9mzd7zpws1ngsr3k9lh7krah8a7fc";
+       version = "0.1.0.3";
+       sha256 = "0kvw69br5nrx4nnrp0r00wr55w15wq5kh68df2r89yrd8l5vp02x";
        libraryHaskellDepends = [
          aeson base bytestring cereal data-default hashable memory servant
          text vector
@@ -61729,6 +61729,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "df1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , QuickCheck, tasty, tasty-quickcheck, text, time
+     }:
+     mkDerivation {
+       pname = "df1";
+       version = "0.1";
+       sha256 = "0crcwg63d1m47qj44774ydk9v5sssg08vwbjgh1lg8qvqss7qk8l";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers text time
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring QuickCheck tasty tasty-quickcheck text
+         time
+       ];
+       homepage = "https://github.com/k0001/di";
+       description = "Type, render and parse the df1 hierarchical structured log format";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dfrac" = callPackage
     ({ mkDerivation, base, scientific }:
      mkDerivation {
@@ -62053,19 +62073,86 @@ self: {
      }) {};
 
   "di" = callPackage
-    ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty
-     , tasty-hunit, tasty-quickcheck, time, transformers
+    ({ mkDerivation, base, df1, di-core, di-df1, di-handle, di-monad
+     , exceptions
      }:
      mkDerivation {
        pname = "di";
-       version = "0.3";
-       sha256 = "1kwkr2lb4vii530sijlrll9nj1k93pixcqk4bn96877bzf5963wj";
-       libraryHaskellDepends = [ base stm time transformers ];
+       version = "1.0";
+       sha256 = "1bsgq1x4xc1nhfx2wkzmhy3hfy11xkdic35x0lxdc282k2iw7f4i";
+       libraryHaskellDepends = [
+         base df1 di-core di-df1 di-handle di-monad exceptions
+       ];
+       homepage = "https://github.com/k0001/di";
+       description = "Typeful hierarchical structured logging using di, mtl and df1";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "di-core" = callPackage
+    ({ mkDerivation, base, containers, exceptions, QuickCheck, stm
+     , tasty, tasty-hunit, tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "di-core";
+       version = "1.0";
+       sha256 = "0slggv1c2q8amznf0j38x12v0f4lhg7z7mr0qaayj6v6pkpp5s6j";
+       libraryHaskellDepends = [ base containers exceptions stm time ];
        testHaskellDepends = [
-         base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck
+         base exceptions QuickCheck stm tasty tasty-hunit tasty-quickcheck
+         time
        ];
        homepage = "https://github.com/k0001/di";
-       description = "Easy, powerful, structured and typeful logging without monad towers";
+       description = "Typeful hierarchical structured logging without monad towers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "di-df1" = callPackage
+    ({ mkDerivation, base, bytestring, df1, di-core, di-handle
+     , di-monad, QuickCheck, stm, tasty, tasty-quickcheck, text, time
+     }:
+     mkDerivation {
+       pname = "di-df1";
+       version = "1.0";
+       sha256 = "07lz6vb4dxa6j3xxlwxv23gps5xv4rimz571h2n95hhldx8n9jnp";
+       libraryHaskellDepends = [
+         base df1 di-core di-handle di-monad stm
+       ];
+       testHaskellDepends = [
+         base bytestring df1 di-core QuickCheck tasty tasty-quickcheck text
+         time
+       ];
+       homepage = "https://github.com/k0001/di";
+       description = "Write logs in the df1 format using the di logging framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "di-handle" = callPackage
+    ({ mkDerivation, base, bytestring, di-core, exceptions, unix }:
+     mkDerivation {
+       pname = "di-handle";
+       version = "1.0";
+       sha256 = "1v4jn1dvvfa6nbqx34hhjg47lbjafkmdps8aalq3n5sah99iy26d";
+       libraryHaskellDepends = [
+         base bytestring di-core exceptions unix
+       ];
+       homepage = "https://github.com/k0001/di";
+       description = "IO support for file handles in di-core";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "di-monad" = callPackage
+    ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes
+     , stm, transformers
+     }:
+     mkDerivation {
+       pname = "di-monad";
+       version = "1.0";
+       sha256 = "1kb2dx4whbl0lp0yb5y7m66ma0qywprzy5zs3msxiqfdbc3ghqvx";
+       libraryHaskellDepends = [
+         base containers di-core exceptions mtl pipes stm transformers
+       ];
+       homepage = "https://github.com/k0001/di";
+       description = "mtl flavoured typeful hierarchical structured logging for di-core";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -84093,8 +84180,8 @@ self: {
      }) {inherit (pkgs) gdk_pixbuf;};
 
   "gi-gdkx11" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gdk-x11
-     , gi-gdk, gi-gio, gi-gobject, gi-xlib, haskell-gi, haskell-gi-base
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk
+     , gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
@@ -84106,13 +84193,13 @@ self: {
          base bytestring containers gi-gdk gi-gio gi-gobject gi-xlib
          haskell-gi haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gdk-x11 ];
+       libraryPkgconfigDepends = [ gtk3 ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GdkX11 bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gdk-x11 = null;};
+     }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-ggit" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -84159,18 +84246,18 @@ self: {
      }) {inherit (pkgs) glib;};
 
   "gi-girepository" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject
-     , gobjectIntrospection, haskell-gi, haskell-gi-base
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-girepository";
-       version = "1.0.15";
-       sha256 = "1g9bvf850zsbqi4dw8i1nbclqwi599zvwny4fsl0hp8lqb9w7ps6";
+       version = "1.0.16";
+       sha256 = "1kb7vyqks6br8z2bjp9wzj0dvh76s35dbx93iijgl138270ikww6";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-gobject haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gobjectIntrospection ];
        doHaddock = false;
@@ -84343,8 +84430,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstvideo";
-       version = "1.0.15";
-       sha256 = "1k35x6cc1kiyhwq978dlckib2sfz7k3w2gxfqsha591a0661k10d";
+       version = "1.0.16";
+       sha256 = "0g6z15di4lk3l6hxpl6yqffw23kya3r2khxs4ah6vmkdn42wcalw";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -84687,8 +84774,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "4.0.18";
-       sha256 = "0qxqsg9p2380z6cyvky8g0a90v1zyf90ff9mmislnzm89fmc8013";
+       version = "4.0.19";
+       sha256 = "1hnxp1vk2qhi7shr4qd7khi2nq0vpn58f1g6j7dkl0h23266fwz2";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
@@ -84711,8 +84798,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
-       version = "4.0.16";
-       sha256 = "010svwg3p3sdd209l8cnwhsm2dp9n6qf0shzqjdx5l1pkjv32zqm";
+       version = "4.0.17";
+       sha256 = "0lpz5a9395bqfmxbhfjfbqi4832a68ybbr1y0c475r8ya6pnx4cq";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-gobject gi-gtk
@@ -109614,8 +109701,8 @@ self: {
        pname = "hquantlib";
        version = "0.0.4.0";
        sha256 = "0x24qkbpclir0ik52hyxw3ahnqk1nqscxpx1ahnxs4w1bv7bkcmp";
-       revision = "1";
-       editedCabalFile = "02wp531cckdgj11sjamyafnij0cri7svrg4ddbvak9yki0xpm286";
+       revision = "2";
+       editedCabalFile = "1wx32kkv1as3rras5b1y3v77abx0sqsam6ssa5s7vm83pncx38y4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126702,24 +126789,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "katydid_0_2_0_1" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, directory
-     , filepath, HUnit, hxt, json, mtl, parsec, regex-tdfa, tasty
-     , tasty-hunit, text
+  "katydid_0_3_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , directory, either, extra, filepath, HUnit, hxt, ilist, json, mtl
+     , parsec, primes, regex-tdfa, tasty, tasty-hunit, text
      }:
      mkDerivation {
        pname = "katydid";
-       version = "0.2.0.1";
-       sha256 = "1m3rclgrjc7f1rirn39w55rw4vlr769kvm0byw53kg2ib95l2nlg";
+       version = "0.3.0.0";
+       sha256 = "1r95yxhrsw0ghv55xlq987yzhly69ihiy4bz6k3k41mfj8d7kj8v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers deepseq hxt json mtl parsec regex-tdfa
+         base bytestring containers deepseq either extra hxt ilist json mtl
+         parsec regex-tdfa text
        ];
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [
-         base containers directory filepath HUnit hxt json mtl parsec tasty
-         tasty-hunit
+         base containers directory filepath HUnit hxt ilist json mtl parsec
+         primes tasty tasty-hunit text
        ];
        benchmarkHaskellDepends = [
          base criterion deepseq directory filepath hxt mtl text
@@ -131551,12 +131639,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lens-labels_0_2_0_0" = callPackage
+  "lens-labels_0_2_0_1" = callPackage
     ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
      mkDerivation {
        pname = "lens-labels";
-       version = "0.2.0.0";
-       sha256 = "137axpd2j7q4k34mav0338spk985ksh760nfv3vsm59aq9ab76xf";
+       version = "0.2.0.1";
+       sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj";
        libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
        homepage = "https://github.com/google/proto-lens#readme";
        description = "Integration of lenses with OverloadedLabels";
@@ -168755,15 +168843,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "proto-lens_0_3_0_0" = callPackage
+  "proto-lens_0_3_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , data-default-class, deepseq, lens-family, lens-labels, parsec
      , pretty, text, transformers, void
      }:
      mkDerivation {
        pname = "proto-lens";
-       version = "0.3.0.0";
-       sha256 = "0skbqawzz58ilpvkdcx1hmpaj67pyjz449qmdrp2scdpdcc1nica";
+       version = "0.3.1.0";
+       sha256 = "1awlp7101vhqf2hhz3h93mf38lyyfx5ay3gvrdna0k3msykimgw7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class deepseq
@@ -168791,14 +168879,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "proto-lens-arbitrary_0_1_2_0" = callPackage
+  "proto-lens-arbitrary_0_1_2_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens-family
      , proto-lens, QuickCheck, text
      }:
      mkDerivation {
        pname = "proto-lens-arbitrary";
-       version = "0.1.2.0";
-       sha256 = "1xkvv822qsi1h99f7xpbprq4j9yf5ykz6bd5lj5jn8626vfq0n67";
+       version = "0.1.2.1";
+       sha256 = "08qwn60pih64lk6xnqwzx3q1qja46pvaw6539r1m4kbw3wyh2kl2";
        libraryHaskellDepends = [
          base bytestring containers lens-family proto-lens QuickCheck text
        ];
@@ -168815,8 +168903,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-combinators";
-       version = "0.1.0.9";
-       sha256 = "1kkns9p2ipq4b3jy1l4lbh9h1m3vvg1l5r6ncqs0ydc2rqy1iasf";
+       version = "0.1.0.10";
+       sha256 = "0yv6wrg3wsp6617mw02n3d9gmlb9nyvfabffrznpvlaywwk8cnir";
        setupHaskellDepends = [ base Cabal proto-lens-protoc ];
        libraryHaskellDepends = [
          base data-default-class lens-family proto-lens-protoc transformers
@@ -168861,14 +168949,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto-lens-optparse_0_1_1_1" = callPackage
+    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
+     mkDerivation {
+       pname = "proto-lens-optparse";
+       version = "0.1.1.1";
+       sha256 = "1zi6kv6af39bbbcf2v7d1l2fc2f3m6r1i2yvv4ddm6w0i7vhd1qw";
+       libraryHaskellDepends = [
+         base optparse-applicative proto-lens text
+       ];
+       homepage = "https://github.com/google/proto-lens#readme";
+       description = "Adapting proto-lens to optparse-applicative ReadMs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-protobuf-types" = callPackage
     ({ mkDerivation, base, Cabal, lens-family, proto-lens
      , proto-lens-protoc, text
      }:
      mkDerivation {
        pname = "proto-lens-protobuf-types";
-       version = "0.3.0.0";
-       sha256 = "1r9pbpapgi8bq938m1fliwbv8cxr18v3a3hbziq33psvas48kwa4";
+       version = "0.3.0.1";
+       sha256 = "0630yl73s11dnfripbz5pa25mzpsnjzd278qcm5yiy6zmcz0a6ca";
        setupHaskellDepends = [ base Cabal proto-lens-protoc ];
        libraryHaskellDepends = [
          base lens-family proto-lens proto-lens-protoc text
@@ -168887,8 +168990,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
-       version = "0.3.0.0";
-       sha256 = "0fh6q3alm8pw32zsg6yrf8b3gf2ww5yqsjax2hmij3y20fl26s79";
+       version = "0.3.1.0";
+       sha256 = "0hihwynqlxhbc7280v7syag0p5php4gdvchbpzvwl54hvcjakgvx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182598,6 +182701,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scientific_0_3_6_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, hashable, integer-gmp, integer-logarithms, primitive
+     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text
+     }:
+     mkDerivation {
+       pname = "scientific";
+       version = "0.3.6.0";
+       sha256 = "1rdwqw2xi1c6305vbxa0sfyl18rjgir7flbdz2pbdvaj3nw44lr4";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq hashable integer-gmp
+         integer-logarithms primitive text
+       ];
+       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
@@ -219066,8 +219194,8 @@ self: {
        pname = "vector-space-points";
        version = "0.2.1.2";
        sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy";
-       revision = "3";
-       editedCabalFile = "07jrxmjw7yzrgkncam4axy3b3j5iha1d632kyd24n805b6p7vym3";
+       revision = "4";
+       editedCabalFile = "1bw8l4nlxsx2nlam9kry60k75vszfx9zxr8zj0mcb3r0r7s178mx";
        libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
        license = stdenv.lib.licenses.bsd3;
-- 
GitLab


From 394d0f2ed947c620213bd75c8c177ef871bf24f0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 May 2018 13:01:03 +0200
Subject: [PATCH 0264/1085] haskell-gi-gdkx11: drop obsolete override

Closes https://github.com/NixOS/nixpkgs/issues/37724.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7dc1145411b..b74515e9e04 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -422,8 +422,9 @@ self: super: {
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
 
+  # The doctest phase fails because it does not have a proper environment in
+  # which to run the commands it's ought to test.
   haskell-gi = dontCheck super.haskell-gi;
-  gi-gdkx11 = super.gi-gdkx11.override { gdk-x11 = pkgs.gtk3; };
 
   # https://github.com/basvandijk/threads/issues/10
   threads = dontCheck super.threads;
-- 
GitLab


From 8b11e30b84f26a92dfc0b54435e121cf31cf7a7a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 May 2018 13:26:42 +0200
Subject: [PATCH 0265/1085] github-backup: jailbreak to fix the build

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b74515e9e04..eea7e175816 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1026,6 +1026,9 @@ self: super: {
   # https://github.com/dmwit/encoding/pull/3
   encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch;
 
+  # Work around overspecified constraint on github ==0.18.
+  github-backup = doJailbreak super.github-backup;
+
 }
 
 //
-- 
GitLab


From d3784373ad0e34daa9f4e3425d69ad997355aecc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 May 2018 14:24:58 +0200
Subject: [PATCH 0266/1085] haskell-dbus-hslogger & status-notifier-item: use
 latest dbus despite lts-11.x

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index eea7e175816..2c16b37bba8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -638,6 +638,8 @@ self: super: {
 
   # Need newer versions of their dependencies than the ones we have in LTS-11.x.
   cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; });
+  dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
+  status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
 
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;
-- 
GitLab


From 3f96895417a8ae9ad13b69b49fa3bb4da8bdddca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:24:52 -0700
Subject: [PATCH 0267/1085] keepass: 2.38 -> 2.39
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/0w1c39pg7347dwhkwz3b5jizzzc5v885-keepass-2.39/bin/.keepass-wrapped --help’ got 0 exit code
- ran ‘/nix/store/0w1c39pg7347dwhkwz3b5jizzzc5v885-keepass-2.39/bin/keepass --help’ got 0 exit code
- found 2.39 with grep in /nix/store/0w1c39pg7347dwhkwz3b5jizzzc5v885-keepass-2.39
- directory tree listing: https://gist.github.com/da7324a17ad7e95a053f6a2655ec07bc
---
 pkgs/applications/misc/keepass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 5e492fc621f..8676ba70858 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -3,11 +3,11 @@
 
 with builtins; buildDotnetPackage rec {
   baseName = "keepass";
-  version = "2.38";
+  version = "2.39";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "0m33gfpvv01xc28k4rrc8llbyk6qanm9rsqcnv8ydms0cr78dbbk";
+    sha256 = "05mrbzlkr2h42cls6xhas76dg8kyic4fijwckrh0b0qv5pp71c11";
   };
 
   sourceRoot = ".";
-- 
GitLab


From d513634e6c590eca232e1ab3828bdf46e882bd6a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 05:59:21 -0700
Subject: [PATCH 0268/1085] avrgcc: 7.3.0 -> 8.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-g++ --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-c++ --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-8.1.0 --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov -h’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-tool -h’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-tool --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-dump -h’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-dump --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-dump help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-cpp --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-ar -h’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-ar --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-nm -h’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-nm --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-ranlib -h’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-ranlib --help’ got 0 exit code
- found 8.1.0 with grep in /nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0
- directory tree listing: https://gist.github.com/bc5f032e2fae6d464814f0d61feb07dd
---
 pkgs/development/misc/avr/gcc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix
index 82497929183..cce11616e2f 100644
--- a/pkgs/development/misc/avr/gcc/default.nix
+++ b/pkgs/development/misc/avr/gcc/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }:
 
 let
-  version = "7.3.0";
+  version = "8.1.0";
 in
 stdenv.mkDerivation {
 
   name = "avr-gcc-${version}";
   src = fetchurl {
     url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
-    sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43";
+    sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x";
   };
 
   patches = [
-- 
GitLab


From 36368d99b78aa0143b8dca55e569e333bd8baae1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 06:01:20 -0700
Subject: [PATCH 0269/1085] abcm2ps: 8.13.20 -> 8.13.21
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/jz4zd20m2cmgcgyixg5xc08y6srqskyv-abcm2ps-8.13.21/bin/abcm2ps -h’ got 0 exit code
- found 8.13.21 with grep in /nix/store/jz4zd20m2cmgcgyixg5xc08y6srqskyv-abcm2ps-8.13.21
- directory tree listing: https://gist.github.com/8743b1d2b794435906fc0d11cbfcb803
---
 pkgs/tools/audio/abcm2ps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index f93231d8022..6d782fdba35 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "abcm2ps-${version}";
-  version = "8.13.20";
+  version = "8.13.21";
 
   src = fetchFromGitHub {
     owner = "leesavide";
     repo = "abcm2ps";
     rev = "v${version}";
-    sha256 = "0zgwrclky6b1l1pd07s31azyxf4clwi3cp5x0wjix0wp78b89pbx";
+    sha256 = "03r98xdw2vdwsi726i0zb7p0ljp3fpzjl1nhzfwz57m3zmqvz6r1";
   };
 
   prePatch = ''
-- 
GitLab


From cabd64a83b047c5769e11218f2b2f3a4db90900c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 06:03:41 -0700
Subject: [PATCH 0270/1085] abcmidi: 2018.04.24 -> 2018.05.02
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/abc2midi -h’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/midi2abc -h’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/midi2abc --help’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/abc2abc -h’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/mftext -h’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/mftext --help’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/mftext help’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/yaps -h’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/abcmatch -h’ got 0 exit code
- directory tree listing: https://gist.github.com/ab3313bb3097bf194e4ac83d6cc0b9bc
---
 pkgs/tools/audio/abcmidi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index ff6a7af03ef..a0e7b1f906c 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "abcMIDI-${version}";
-  version = "2018.04.24";
+  version = "2018.05.02";
 
   src = fetchzip {
     url = "http://ifdo.ca/~seymour/runabc/${name}.zip";
-    sha256 = "02n5xnagj1z44b23zmaxdkmn8nisrb34r8hb5xs7cr1wq7m4fmlh";
+    sha256 = "0pva0kwkwdrq4mfgiz389dhaqv66csqjaddirzxmhvvi6qji5d24";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase
-- 
GitLab


From 084efc26e728ed801283375438b524a3bc5c41a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 7 May 2018 10:07:54 -0300
Subject: [PATCH 0271/1085] iconpack-obsidian: restrict platforms to linux

---
 pkgs/data/icons/iconpack-obsidian/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
index efcaa1cbc53..b033f510f0b 100644
--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
     description = "Gnome Icon Pack based upon Faenza";
     homepage = https://github.com/madmaxms/iconpack-obsidian;
     license = licenses.lgpl3;
-    platforms = platforms.all;
+    # darwin cannot deal with file names differing only in case
+    platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];
   };
 }
-- 
GitLab


From 9fde82e3ff7f1106643d40f21c636309922b6506 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 06:27:02 -0700
Subject: [PATCH 0272/1085] cfr: 0_125 -> 0.128
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/8hlizlz9d6cp6n3w3qx7s0wm2z3d3g8f-cfr-0.128/bin/cfr -h’ got 0 exit code
- ran ‘/nix/store/8hlizlz9d6cp6n3w3qx7s0wm2z3d3g8f-cfr-0.128/bin/cfr --help’ got 0 exit code
- ran ‘/nix/store/8hlizlz9d6cp6n3w3qx7s0wm2z3d3g8f-cfr-0.128/bin/cfr help’ got 0 exit code
- found 0.128 with grep in /nix/store/8hlizlz9d6cp6n3w3qx7s0wm2z3d3g8f-cfr-0.128
- directory tree listing: https://gist.github.com/3d40ccd7bfb3d81eb71e8a9033d1a127
---
 pkgs/development/tools/java/cfr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index c7cc0543976..39677ba719e 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cfr-${version}";
-  version = "0_125";
+  version = "0.128";
 
   src = fetchurl {
     url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
-    sha256 = "1ad9ddg79cybv8j8l3mm67znyw54z5i55x4m9n239fn26p1ndawa";
+    sha256 = "09mx1f6d1p57q5r05nvgm1xrhqv34n7v7rwq875whb441h1dnsix";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From b083a86d745f42faddba24c127c3ce71701c33dc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 06:34:51 -0700
Subject: [PATCH 0273/1085] bzflag: 2.4.12 -> 2.4.14

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.4.14 with grep in /nix/store/z93gp3xa0spbywriag5pg04k2yy8jy3z-bzflag-2.4.14
- directory tree listing: https://gist.github.com/b4b3a993ddc5d7c26bb2c23aad53029c
---
 pkgs/games/bzflag/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index 332e84402bb..e6d23cf1b9f 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.12";
+  version = "2.4.14";
 
   src = fetchurl {
     url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
-    sha256 = "0380y47kgl97ld3dybjgjr2zwxqky8f938k9z7vad647cic3m8d8";
+    sha256 = "1p4vaap8msk7cfqkcc2nrchw7pp4inbyx706zmlwnmpr9k0nx909";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 9167bd48507d4a9e28540e3c105f8d93191d781e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 May 2018 14:44:30 +0100
Subject: [PATCH 0274/1085] mydumper: restrict to linux

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

diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix
index b6c5bfd91fa..e8787855125 100644
--- a/pkgs/tools/backup/mydumper/default.nix
+++ b/pkgs/tools/backup/mydumper/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = ''High-perfomance MySQL backup tool'';
     homepage = https://github.com/maxbube/mydumper;
     license = licenses.gpl3;
-    platforms = platforms.all;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ izorkin ];
   };
 }
-- 
GitLab


From f5249fa04211d7f66ab9c1f4037816b2bfc13ffa Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 7 May 2018 15:39:38 +0200
Subject: [PATCH 0275/1085] grafana: 5.1.0 -> 5.1.1

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index df89e67bffc..bcae836cbf2 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 = "5.1.0";
+  version = "5.1.1";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "1j8l8v5iq1mpvc8j7vbwqqd0xhv9ysl05lxwm524cqljynslaq8f";
+    sha256 = "0b8i293bfxyblfqwxpb1dkgva95f0bljpvp27j4l4hmjm2g8bpd9";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "08wha1n3lqn27pc3bc3sg94y47npy69ydh2ad1rbkmvllnjbwx3z";
+    sha256 = "0kyfyxcj2yy9v1in6h6kh6sl5p7m03g643qpjriplwwa93bdmk8k";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
-- 
GitLab


From 8be7bb656f3131d57e71aed37b46aa263653ba51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Mon, 7 May 2018 17:10:19 +0200
Subject: [PATCH 0276/1085] sublime3: 3162(dev), 3143(stable) -> 3170(stable,
 dev)

---
 pkgs/applications/editors/sublime/3/packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix
index 01445ade473..98cfc03c3d2 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/pkgs/applications/editors/sublime/3/packages.nix
@@ -5,14 +5,14 @@ let
 in
   rec {
     sublime3-dev = common {
-      buildVersion = "3162";
-      x32sha256 = "190il02hqvv64w17w7xc1fz2wkbhk5a5y96jb25dvafmslm46d4i";
-      x64sha256 = "1nsjhjs6zajhx7m3dk7i450krg6pb03zffm1n3m1v0xb9zr37xz3";
+      buildVersion = "3170";
+      x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg";
+      x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx";
     } {};
 
     sublime3 = common {
-      buildVersion = "3143";
-      x32sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i";
-      x64sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw";
+      buildVersion = "3170";
+      x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg";
+      x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx";
     } {};
   }
-- 
GitLab


From 9f1017c67927998fb2ff29ea48f4df43c1b91cee Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Sun, 6 May 2018 09:35:01 -0700
Subject: [PATCH 0277/1085] sit: 0.3.0 -> 0.3.2

---
 .../version-management/sit/default.nix             | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index 84211543c3b..0cc75f8bd5a 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip }:
 
 rustPlatform.buildRustPackage rec {
   name = "sit-${version}";
-  version = "0.3.0";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "sit-it";
     repo = "sit";
     rev = "v${version}";
-    sha256 = "1si4fg02wxi35hpkr58na06h19yjw6qd9c5mbb9xfkkzgz5mnssj";
+    sha256 = "0lhl4rrfmsi76498mg5si2xagl8l2pi5d92dxhsyzszpwn5jdp57";
   };
 
-  cargoSha256 = "083p7z7blj064840ddgnxvqjmih4bmy92clds3qgv5v7lh63wfmn";
+  buildInputs = [ cmake libzip ];
+
+  cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg";
 
   meta = with stdenv.lib; {
     description = "Serverless Information Tracker";
-    homepage = http://sit-it.org/;
+    homepage = https://sit.sh/;
     license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ dywedir ];
+    maintainers = with maintainers; [ dywedir yrashk ];
     platforms = platforms.all;
   };
 }
-- 
GitLab


From 04002e2b7186c166af87c20da7a7ceb8c0edb021 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 7 May 2018 11:01:50 -0500
Subject: [PATCH 0278/1085] tamarin-prover: 1.3.1 -> 1.4.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/tamarin-prover/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index 4461fa675e8..fb37554b65f 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -4,12 +4,12 @@
 }:
 
 let
-  version = "1.3.1";
+  version = "1.4.0";
   src = fetchFromGitHub {
     owner  = "tamarin-prover";
     repo   = "tamarin-prover";
-    rev    = "ab8a155452e9e9c57ccb4bbe1b94d7677ea5ce21";
-    sha256 = "02ycxxkcpc0dzybaq63viciydq1ik8wiv2blk8mvnz3ssxw3sjik";
+    rev    = "7ced07a69f8e93178f9a95797479277a736ae572";
+    sha256 = "02pyw22h90228g6qybjpdvpcm9d5lh96f5qwmy2hv2bylz05z3nn";
   };
 
   # tamarin has its own dependencies, but they're kept inside the repo,
@@ -80,7 +80,7 @@ mkDerivation (common "tamarin-prover" src // {
     wrapProgram $out/bin/tamarin-prover \
       --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]}
     # so that the package can be used as a vim plugin to install syntax coloration
-    install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim 
+    install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim
     install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim
   '';
 
@@ -89,7 +89,7 @@ mkDerivation (common "tamarin-prover" src // {
   executableHaskellDepends = (with haskellPackages; [
     base binary binary-orphans blaze-builder blaze-html bytestring
     cmdargs conduit containers monad-control deepseq directory fclabels file-embed
-    filepath gitrev http-types HUnit lifted-base mtl parsec process
+    filepath gitrev http-types HUnit lifted-base mtl monad-unlift parsec process
     resourcet safe shakespeare tamarin-prover-term
     template-haskell text threads time wai warp yesod-core yesod-static
   ]) ++ [ tamarin-prover-utils
-- 
GitLab


From 046e374c9958969462919d192872606bb9f0ed4a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 5 May 2018 00:11:10 +0200
Subject: [PATCH 0279/1085] virtualisation/qemu-vm.nix: use lib.optionalString

---
 nixos/modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 66ff43c8547..6acaf63c26a 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -23,7 +23,7 @@ let
 
   cfg = config.virtualisation;
 
-  qemuGraphics = if cfg.graphics then "" else "-nographic";
+  qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic";
   kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}";
   ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
 
-- 
GitLab


From 36f4b7f6ba9506a336587c5a528416e948299448 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 5 May 2018 00:12:06 +0200
Subject: [PATCH 0280/1085] virtualisation/qemu-vm.nix: remove ttys

unused.
---
 nixos/modules/virtualisation/qemu-vm.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 6acaf63c26a..5b98f359de0 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -25,7 +25,6 @@ let
 
   qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic";
   kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}";
-  ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
 
   # XXX: This is very ugly and in the future we really should use attribute
   # sets to build ALL of the QEMU flags instead of this mixed mess of Nix
-- 
GitLab


From 70c57fe3638555d3ae1366e26be445d7f67a81e7 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 5 May 2018 13:44:45 +0200
Subject: [PATCH 0281/1085] qemu: fix spaces in postInstall

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

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index dd68eb19380..eee42d2ce1e 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
   postInstall =
     if stdenv.isx86_64       then ''makeWrapper $out/bin/qemu-system-x86_64  $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else if stdenv.isi686    then ''makeWrapper $out/bin/qemu-system-i386    $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
-    else if stdenv.isAarch32     then ''makeWrapper $out/bin/qemu-system-arm     $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+    else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm     $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else "";
 
-- 
GitLab


From d4468bedb52bf03ff125d721634f83604bddd589 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 5 May 2018 13:51:04 +0200
Subject: [PATCH 0282/1085] modules/virtualisation/qemu-vm: always enable
 serial console

Always enable both tty and serial console, but set preferred console
depending on cfg.graphical.
Even in qemu graphical mode, you can switch to the serial console via
Ctrl+Alt+3.

With that being done, you also don't need to specify
`systemd.services."serial-getty@ttyS0".enable = true;` either as described in
https://nixos.wiki/wiki/Cheatsheet#Building_a_service_as_a_VM_.28for_testing.29,
as systemd automatically spawns a getty on consoles passwd via cmdline.

This also means, vms built by 'nixos-rebuild build-vm' can simply be run
properly in nographic mode by appending `-nographic` to `result/bin/run-*-vm`,
without the need to explicitly add platform-specific QEMU_KERNEL_PARAMS.
---
 nixos/modules/virtualisation/qemu-vm.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 5b98f359de0..c788f3ff8ba 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -24,7 +24,11 @@ let
   cfg = config.virtualisation;
 
   qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic";
-  kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}";
+
+  # enable both serial console and tty0. select preferred console (last one) based on cfg.graphics
+  kernelConsoles = let
+    consoles = [ "console=${qemuSerialDevice}" "console=tty0" ];
+    in lib.concatStringsSep " " (if cfg.graphics then consoles else reverseList consoles);
 
   # XXX: This is very ugly and in the future we really should use attribute
   # sets to build ALL of the QEMU flags instead of this mixed mess of Nix
@@ -107,7 +111,7 @@ let
             ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
-            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \
+            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsoles} $QEMU_KERNEL_PARAMS" \
           ''} \
           $extraDisks \
           ${qemuGraphics} \
@@ -247,9 +251,10 @@ in
         default = true;
         description =
           ''
-            Whether to run QEMU with a graphics window, or access
-            the guest computer serial port through the host tty.
-          '';
+            Whether to run QEMU with a graphics window, or in nographic mode.
+            Serial console will be enabled on both settings, but this will
+            change the preferred console.
+            '';
       };
 
     virtualisation.cores =
-- 
GitLab


From 7499e4a5b917227696b7292ae1bd728d6b1978b0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 5 May 2018 14:12:10 +0200
Subject: [PATCH 0283/1085] modules/virtualisation/qemu-vm: set console
 baudrate to 115200

---
 nixos/modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index c788f3ff8ba..f7ec5b088c1 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -27,7 +27,7 @@ let
 
   # enable both serial console and tty0. select preferred console (last one) based on cfg.graphics
   kernelConsoles = let
-    consoles = [ "console=${qemuSerialDevice}" "console=tty0" ];
+    consoles = [ "console=${qemuSerialDevice},115200n8" "console=tty0" ];
     in lib.concatStringsSep " " (if cfg.graphics then consoles else reverseList consoles);
 
   # XXX: This is very ugly and in the future we really should use attribute
-- 
GitLab


From 1bcd9c48fc30b02bc5565f01aaca4d3a9fb5178f Mon Sep 17 00:00:00 2001
From: Risto Helinko <risto.helinko@gmail.com>
Date: Mon, 7 May 2018 20:46:39 +0300
Subject: [PATCH 0284/1085] libu2f-server: 1.0.1 -> 1.1.0

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

diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix
index 5d7da127c2a..6140c13e493 100644
--- a/pkgs/development/libraries/libu2f-server/default.nix
+++ b/pkgs/development/libraries/libu2f-server/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, json_c, openssl, check }:
+{ stdenv, fetchurl, pkgconfig, json_c, openssl, check, file, help2man, which, gengetopt }:
 
 stdenv.mkDerivation rec {
-  name = "libu2f-server-1.0.1";
-
+  name = "libu2f-server-1.1.0";
   src = fetchurl {
     url = "https://developers.yubico.com/libu2f-server/Releases/${name}.tar.xz";
-    sha256 = "0vhzixz1s629qv9dpdj6b7fxfyxnr5j2vx2cq9q6v790a68ga656";
+    sha256 = "0xx296nmmqa57w0v5p2kasl5zr1ms2gh6qi4lhv6xvzbmjp3rkcd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ json_c openssl check ];
+  buildInputs = [ json_c openssl check file help2man which gengetopt ];
 
   meta = with stdenv.lib; {
     homepage = https://developers.yubico.com/libu2f-server/;
-- 
GitLab


From 0b04ed61771d9f4848347d468b73ed581d43f847 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 7 May 2018 12:53:03 -0500
Subject: [PATCH 0285/1085] xidlehook: only fixup on linux

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

diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index a71531eebc5..e5717f7f7d4 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ];
   nativeBuildInputs = [ pkgconfig patchelf ];
 
-  postFixup = ''
+  postFixup = lib.optionalString stdenv.isLinux ''
     RPATH="$(patchelf --print-rpath $out/bin/xidlehook)"
     patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook
   '';
-- 
GitLab


From a55484469259bf6074ce7e4e1c025678c397d6af Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@utzutzutz.net>
Date: Mon, 7 May 2018 19:53:08 +0200
Subject: [PATCH 0286/1085] pythonPackages.phonenumbers: 8.9.3 -> 8.9.5

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

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 47a154a529c..5f1c1b76704 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.9.3";
+  version = "8.9.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "68f7402c6d2646adff4df895471f2b47fd61d0cf57c59a06aacc88dfff04a1cb";
+    sha256 = "09swdf3f9sdvqyyzkap93012m9fnhamizf42d5kzpdjwikvsfx8x";
   };
 
   meta = {
-- 
GitLab


From 4b93f21ced4f648de11a92e2d8c5d9bdfc39d086 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 7 May 2018 19:44:56 +0200
Subject: [PATCH 0287/1085] unixtools: refactor for less redundancy

---
 pkgs/top-level/unix-tools.nix | 216 +++++++++++++++++-----------------
 1 file changed, 105 insertions(+), 111 deletions(-)

diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 26adcda8ee1..6d6e2b2f251 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -11,7 +11,6 @@
 # input, not "procps" which requires Linux.
 
 let
-
   singleBinary = cmd: providers: let
       provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}";
     in runCommand cmd {
@@ -27,8 +26,6 @@ let
       ln -s "${provider}" "$out/bin/${cmd}"
     '';
 
-in rec {
-
   # more is unavailable in darwin
   # just use less
   more_compat = runCommand "more" {} ''
@@ -36,117 +33,114 @@ in rec {
     ln -s ${pkgs.less}/bin/less $out/bin/more
   '';
 
-  # singular binaries
-  arp = singleBinary "arp" {
-    linux = pkgs.nettools;
-    darwin = pkgs.darwin.network_cmds;
-  };
-  col = singleBinary "col" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.text_cmds;
-  };
-  eject = singleBinary "eject" {
-    linux = pkgs.utillinux;
-  };
-  getopt = singleBinary "getopt" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.getopt;
-  };
-  fdisk = singleBinary "fdisk" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.diskdev_cmds;
-  };
-  fsck = singleBinary "fsck" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.diskdev_cmds;
-  };
-  hexdump = singleBinary "hexdump" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.shell_cmds;
-  };
-  hostname = singleBinary "hostname" {
-    linux = pkgs.nettools;
-    darwin = pkgs.darwin.shell_cmds;
-  };
-  ifconfig = singleBinary "ifconfig" {
-    linux = pkgs.nettools;
-    darwin = pkgs.darwin.network_cmds;
-  };
-  logger = singleBinary "logger" {
-    linux = pkgs.utillinux;
-  };
-  more = singleBinary "more" {
-    linux = pkgs.utillinux;
-    darwin = more_compat;
-  };
-  mount = singleBinary "mount" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.diskdev_cmds;
-  };
-  netstat = singleBinary "netstat" {
-    linux = pkgs.nettools;
-    darwin = pkgs.darwin.network_cmds;
-  };
-  ping = singleBinary "ping" {
-    linux = pkgs.iputils;
-    darwin = pkgs.darwin.network_cmds;
+  bins = lib.mapAttrs singleBinary {
+    # singular binaries
+    arp = {
+      linux = pkgs.nettools;
+      darwin = pkgs.darwin.network_cmds;
+    };
+    col = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.text_cmds;
+    };
+    eject = {
+      linux = pkgs.utillinux;
+    };
+    getopt = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.getopt;
+    };
+    fdisk = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.diskdev_cmds;
+    };
+    fsck = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.diskdev_cmds;
+    };
+    hexdump = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.shell_cmds;
+    };
+    hostname = {
+      linux = pkgs.nettools;
+      darwin = pkgs.darwin.shell_cmds;
+    };
+    ifconfig = {
+      linux = pkgs.nettools;
+      darwin = pkgs.darwin.network_cmds;
+    };
+    logger = {
+      linux = pkgs.utillinux;
+    };
+    more = {
+      linux = pkgs.utillinux;
+      darwin = more_compat;
+    };
+    mount = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.diskdev_cmds;
+    };
+    netstat = {
+      linux = pkgs.nettools;
+      darwin = pkgs.darwin.network_cmds;
+    };
+    ping = {
+      linux = pkgs.iputils;
+      darwin = pkgs.darwin.network_cmds;
+    };
+    ps = {
+      linux = pkgs.procps;
+      darwin = pkgs.darwin.ps;
+    };
+    quota = {
+      linux = pkgs.linuxquota;
+      darwin = pkgs.darwin.diskdev_cmds;
+    };
+    route = {
+      linux = pkgs.nettools;
+      darwin = pkgs.darwin.network_cmds;
+    };
+    script = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.shell_cmds;
+    };
+    sysctl = {
+      linux = pkgs.procps;
+      darwin = pkgs.darwin.system_cmds;
+    };
+    top = {
+      linux = pkgs.procps;
+      darwin = pkgs.darwin.top;
+    };
+    umount = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.diskdev_cmds;
+    };
+    whereis = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.shell_cmds;
+    };
+    wall = {
+      linux = pkgs.utillinux;
+    };
+    write = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.basic_cmds;
+    };
   };
-  ps = singleBinary "ps" {
-    linux = pkgs.procps;
-    darwin = pkgs.darwin.ps;
-  };
-  quota = singleBinary "quota" {
-    linux = pkgs.linuxquota;
-    darwin = pkgs.darwin.diskdev_cmds;
-  };
-  route = singleBinary "route" {
-    linux = pkgs.nettools;
-    darwin = pkgs.darwin.network_cmds;
-  };
-  script = singleBinary "script" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.shell_cmds;
-  };
-  sysctl = singleBinary "sysctl" {
-    linux = pkgs.procps;
-    darwin = pkgs.darwin.system_cmds;
-  };
-  top = singleBinary "top" {
-    linux = pkgs.procps;
-    darwin = pkgs.darwin.top;
-  };
-  umount = singleBinary "umount" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.diskdev_cmds;
-  };
-  whereis = singleBinary "whereis" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.shell_cmds;
-  };
-  wall = singleBinary "wall" {
-    linux = pkgs.utillinux;
-  };
-  write = singleBinary "write" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.basic_cmds;
+
+  makeCompat = name': value: buildEnv {
+      name = name' + "-compat";
+      paths = value;
   };
 
   # Compatibility derivations
   # Provided for old usage of these commands.
-
-  procps = buildEnv {
-    name = "procps-compat";
-    paths = [ ps sysctl top ];
-  };
-
-  utillinux = buildEnv {
-    name = "utillinux-compat";
-    paths = [ fsck fdisk getopt hexdump mount
-              script umount whereis write col ];
-  };
-
-  nettools = buildEnv {
-    name = "nettools-compat";
-    paths = [ arp hostname ifconfig netstat route ];
+  compat = with bins; lib.mapAttrs makeCompat {
+    procps = [ ps sysctl top ];
+    utillinux = [ fsck fdisk getopt hexdump mount
+                  script umount whereis write col ];
+    nettools = [ arp hostname ifconfig netstat route ];
   };
-}
+in bins // compat
-- 
GitLab


From ab0d4f26ff6a35df04968dd97e2a79a5fd901cfb Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 7 May 2018 20:16:58 +0200
Subject: [PATCH 0288/1085] unixtools: use 2-space indent

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

diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 6d6e2b2f251..36fba3fbd47 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -131,8 +131,8 @@ let
   };
 
   makeCompat = name': value: buildEnv {
-      name = name' + "-compat";
-      paths = value;
+    name = name' + "-compat";
+    paths = value;
   };
 
   # Compatibility derivations
-- 
GitLab


From 08e8701673a84b800e0960c50f78793a23e635ba Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 24 Mar 2018 17:38:45 +0100
Subject: [PATCH 0289/1085] lib.types: fix loaOf behavior for long lists

Assigning a list of 10 or more elements to an option having the type
`loaOf a` produces a configuration value that is not honoring the
order of the original list. This commit fixes this and a related issue
arising when 10 or more lists are merged into this type of option.
---
 lib/tests/modules.sh                          |  6 ++++
 lib/tests/modules/loaOf-with-long-list.nix    | 19 ++++++++++++
 .../modules/loaOf-with-many-list-merges.nix   | 19 ++++++++++++
 lib/types.nix                                 | 29 +++++++++++++------
 4 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 lib/tests/modules/loaOf-with-long-list.nix
 create mode 100644 lib/tests/modules/loaOf-with-many-list-merges.nix

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index c6b3fd912a9..b83e1eb7d82 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -143,6 +143,12 @@ checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix
 checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
 checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
 
+# Check loaOf with long list.
+checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.nix
+
+# Check loaOf with many merges of lists.
+checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix
+
 cat <<EOF
 ====== module tests ======
 $pass Pass
diff --git a/lib/tests/modules/loaOf-with-long-list.nix b/lib/tests/modules/loaOf-with-long-list.nix
new file mode 100644
index 00000000000..f30903c47e5
--- /dev/null
+++ b/lib/tests/modules/loaOf-with-long-list.nix
@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+
+{
+  options = {
+    loaOfInt = lib.mkOption {
+      type = lib.types.loaOf lib.types.int;
+    };
+
+    result = lib.mkOption {
+      type = lib.types.str;
+    };
+  };
+
+  config = {
+    loaOfInt = [ 1 2 3 4 5 6 7 8 9 10 ];
+
+    result = toString (lib.attrValues config.loaOfInt);
+  };
+}
diff --git a/lib/tests/modules/loaOf-with-many-list-merges.nix b/lib/tests/modules/loaOf-with-many-list-merges.nix
new file mode 100644
index 00000000000..f8f8a8da82b
--- /dev/null
+++ b/lib/tests/modules/loaOf-with-many-list-merges.nix
@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+
+{
+  options = {
+    loaOfInt = lib.mkOption {
+      type = lib.types.loaOf lib.types.int;
+    };
+
+    result = lib.mkOption {
+      type = lib.types.str;
+    };
+  };
+
+  config = {
+    loaOfInt = lib.mkMerge (map lib.singleton [ 1 2 3 4 5 6 7 8 9 10 ]);
+
+    result = toString (lib.attrValues config.loaOfInt);
+  };
+}
diff --git a/lib/types.nix b/lib/types.nix
index 17acb92a944..77271689772 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -280,15 +280,26 @@ rec {
     # List or attribute set of ...
     loaOf = elemType:
       let
-        convertIfList = defIdx: def:
+        convertAllLists = defs:
+          let
+            padWidth = stringLength (toString (length defs));
+            unnamedPrefix = i: "unnamed-" + fixedWidthNumber padWidth i + ".";
+          in
+            imap1 (i: convertIfList (unnamedPrefix i)) defs;
+
+        convertIfList = unnamedPrefix: def:
           if isList def.value then
-            { inherit (def) file;
-              value = listToAttrs (
-                imap1 (elemIdx: elem:
-                  { name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}";
-                    value = elem;
-                  }) def.value);
-            }
+            let
+              padWidth = stringLength (toString (length def.value));
+              unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i;
+            in
+              { inherit (def) file;
+                value = listToAttrs (
+                  imap1 (elemIdx: elem:
+                    { name = elem.name or (unnamed elemIdx);
+                      value = elem;
+                    }) def.value);
+              }
           else
             def;
         listOnly = listOf elemType;
@@ -297,7 +308,7 @@ rec {
         name = "loaOf";
         description = "list or attribute set of ${elemType.description}s";
         check = x: isList x || isAttrs x;
-        merge = loc: defs: attrOnly.merge loc (imap1 convertIfList defs);
+        merge = loc: defs: attrOnly.merge loc (convertAllLists defs);
         getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);
         getSubModules = elemType.getSubModules;
         substSubModules = m: loaOf (elemType.substSubModules m);
-- 
GitLab


From c7577fa1c3aab76f20c5798948f9448c33cb3ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 May 2018 19:11:18 +0100
Subject: [PATCH 0290/1085] mbedtls: remove darwin patch

---
 .../libraries/mbedtls/darwin_dylib.patch      | 28 -------------------
 .../development/libraries/mbedtls/default.nix | 22 +++++++--------
 2 files changed, 11 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/development/libraries/mbedtls/darwin_dylib.patch

diff --git a/pkgs/development/libraries/mbedtls/darwin_dylib.patch b/pkgs/development/libraries/mbedtls/darwin_dylib.patch
deleted file mode 100644
index bc6992d6e77..00000000000
--- a/pkgs/development/libraries/mbedtls/darwin_dylib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/library/Makefile b/library/Makefile
-index 28f9231..ad9cc32 100644
---- a/library/Makefile
-+++ b/library/Makefile
-@@ -103,9 +103,9 @@ libmbedtls.so: libmbedtls.$(SOEXT_TLS)
- 	echo "  LN    $@ -> $<"
- 	ln -sf $< $@
- 
--libmbedtls.dylib: $(OBJS_TLS)
-+libmbedtls.dylib: $(OBJS_TLS) libmbedx509.dylib
- 	echo "  LD    $@"
--	$(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS)
-+	$(CC) -dynamiclib -L. -lmbedcrypto -lmbedx509 $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS)
- 
- libmbedtls.dll: $(OBJS_TLS) libmbedx509.dll
- 	echo "  LD    $@"
-@@ -126,9 +126,9 @@ libmbedx509.so: libmbedx509.$(SOEXT_X509)
- 	echo "  LN    $@ -> $<"
- 	ln -sf $< $@
- 
--libmbedx509.dylib: $(OBJS_X509)
-+libmbedx509.dylib: $(OBJS_X509) libmbedcrypto.dylib
- 	echo "  LD    $@"
--	$(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509)
-+	$(CC) -dynamiclib -L. -lmbedcrypto  $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509)
- 
- libmbedx509.dll: $(OBJS_X509) libmbedcrypto.dll
- 	echo "  LD    $@"
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index bd10824bfa1..74be133b068 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_dylib.patch ];
-
   postPatch = ''
     patchShebangs .
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
@@ -34,15 +32,17 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
-      install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib
-      install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib
-      install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib
-
-      for exe in $out/bin/*; do
-          install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe
-          install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe
-          install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe
-      done
+    install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib
+    install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib
+    install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib
+
+    for exe in $out/bin/*; do
+      if [[ $exe != *.sh ]]; then
+        install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe
+        install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe
+        install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe
+      fi
+    done
   '';
 
   doCheck = true;
-- 
GitLab


From 248b05046222d1bcd2df6ef49769e233df3d21d7 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 7 May 2018 13:38:23 -0500
Subject: [PATCH 0291/1085] xidlehook: fix eavl

---
 pkgs/tools/X11/xidlehook/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index e5717f7f7d4..733a8eb630d 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -1,4 +1,5 @@
-{ lib, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf }:
+{ lib, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf
+, stdenv}:
 
 rustPlatform.buildRustPackage rec {
   name = "xidlehook-${version}";
-- 
GitLab


From 97947e680b63f63a47363224d2615b457cbd5862 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 7 May 2018 20:45:37 +0200
Subject: [PATCH 0292/1085] pgpdump: 0.32 -> 0.33

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

diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix
index 09b5b5f58ca..82bec2486e8 100644
--- a/pkgs/tools/security/pgpdump/default.nix
+++ b/pkgs/tools/security/pgpdump/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "pgpdump-${version}";
-  version = "0.32";
+  version = "0.33";
 
   src = fetchFromGitHub {
     owner = "kazu-yamamoto";
     repo = "pgpdump";
     rev = "v${version}";
-    sha256 = "1ip7q5sgh3nwdqbrzpp6sllkls5kma98kns53yspw1830xi1n8xc";
+    sha256 = "0pi9qdbmcmi58gmljin51ylbi3zkknl8fm26jm67cpl55hvfsn23";
   };
 
   buildInputs = stdenv.lib.optionals supportCompressedPackets [ zlib bzip2 ];
@@ -27,4 +27,3 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ primeos ];
   };
 }
-
-- 
GitLab


From 95928538a5fb206b414fb69206b6363365b09aa6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 May 2018 12:33:38 +0200
Subject: [PATCH 0293/1085] pythonPackages.aiohue: init at 1.3.1

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

diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix
new file mode 100644
index 00000000000..0211fef1606
--- /dev/null
+++ b/pkgs/development/python-modules/aiohue/default.nix
@@ -0,0 +1,19 @@
+{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp }:
+
+buildPythonPackage rec {
+  pname = "aiohue";
+  version = "1.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05b2fj8pzbij8hglx6p5ckfx0h1b7wcfpys306l853vp56d882yh";
+  };
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  meta = with lib; {
+    description = "asyncio package to talk to Philips Hue";
+    homepage = https://github.com/balloob/aiohue;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 75cf7561ab6..69cdef2c907 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18253,6 +18253,8 @@ EOF
   h11 = callPackage ../development/python-modules/h11 { };
 
   python-docx = callPackage ../development/python-modules/python-docx { };
+
+  aiohue = callPackage ../development/python-modules/aiohue { };
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From c7d735a27bc187d3e375a680680424f077162add Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 May 2018 12:34:29 +0200
Subject: [PATCH 0294/1085] pythonPackages.PyMVGLive: init at 1.1.4

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

diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix
new file mode 100644
index 00000000000..1263c498a46
--- /dev/null
+++ b/pkgs/development/python-modules/pymvglive/default.nix
@@ -0,0 +1,19 @@
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+
+buildPythonPackage rec {
+  pname = "PyMVGLive";
+  version = "1.1.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0sh4xm74im9qxzpbrlc5h1vnpgvpybnpvdcav1iws0b561zdr08c";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  meta = with lib; {
+    description = "get live-data from mvg-live.de";
+    homepage = https://github.com/pc-coholic/PyMVGLive;
+    license = licenses.free;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 69cdef2c907..0a8b65e42a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18255,6 +18255,8 @@ EOF
   python-docx = callPackage ../development/python-modules/python-docx { };
 
   aiohue = callPackage ../development/python-modules/aiohue { };
+
+  PyMVGLive = callPackage ../development/python-modules/pymvglive { };
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From 509a340d901228667cc8484d29319dfaee59ddf1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 May 2018 12:35:16 +0200
Subject: [PATCH 0295/1085] pythonPackages.coinmarketcap: init at 4.2.1

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

diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix
new file mode 100644
index 00000000000..52afdee46ab
--- /dev/null
+++ b/pkgs/development/python-modules/coinmarketcap/default.nix
@@ -0,0 +1,19 @@
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests-cache }:
+
+buildPythonPackage rec {
+  pname = "coinmarketcap";
+  version = "4.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bk530cmfqri84m9386ydn3f89gq23nxylvnl523gr5589vw54bj";
+  };
+
+  propagatedBuildInputs = [ requests-cache ];
+
+  meta = with lib; {
+    description = "A python wrapper around the https://coinmarketcap.com API.";
+    homepage = https://github.com/barnumbirr/coinmarketcap;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0a8b65e42a5..034622e213b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18257,6 +18257,8 @@ EOF
   aiohue = callPackage ../development/python-modules/aiohue { };
 
   PyMVGLive = callPackage ../development/python-modules/pymvglive { };
+
+  coinmarketcap = callPackage ../development/python-modules/coinmarketcap { };
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From 11ad51893516dbc284a5eb5958f12de9b2230b84 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 May 2018 12:35:40 +0200
Subject: [PATCH 0296/1085] pythonPackages.pyowm: init at 2.8.0

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

diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix
new file mode 100644
index 00000000000..26606a580a4
--- /dev/null
+++ b/pkgs/development/python-modules/pyowm/default.nix
@@ -0,0 +1,19 @@
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+
+buildPythonPackage rec {
+  pname = "pyowm";
+  version = "2.8.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0y2r322pcamabar70513pbyiq26x33l1aq9cim6k30lk9p4aq310";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  meta = with lib; {
+    description = "A Python wrapper around the OpenWeatherMap web API";
+    homepage = https://pyowm.readthedocs.io/;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 034622e213b..7868f7d7ff0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18259,6 +18259,8 @@ EOF
   PyMVGLive = callPackage ../development/python-modules/pymvglive { };
 
   coinmarketcap = callPackage ../development/python-modules/coinmarketcap { };
+
+  pyowm = callPackage ../development/python-modules/pyowm { };
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From 1a7a886234b4cf638c0d6ebd42016333edffb428 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 May 2018 12:36:03 +0200
Subject: [PATCH 0297/1085] home-assistant: use new python modules for
 components

---
 pkgs/servers/home-assistant/component-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 3e95b41fb7e..6e0e216488d 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -116,7 +116,7 @@
     "homematic" = ps: with ps; [ pyhomematic ];
     "homematicip_cloud" = ps: with ps; [  ];
     "http" = ps: with ps; [ aiohttp-cors ];
-    "hue" = ps: with ps; [  ];
+    "hue" = ps: with ps; [ aiohue ];
     "ifttt" = ps: with ps; [  ];
     "ihc" = ps: with ps; [  ];
     "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ];
@@ -285,7 +285,7 @@
     "sensor.bme680" = ps: with ps; [  ];
     "sensor.broadlink" = ps: with ps; [  ];
     "sensor.buienradar" = ps: with ps; [  ];
-    "sensor.coinmarketcap" = ps: with ps; [  ];
+    "sensor.coinmarketcap" = ps: with ps; [ coinmarketcap ];
     "sensor.cpuspeed" = ps: with ps; [  ];
     "sensor.crimereports" = ps: with ps; [  ];
     "sensor.cups" = ps: with ps; [ pycups ];
@@ -335,12 +335,12 @@
     "sensor.miflora" = ps: with ps; [  ];
     "sensor.modem_callerid" = ps: with ps; [  ];
     "sensor.mopar" = ps: with ps; [  ];
-    "sensor.mvglive" = ps: with ps; [  ];
+    "sensor.mvglive" = ps: with ps; [ PyMVGLive ];
     "sensor.nederlandse_spoorwegen" = ps: with ps; [  ];
     "sensor.neurio_energy" = ps: with ps; [  ];
     "sensor.nut" = ps: with ps; [  ];
     "sensor.openevse" = ps: with ps; [  ];
-    "sensor.openweathermap" = ps: with ps; [  ];
+    "sensor.openweathermap" = ps: with ps; [ pyowm ];
     "sensor.otp" = ps: with ps; [  ];
     "sensor.plex" = ps: with ps; [  ];
     "sensor.pocketcasts" = ps: with ps; [  ];
@@ -453,7 +453,7 @@
     "weather.buienradar" = ps: with ps; [  ];
     "weather.darksky" = ps: with ps; [  ];
     "weather.metoffice" = ps: with ps; [  ];
-    "weather.openweathermap" = ps: with ps; [  ];
+    "weather.openweathermap" = ps: with ps; [ pyowm ];
     "weather.yweather" = ps: with ps; [ yahooweather ];
     "wemo" = ps: with ps; [  ];
     "wink" = ps: with ps; [  ];
-- 
GitLab


From b0d70d336dd769bf06ff336882faabe5cebf2343 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 7 May 2018 21:48:08 +0200
Subject: [PATCH 0298/1085] iml: use openblas instead of atlas

---
 pkgs/development/libraries/iml/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix
index 4af2bba9160..b55d13ecc3f 100644
--- a/pkgs/development/libraries/iml/default.nix
+++ b/pkgs/development/libraries/iml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gmp, atlas}:
+{stdenv, autoreconfHook, fetchurl, gmp, openblas}:
 stdenv.mkDerivation rec {
   name = "iml-${version}";
   version = "1.0.5";
@@ -6,8 +6,18 @@ stdenv.mkDerivation rec {
     url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2";
     sha256 = "0akwhhz9b40bz6lrfxpamp7r7wkk48p455qbn04mfnl9a1l6db8x";
   };
-  buildInputs = [gmp atlas];
-  configureFlags = "--with-gmp-include=${gmp.dev}/include --with-gmp-lib=${gmp}/lib";
+  buildInputs = [
+    gmp
+    openblas
+  ];
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+  configureFlags = [
+    "--with-gmp-include=${gmp.dev}/include"
+    "--with-gmp-lib=${gmp}/lib"
+    "--with-cblas=-lopenblas"
+  ];
   meta = {
     inherit version;
     description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers'';
-- 
GitLab


From fcfecf8c2009d6dd67bed14e82fbbc44a1bd8a17 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 7 May 2018 21:47:26 +0200
Subject: [PATCH 0299/1085] =?UTF-8?q?telepathy-logger:=200.8.0=20=E2=86=92?=
 =?UTF-8?q?=200.8.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The previous update attempt (76f9a4d7111a362035ee741cd08ea22a27bbd6bc) did not change the hash 😞
---
 .../networking/instant-messengers/telepathy/logger/default.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index f1b3c55d14c..1791a7ff1dd 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
-    sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
+    sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 4ee409a59c106a63697b82f8f2c7e2df45a748f7 Mon Sep 17 00:00:00 2001
From: Roland Koebler <rk@simple-is-better.org>
Date: Mon, 7 May 2018 22:25:14 +0200
Subject: [PATCH 0300/1085] i3lock/i3lock-color: meta: improve description

- i3lock-color: extend description to differ from i3lock
- i3lock/i3lock-color: add long description
---
 .../window-managers/i3/lock-color.nix         | 25 +++++++++++++++++--
 pkgs/applications/window-managers/i3/lock.nix |  5 ++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 66a6af2fbb0..ea1f1bda9f1 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -27,8 +27,29 @@ stdenv.mkDerivation rec {
     mv $out/bin/i3lock $out/bin/i3lock-color
   '';
   meta = with stdenv.lib; {
-    description = "A simple screen locker like slock";
-    homepage = https://i3wm.org/i3lock/;
+    description = "A simple screen locker like slock, enhanced version with extra configuration options";
+    longDescription = ''
+      Simple screen locker. After locking, a colored background (default: white) or
+      a configurable image is shown, and a ring-shaped unlock-indicator gives feedback
+      for every keystroke. After entering your password, the screen is unlocked again.
+
+      i3lock-color is forked from i3lock (https://i3wm.org/i3lock/) with the following
+      enhancements / additional configuration options:
+
+      - indicator:
+        - shape: ring or bar
+        - size: configurable
+        - all colors: configurable
+        - all texts: configurable
+        - visibility: can be always visible, can be restricted to some screens
+
+      - background: optionally show a blurred screen instead of a single color
+
+      - more information: show text at configurable positions:
+        - clock: time/date with configurable format
+        - keyboard-layout
+    '';
+    homepage = http://github.com/PandorasFox/i3lock-color;
     maintainers = with maintainers; [ garbas malyn ];
     license = licenses.bsd3;
 
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 4d572e8c040..d4bb3cdc1c2 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A simple screen locker like slock";
+    longDescription = ''
+      Simple screen locker. After locking, a colored background (default: white) or
+      a configurable image is shown, and a ring-shaped unlock-indicator gives feedback
+      for every keystroke. After entering your password, the screen is unlocked again.
+    '';
     homepage = https://i3wm.org/i3lock/;
     maintainers = with maintainers; [ garbas malyn domenkozar ];
     license = licenses.bsd3;
-- 
GitLab


From 783d547bddf66070b3a33b1fd4b972d945e5942c Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Mon, 7 May 2018 13:33:51 -0700
Subject: [PATCH 0301/1085] sit: fix tests on aarch64

As we found out in #40032, sit tests won't pass on
aarch64. The problem seems to be related to
`create_dir` not returning an error if the directory
already exists, happening specifically on aarch64+debug
(not aarch64+release)

This update injects a patch for tests that will also
be included in subsequent versions of SIT.
---
 .../version-management/sit/aarch64-eexist.patch | 17 +++++++++++++++++
 .../version-management/sit/default.nix          |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/version-management/sit/aarch64-eexist.patch

diff --git a/pkgs/applications/version-management/sit/aarch64-eexist.patch b/pkgs/applications/version-management/sit/aarch64-eexist.patch
new file mode 100644
index 00000000000..8b45e77d040
--- /dev/null
+++ b/pkgs/applications/version-management/sit/aarch64-eexist.patch
@@ -0,0 +1,17 @@
+diff --git a/sit-core/src/repository.rs b/sit-core/src/repository.rs
+index ebd357d..074dcc9 100644
+--- a/sit-core/src/repository.rs
++++ b/sit-core/src/repository.rs
+@@ -305,6 +305,12 @@ impl Repository {
+         let id: String = name.into();
+         let mut path = self.items_path.clone();
+         path.push(&id);
++        #[cfg(all(debug_assertions, target_arch = "aarch64"))] {
++          use std::io;
++          if path.is_dir() {
++             return Err(io::Error::from_raw_os_error(17).into()); // 17 is EEXIST
++          }
++        }
+         fs::create_dir(path)?;
+         let id = OsString::from(id);
+         Ok(Item {
diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index 0cc75f8bd5a..ae84add283e 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -15,6 +15,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg";
 
+  patches = [ ./aarch64-eexist.patch ];
+
   meta = with stdenv.lib; {
     description = "Serverless Information Tracker";
     homepage = https://sit.sh/;
-- 
GitLab


From 810976e5912771722ee0331d59c5451c914da44a Mon Sep 17 00:00:00 2001
From: Roland Koebler <rk@simple-is-better.org>
Date: Mon, 7 May 2018 23:19:02 +0200
Subject: [PATCH 0302/1085] i3lock-color: fix manpage-name and manpage (#40095)

- rename manpage from i3lock.1 to i3lock-color.1
- change "i3lock" to "i3lock-color" in manpage-synopsis
---
 pkgs/applications/window-managers/i3/lock-color.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 66a6af2fbb0..b7545d5cd1c 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
   installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man";
   postInstall = ''
     mv $out/bin/i3lock $out/bin/i3lock-color
+    mv $out/share/man/man1/i3lock.1 $out/share/man/man1/i3lock-color.1
+    sed -i 's/\(^\|\s\|"\)i3lock\(\s\|$\)/\1i3lock-color\2/g' $out/share/man/man1/i3lock-color.1
   '';
   meta = with stdenv.lib; {
     description = "A simple screen locker like slock";
-- 
GitLab


From ec198337c4d50e4bd94e84db6bc886d375761564 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 7 May 2018 23:57:48 +0200
Subject: [PATCH 0303/1085] love_11: init at 11.1

---
 pkgs/development/interpreters/love/11.1.nix | 41 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/interpreters/love/11.1.nix

diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix
new file mode 100644
index 00000000000..e92a84b40b8
--- /dev/null
+++ b/pkgs/development/interpreters/love/11.1.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit,
+  libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
+  libtheora, which, autoconf, automake, libtool
+}:
+
+let
+  pname = "love";
+  version = "11.1";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  src = fetchFromBitbucket {
+    owner = "rude";
+    repo = "love";
+    rev = "${version}";
+    sha256 = "16jn6klbsz8qi2wn3llbr7ri5arlc0b19la19ypzk6p7v20z4sfr";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123
+    libvorbis libogg libtheora autoconf which libtool automake
+  ];
+
+  preConfigure = "$shell ./platform/unix/automagic";
+
+  configureFlags = [
+    "--with-lua=luajit"
+  ];
+
+  NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
+
+  meta = {
+    homepage = http://love2d.org;
+    description = "A Lua-based 2D game engine/scripting language";
+    license = stdenv.lib.licenses.zlib;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35daa86a615..3d0b125b8a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7115,6 +7115,7 @@ with pkgs;
   love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; };
   love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
   love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };
+  love_11 = callPackage ../development/interpreters/love/11.1.nix { };
   love = love_0_10;
 
   ### LUA MODULES
-- 
GitLab


From b45fa92de64c4df29587e78ccbeb69052d032596 Mon Sep 17 00:00:00 2001
From: Roland Koebler <rk@simple-is-better.org>
Date: Tue, 8 May 2018 00:39:38 +0200
Subject: [PATCH 0304/1085] ext4magic: init at 0.3.2

---
 maintainers/maintainer-list.nix              |  5 +++
 pkgs/tools/filesystems/ext4magic/default.nix | 39 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/tools/filesystems/ext4magic/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9369a76688c..91db07f4795 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3144,6 +3144,11 @@
     github = "rittelle";
     name = "Lennart Rittel";
   };
+  rkoe = {
+    email = "rk@simple-is-better.org";
+    github = "rkoe";
+    name = "Roland Koebler";
+  };
   rlupton20 = {
     email = "richard.lupton@gmail.com";
     github = "rlupton20";
diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix
new file mode 100644
index 00000000000..0211ab63b3e
--- /dev/null
+++ b/pkgs/tools/filesystems/ext4magic/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, fetchpatch, file, libuuid, e2fsprogs, zlib, bzip2 }:
+
+stdenv.mkDerivation rec {
+  version = "0.3.2";
+  name = "ext4magic-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ext4magic/${name}.tar.gz";
+    sha256 = "8d9c6a594f212aecf4eb5410d277caeaea3adc03d35378257dfd017ef20ea115";
+  };
+
+  patches = [
+    (fetchpatch {
+        url = https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch;
+        sha256 = "1accydd8kigid68yir2fbihm3r3x8ws3iyznp25snkx41w6y6x8c";
+    })
+  ];
+
+  buildInputs = [ file libuuid e2fsprogs zlib bzip2 ];
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Recover / undelete files from ext3 or ext4 partitions";
+    longDescription = ''
+      ext4magic can recover/undelete files from ext3 or ext4 partitions
+      by retrieving file-information from the filesystem journal.
+
+      If the information in the journal are sufficient, ext4magic can
+      recover the most file types, with original filename, owner and group,
+      file mode bits and also the old atime/mtime stamps. 
+
+      It's much more effective and works much better than extundelete.
+    '';
+    homepage = http://ext4magic.sourceforge.net/ext4magic_en.html;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.rkoe ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fb532e14c4..8f8184075a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2209,6 +2209,8 @@ with pkgs;
 
   exiftool = perlPackages.ImageExifTool;
 
+  ext4magic = callPackage ../tools/filesystems/ext4magic { };
+
   extundelete = callPackage ../tools/filesystems/extundelete { };
 
   expect = callPackage ../tools/misc/expect { };
-- 
GitLab


From 480d52ebed1c80e3eff8e8dc6ddb2a402bf3d102 Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Mon, 7 May 2018 16:18:22 -0700
Subject: [PATCH 0305/1085] sit: better fix for aarch64 bug

---
 .../version-management/sit/aarch64-eexist.patch | 17 -----------------
 .../version-management/sit/aarch64-isel.patch   |  9 +++++++++
 .../version-management/sit/default.nix          |  2 +-
 3 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/applications/version-management/sit/aarch64-eexist.patch
 create mode 100644 pkgs/applications/version-management/sit/aarch64-isel.patch

diff --git a/pkgs/applications/version-management/sit/aarch64-eexist.patch b/pkgs/applications/version-management/sit/aarch64-eexist.patch
deleted file mode 100644
index 8b45e77d040..00000000000
--- a/pkgs/applications/version-management/sit/aarch64-eexist.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/sit-core/src/repository.rs b/sit-core/src/repository.rs
-index ebd357d..074dcc9 100644
---- a/sit-core/src/repository.rs
-+++ b/sit-core/src/repository.rs
-@@ -305,6 +305,12 @@ impl Repository {
-         let id: String = name.into();
-         let mut path = self.items_path.clone();
-         path.push(&id);
-+        #[cfg(all(debug_assertions, target_arch = "aarch64"))] {
-+          use std::io;
-+          if path.is_dir() {
-+             return Err(io::Error::from_raw_os_error(17).into()); // 17 is EEXIST
-+          }
-+        }
-         fs::create_dir(path)?;
-         let id = OsString::from(id);
-         Ok(Item {
diff --git a/pkgs/applications/version-management/sit/aarch64-isel.patch b/pkgs/applications/version-management/sit/aarch64-isel.patch
new file mode 100644
index 00000000000..411922cfd8e
--- /dev/null
+++ b/pkgs/applications/version-management/sit/aarch64-isel.patch
@@ -0,0 +1,9 @@
+diff --git a/.cargo/config b/.cargo/config
+new file mode 100644
+index 0000000..15e7649
+--- /dev/null
++++ b/.cargo/config
+@@ -0,0 +1,3 @@
++# https://github.com/rust-lang/rust/issues/50516
++[target.'cfg(all(debug_assertions, target_arch = "aarch64"))']
++rustflags = ["-C", "llvm-args=-fast-isel"]
diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index ae84add283e..e189241531d 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg";
 
-  patches = [ ./aarch64-eexist.patch ];
+  patches = [ ./aarch64-isel.patch ];
 
   meta = with stdenv.lib; {
     description = "Serverless Information Tracker";
-- 
GitLab


From 8b5ecf9141ded0e10e33537b17bb48b01669fbc4 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 24 Apr 2018 23:30:27 +0200
Subject: [PATCH 0306/1085] brial: init at 1.2.3

---
 .../libraries/science/math/brial/default.nix  | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/brial/default.nix

diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
new file mode 100644
index 00000000000..0c0332f1366
--- /dev/null
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -0,0 +1,46 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkgconfig
+, boost
+, m4ri
+, gd
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.2.3";
+  name = "brial-${version}";
+
+  src = fetchFromGitHub {
+    owner = "BRiAl";
+    repo = "BRiAl";
+    rev = version;
+    sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg";
+  };
+
+  # FIXME package boost-test and enable checks
+  doCheck = false;
+
+  configureFlags = [
+    "--with-boost-unit-test-framework=no"
+  ];
+
+  buildInputs = [
+    boost
+    m4ri
+    gd
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkgconfig
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/BRiAl/BRiAl;
+    description = "Legacy version of PolyBoRi maintained by sagemath developers";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ timokau ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9199f7af2f8..442c4b21d68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19947,6 +19947,8 @@ with pkgs;
 
   blas = callPackage ../development/libraries/science/math/blas { };
 
+  brial = callPackage ../development/libraries/science/math/brial { };
+
   clblas = callPackage ../development/libraries/science/math/clblas {
     inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL;
   };
-- 
GitLab


From 16463d728b81f159e3b5f4eaae241841b227d86f Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Tue, 8 May 2018 01:00:36 +0200
Subject: [PATCH 0307/1085] zoom-us: liblgvnd fix for libGL.so in libpath

---
 .../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 db32dd0c23e..692a4362935 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, makeDesktopItem,
   alsaLib, dbus, glib, fontconfig, freetype, libpulseaudio,
-  utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps }:
+  utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps, libGL }:
 
 let
 
@@ -24,6 +24,7 @@ in stdenv.mkDerivation {
     expat
     glib
     freetype
+    libGL
     libpulseaudio
     zlib
     dbus
-- 
GitLab


From 302c4c5f2da82794f2f7fb217a1b977897f852fa Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 7 May 2018 19:53:56 -0400
Subject: [PATCH 0308/1085] stdenv: Put back isArm, with deprecation notice.

This was always meant to be deprecated rather than removed.
---
 pkgs/stdenv/generic/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 190fc500068..e9ae54811a2 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -118,6 +118,7 @@ let
       inherit (hostPlatform)
         isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD
         isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian;
+      isArm = builtins.trace "stdenv.isArm is deprecated after 18.03" hostPlatform.isArm;
 
       # Whether we should run paxctl to pax-mark binaries.
       needsPax = isLinux;
-- 
GitLab


From 3e7bcb69377fdb18cf283c9c18b884536a1326bb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:34:14 +0200
Subject: [PATCH 0309/1085] =?UTF-8?q?meld:=203.18.0=20=E2=86=92=203.18.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index e3cafe6b646..f6816ec1548 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -5,14 +5,14 @@
 
 let
   pname = "meld";
-  version = "3.18.0";
+  version = "3.18.1";
   inherit (python3Packages) python buildPythonApplication pycairo pygobject3;
 in buildPythonApplication rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4";
+    sha256 = "0yg8i1ff3rsavsaxbnd6dxmfsiyv49kk8rv5wqnyhf2zmfp8rxis";
   };
 
   buildInputs = [
-- 
GitLab


From 9ad901ae1f4c7e9bb9aedf497b1a904dd960359e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:34:36 +0200
Subject: [PATCH 0310/1085] =?UTF-8?q?gnome3.bijiben:=203.28.1=20=E2=86=92?=
 =?UTF-8?q?=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/bijiben/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
index 93a2c41caf3..5ed4b487bdd 100644
--- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
@@ -5,13 +5,13 @@
 , gnome3, libxml2 }:
 
 let
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "bijiben-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0ivx3hbpg7qaqzpbbn06lz9w3q285vhwgfr353b14bg0nsidwy17";
+    sha256 = "1z1dqspjpyym27yav7pr813x7k0jdxifgj5rdxgp4m6cs1ixcvjs";
   };
 
   doCheck = true;
-- 
GitLab


From 715adbfad3e2c8d5638bbf8d4f747936f8cf9502 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:34:50 +0200
Subject: [PATCH 0311/1085] =?UTF-8?q?evolution:=203.28.1=20=E2=86=92=203.2?=
 =?UTF-8?q?8.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index d7def6e2709..4470f11597e 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -5,13 +5,13 @@
 , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
 
 let
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "evolution-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l";
+    sha256 = "0lx9amjxmfnwc0089griyxms9prmb78wfnfvdsvli8yw1cns4i74";
   };
 
   propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];
-- 
GitLab


From cafac77e205abebc42dec80eafe9a021116b7236 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:35:09 +0200
Subject: [PATCH 0312/1085] =?UTF-8?q?gnome3.gnome-boxes:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.28.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 8921d70787c..0ba4199630a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -9,13 +9,13 @@
 # TODO: ovirt (optional)
 
 let
-  version = "3.28.2";
+  version = "3.28.3";
 in stdenv.mkDerivation rec {
   name = "gnome-boxes-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0xss6wrs4hkmr0aa9qxr9b6wxbygrkjz4p0c4xnymicq97jnwra1";
+    sha256 = "05x9c7w60cafcd3bdkr68ra8pbh7m8pciw67871hckaqafw76q1d";
   };
 
   doCheck = true;
-- 
GitLab


From df8665d04e81be9434a0887f38c563b5f5e4066f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:35:29 +0200
Subject: [PATCH 0313/1085] =?UTF-8?q?gnome3.gnome-calendar:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index b88bad2f649..347cd7a16ae 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "gnome-calendar";
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1jacznnjql5jgzvzcp5kh2k0cd0y41cri6qz2bsakpllf7adbrq6";
+    sha256 = "0x6wxngf8fkwgbl6x7rzp0srrb43rm55klpb2vfjk2hahpbjvxyw";
   };
 
   passthru = {
-- 
GitLab


From 2a5ce6157af7192bce259c4d2d088aab1c86401d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:35:43 +0200
Subject: [PATCH 0314/1085] =?UTF-8?q?gnome3.gnome-characters:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 1587fec2c69..b07417ecc35 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-characters-${version}";
-  version = "3.28.0";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "14q92ysg7krawxlwv6ymgsxz2plk81wgfz6knlma7lm13jsczmf0";
+    sha256 = "04nmn23iw65wsczx1l6fa4jfdsv65klb511p39zj1pgwyisgj5l0";
   };
 
   postPatch = ''
-- 
GitLab


From 048de32f28baff1e0defd5c27370dbb56559ea04 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:35:52 +0200
Subject: [PATCH 0315/1085] =?UTF-8?q?gnome3.gnome-logs:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index c184bcbb42d..614308f7b63 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-logs-${version}";
-  version = "3.28.0";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0j3wkbz7c2snmx4kjmh767175nf2lqxx2p8b8xa2qslknxc3gq6b";
+    sha256 = "0qqmw55rrxdz2n9xwn85nm7j9y9i85fxlxjfgv683mbpdyv0gbg0";
   };
 
   configureFlags = [ "--disable-tests" ];
-- 
GitLab


From 2415bdc78e04068fc79a54d2bf694b761061b2f9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:36:02 +0200
Subject: [PATCH 0316/1085] =?UTF-8?q?gnome3.gnome-maps:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index b5c8188bd06..cade274e69a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "gnome-maps";
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "19xx1v25ycr8ih4jwb1vc662jcx6kynaf7baj4i569ccrcwaj2d5";
+    sha256 = "1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7";
   };
 
   doCheck = true;
-- 
GitLab


From 47d29c502f00afc6949baaa22e537fda7ef0c1e8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:36:10 +0200
Subject: [PATCH 0317/1085] =?UTF-8?q?gnome3.gnome-music:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index c2d5045e79e..9aa8eee0bca 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "3.28.1";
+  version = "3.28.2";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
-    sha256 = "0xbwndfl72292dx4x99vm0iyrcy8xw2i5fhsch7b073rk4ydbyfx";
+    sha256 = "0xkbw9cp002vwwq6vlsbkahz9xbwpkyydd9cvh7az379sdlz4rid";
   };
 
   nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];
-- 
GitLab


From ffda669690e5b91ba55cc2ce5803a3dcb46c539c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:36:21 +0200
Subject: [PATCH 0318/1085] =?UTF-8?q?gnome3.eog:=203.28.1=20=E2=86=92=203.?=
 =?UTF-8?q?28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/eog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 85587d11178..7f7a533a550 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "eog";
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1v3s4x4xdmfa488drwvxfps33jiyh3qz9z8v8s3779n1jn92rmbq";
+    sha256 = "1gasrfqi7qrzdq1idh29r0n6ikkqjb6pbp7a8k5krfz5hkhyfin0";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ];
-- 
GitLab


From 44e49b9e450f9b532f59cc75d9969e731ad7a37d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:36:37 +0200
Subject: [PATCH 0319/1085] =?UTF-8?q?evolution-data-server:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 2e87c4a44a1..a9516206859 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "evolution-data-server-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "12b9lfgwd57rzn9394xrbvl9ym5aqldpz9v7c9a421dsv8dgq13b";
+    sha256 = "1azk8zh167a6hyxzz73yh36gbpf7i52b7zi10hnnnsywh80pj6jk";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 6353a952ceae4785e879d5614a92121d4987452a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:36:57 +0200
Subject: [PATCH 0320/1085] =?UTF-8?q?gnome3.gjs:=201.52.2=20=E2=86=92=201.?=
 =?UTF-8?q?52.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gjs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index fc352de2acf..1bf640f713f 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gjs-${version}";
-  version = "1.52.2";
+  version = "1.52.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "00x08ypx61i3k84bmvkhdj37q81g79lzm5sxqm1lz4xzzad9rg98";
+    sha256 = "1z4n15wdz6pbqd2hfzrqc8mmprhv50v4jk43p08v0xv07yldh8ff";
   };
 
   passthru = {
-- 
GitLab


From 6465aaac0640f88d1fe0d9aa56543381e118769d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:37:17 +0200
Subject: [PATCH 0321/1085] =?UTF-8?q?gnome3.gnome-contacts:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index c8636cb1dc1..5799e613d5b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -5,13 +5,13 @@
 , vala, meson, ninja }:
 
 let
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "gnome-contacts-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "17iinxqf221kk9yppv3yhg0m7jxk5zvwxmdf3hjygf9xgfw7z3zi";
+    sha256 = "1ilgmvgprn1slzmrzbs0zwgbzxp04rn5ycqd9c8zfvyh6zzwwr8w";
   };
 
   propagatedUserEnvPkgs = [ evolution-data-server ];
-- 
GitLab


From fef1129d4e648d7beebff3bcc7fc00d37e798fb6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:37:35 +0200
Subject: [PATCH 0322/1085] =?UTF-8?q?gnome3.gnome-keyring:=203.28.0.2=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index 740748631ee..39108141c93 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-keyring-${version}";
-  version = "3.28.0.2";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0a52xz535vgfymjw3cxmryi3xn2ik24vwk6sixyb7q6jgmqi4bw8";
+    sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1";
   };
 
   passthru = {
-- 
GitLab


From 2b1db532967ec7d902868e286dd00a9b237b5032 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:37:59 +0200
Subject: [PATCH 0323/1085] =?UTF-8?q?gnome3.gnome-shell-extensions:=203.28?=
 =?UTF-8?q?.0=20=E2=86=92=203.28.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/gnome-shell-extensions/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index 7ba3545848f..a963ea148ba 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extensions-${version}";
-  version = "3.28.0";
+  version = "3.28.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "00xm5r4q40c0ji80vrsqg2fkrvzb1nm75p3ikv6bsmd3gfvwwp91";
+    sha256 = "0n4h8rdnq3knrvlg6inrl62a73h20dbhfgniwy18572jicrh5ip9";
   };
 
   passthru = {
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     # Fixup adapted from export-zips.sh in the source.
 
     extensiondir=$out/share/gnome-shell/extensions
-    schemadir=$out/share/gsettings-schemas/gnome-shell-extensions-3.28.0/glib-2.0/schemas/
+    schemadir=$out/share/gsettings-schemas/${name}/glib-2.0/schemas/
 
     glib-compile-schemas $schemadir
 
-- 
GitLab


From df805805213aa1a6b699e194f2aa4f3570fd3919 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:38:21 +0200
Subject: [PATCH 0324/1085] =?UTF-8?q?gnome3.gnome-shell:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.28.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 70177d0a516..6b1e15bbc99 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret
 , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
 , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
-, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42
+, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
 , libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook
 , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet
 , sassc, systemd, gst_all_1 }:
@@ -13,11 +13,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "gnome-shell-${version}";
-  version = "3.28.0";
+  version = "3.28.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0kmsh305cfr3fg40rhwykqbl466lwcq9djda25kf29ib7h6w1pn7";
+    sha256 = "1k2cgaky293kcjis0pmh9hw1aby3yyilb5dzrbww62wxzppc9s35";
   };
 
   # Needed to find /etc/NetworkManager/VPN
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
-    sassc
+    sassc desktop-file-utils
   ];
   buildInputs = with gnome3; [
     systemd caribou
-- 
GitLab


From c477acec9efc4347fb5bdc36f84d14f94a523731 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:38:42 +0200
Subject: [PATCH 0325/1085] =?UTF-8?q?gnome3.mutter:=203.28.0=20=E2=86=92?=
 =?UTF-8?q?=203.28.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 623d2b1251e..866888feba0 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mutter-${version}";
-  version = "3.28.0";
+  version = "3.28.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1c46sf10mgvwgym4c6hbjm7wa82dvfv8j8dx4zdbc7zj4n0grzsq";
+    sha256 = "1bhmjvf6l1fj5igsw2xlg3nv5526laiwaxh47dgk50f40qax1qin";
   };
 
   passthru = {
-- 
GitLab


From fd0d1f35a5f6d8dd321df74828144aa67da7f15f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:39:09 +0200
Subject: [PATCH 0326/1085] =?UTF-8?q?gvfs:=201.36.1=20=E2=86=92=201.36.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 238edddaf3a..4f3bc64b5d4 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -18,14 +18,14 @@
 
 let
   pname = "gvfs";
-  version = "1.36.1";
+  version = "1.36.2";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "09phj9kqk8lzcmkjfq7qmzpkj4xp1vg4mskv6d2s9j62hvrxyh1q";
+    sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
   };
 
   # Uncomment when switching back to meson
-- 
GitLab


From 376c55fcea12e76dee22f74efa6fba5b4228891b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Tue, 8 May 2018 03:36:41 +0200
Subject: [PATCH 0327/1085] cargo-fuzz: init at 0.5.3

---
 .../tools/rust/cargo-fuzz/default.nix         | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/rust/cargo-fuzz/default.nix

diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix
new file mode 100644
index 00000000000..cc5d90b223d
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "cargo-fuzz-${version}";
+  version = "0.5.3"; # Note to self: on 0.5.4, remove the hand-added Cargo.lock
+
+  src =
+    let
+      source = fetchFromGitHub {
+        owner = "rust-fuzz";
+        repo = "cargo-fuzz";
+        rev = version;
+        sha256 = "1l452fnjw7i10nrd4y4rssi5d457vgjp6rhdr9cnq32bjhdkprrs";
+      };
+      cargo-lock = fetchurl {
+        url = "https://gist.githubusercontent.com/Ekleog/7d5b62d13b7207aafa4c37d1bbdf2de7/raw/c6027fc1c531947f4d6836a3c4cba1b3e24df24c/Cargo.lock";
+        sha256 = "0d7b6kxfbfvwksybzrihylamg2zv5fmsk9m6xshryhwipskzzvmd";
+      };
+    in
+    runCommand "cargo-fuzz-src" {} ''
+      cp -R ${source} $out
+      chmod +w $out
+      cp ${cargo-lock} $out/Cargo.lock
+    '';
+
+  cargoSha256 = "0ajm8qp8hi7kn7199ywv26cmjv13phxv72lz8kcq97hxg17x0dkk";
+
+  meta = with stdenv.lib; {
+    description = "Command line helpers for fuzzing";
+    homepage = https://github.com/rust-fuzz/cargo-fuzz;
+    license = with licenses; [ mit asl20 ];
+    maintainers = [ maintainers.ekleog ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 567167fc460..53635e51b4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6848,7 +6848,7 @@ with pkgs;
 
   buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { };
 
-  cargo-vendor = callPackage ../build-support/rust/cargo-vendor {};
+  cargo-vendor = callPackage ../build-support/rust/cargo-vendor { };
 
   carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { };
 
@@ -6873,6 +6873,8 @@ with pkgs;
 
   cargo-edit = callPackage ../tools/package-management/cargo-edit { };
 
+  cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
+
   rainicorn = callPackage ../development/tools/rust/rainicorn { };
   rustfmt = callPackage ../development/tools/rust/rustfmt { };
   rustracer = callPackage ../development/tools/rust/racer { };
-- 
GitLab


From a33756a866e1d64337e58c78e3fef2303a00af3d Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Mon, 7 May 2018 23:48:04 -0400
Subject: [PATCH 0328/1085] Use build packages GHC for
 haskell.packages.integer-simple

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 937c930ac75..8a395fbec18 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -159,7 +159,7 @@ in rec {
         (name: ! builtins.elem name integerSimpleExcludes)
         (pkgs.lib.attrNames packages);
     in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override {
-      ghc = compiler.integer-simple."${name}";
+      ghc = bh.compiler.integer-simple."${name}";
       overrides = _self : _super : {
         integer-simple = null;
         integer-gmp = null;
-- 
GitLab


From 0afb45d5747d812d434e687ce8bfc78e40a54060 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Mon, 7 May 2018 23:52:05 -0400
Subject: [PATCH 0329/1085] Set the C standard when building GHC

Should this be in cc-wrapper?
---
 pkgs/development/compilers/ghc/8.4.2.nix | 2 ++
 pkgs/development/compilers/ghc/head.nix  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index cf4e5772719..bbe82354c8c 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -50,6 +50,8 @@ let
   '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 51497e0d9ce..f0e21b0cf5b 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -50,6 +50,8 @@ let
   '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
-- 
GitLab


From 8012aee0a7d9fe14fe77d20b6fdd8d2e6120bcc1 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Mon, 7 May 2018 23:52:34 -0400
Subject: [PATCH 0330/1085] Don't enableShared in GHC when using android
 prebuilt

---
 pkgs/development/compilers/ghc/8.4.2.nix | 2 +-
 pkgs/development/compilers/ghc/head.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index bbe82354c8c..b588592a71c 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -22,7 +22,7 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? true
+  enableShared ? !targetPlatform.useAndroidPrebuilt
 
 , version ? "8.4.2"
 }:
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index f0e21b0cf5b..7e1c73d166a 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -22,7 +22,7 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? true
+  enableShared ? !targetPlatform.useAndroidPrebuilt
 
 , version ? "8.5.20180118"
 }:
-- 
GitLab


From 219b1c1e1bfbf2ec56584c2e6fd7c1fb937d253a Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 8 May 2018 15:14:54 +0900
Subject: [PATCH 0331/1085] flashplayer: 29.0.0.140 -> 29.0.0.171

---
 .../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 f0862aebafe..cb2121553ac 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -98,12 +98,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "29.0.0.140";
+    version = "29.0.0.171";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "1p0jr7s6vyzxw1mhbrl5yx092z2wpvfw0jjw127gs576z0zwamwh";
+      sha256 = "1j7w81wjfrpkir11m719jdahnbnw4sph448hs90hvai6rsn3imib";
       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 162dd88054c..6c19b684aaa 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 = "29.0.0.140";
+  version = "29.0.0.171";
 
   src = fetchurl {
     url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p"
+          "140galarr38lmfnd2chl2msvxizx96kdi000gbikir9xnd7bx1hc"
         else
-          "16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh"
+          "0wzmf12xrmyq8vqqyii932yx4nadrvkn2j9s86xcw67lb40xj5ig"
       else
         if arch == "x86_64" then
-          "10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7"
+          "17c57xgs0w71p4xsjw5an7dg484769wanq3kx86ppaqw8vqhnqc3"
         else
-          "0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1";
+          "06pjbc9050fgi2njzf9vm6py7c22i6chw852rbm8flx3cmplw23b";
   };
 
   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 42d7aa2f56f..fa9c89b442b 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 = "29.0.0.140";
+  version = "29.0.0.171";
 
   src = fetchurl {
     url =
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5"
+        "1q2lmsb9g2cxbwxb712javmadk6vmcgkihd244394nr10isdzw67"
       else
-        "08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl";
+        "0qj5qdc9k53pgqxb5jpcbgfsgavmlyzp0cpz468c4zacsvxgq502";
   };
 
   nativeBuildInputs = [ unzip ];
-- 
GitLab


From 5d66a6bbdb78e8c25876146e185898b1afb71993 Mon Sep 17 00:00:00 2001
From: Joel Burget <joelburget@gmail.com>
Date: Tue, 8 May 2018 00:23:07 -0700
Subject: [PATCH 0332/1085] 1password: init at version 0.4 (#40158)

---
 maintainers/maintainer-list.nix              |  5 +++
 pkgs/applications/misc/1password/default.nix | 34 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/misc/1password/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 782a3ee6aad..e31b84b03b0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1825,6 +1825,11 @@
     github = "joamaki";
     name = "Jussi Maki";
   };
+  joelburget = {
+    email = "joelburget@gmail.com";
+    github = "joelburget";
+    name = "Joel Burget";
+  };
   joelmo = {
     email = "joel.moberg@gmail.com";
     github = "joelmo";
diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
new file mode 100644
index 00000000000..b0b6111b334
--- /dev/null
+++ b/pkgs/applications/misc/1password/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchzip, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "1password-${version}";
+  version = "0.4";
+  src = if stdenv.system == "i686-linux" then fetchzip {
+    url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
+    sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41";
+    stripRoot = false;
+  } else fetchzip {
+    url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
+    sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf";
+    stripRoot = false;
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D op $out/share/1password/op
+
+    # https://github.com/NixOS/patchelf/issues/66#issuecomment-267743051
+    makeWrapper $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/op \
+      --argv0 op \
+      --add-flags $out/share/1password/op
+  '';
+
+  meta = with stdenv.lib; {
+    description = "1Password command-line tool";
+    homepage    = "https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/";
+    maintainers = with maintainers; [ joelburget ];
+    license     = licenses.unfree;
+    platforms   = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 546a9d9bd76..6a5d8e6f0df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -400,6 +400,8 @@ with pkgs;
 
   ### TOOLS
 
+  _1password = callPackage ../applications/misc/1password { };
+
   _9pfs = callPackage ../tools/filesystems/9pfs { };
 
   a2ps = callPackage ../tools/text/a2ps { };
-- 
GitLab


From c2b4cfbe0827d309efd9ccf25352b3e32caa8dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 8 May 2018 09:12:13 +0100
Subject: [PATCH 0333/1085] xmrig: restrict to x86

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

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 9814ec92f02..5b389d99da7 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
     description = "Monero (XMR) CPU miner";
     homepage = "https://github.com/xmrig/xmrig";
     license = licenses.gpl3Plus;
+    platforms   = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ fpletz ];
   };
 }
-- 
GitLab


From a8768c610efdbe27af26256c001609b5f05f0af9 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <github@tazj.in>
Date: Tue, 8 May 2018 10:22:25 +0200
Subject: [PATCH 0334/1085] bluemix-cli: init at 0.6.6 (#40147)

Adds the (non-free, binary) IBM Bluemix CLI which is required to
administrate IBM Bluemix services.
---
 pkgs/tools/admin/bluemix-cli/default.nix | 25 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/admin/bluemix-cli/default.nix

diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix
new file mode 100644
index 00000000000..f014d09b5c7
--- /dev/null
+++ b/pkgs/tools/admin/bluemix-cli/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "bluemix-cli-${version}";
+  version = "0.6.6";
+
+  src = fetchurl {
+    name = "linux64.tar.gz";
+    url = "https://clis.ng.bluemix.net/download/bluemix-cli/${version}/linux64";
+    sha256 = "1swjawc4szqrl0wgjcb4na1hbxylaqp2mp53lxsbfbk1db0c3y85";
+  };
+
+  installPhase = ''
+    install -m755 -D --target $out/bin bin/bluemix bin/bluemix-analytics bin/cfcli/cf
+  '';
+
+  meta = with lib; {
+    description  = "Administration CLI for IBM BlueMix";
+    homepage     = "https://console.bluemix.net/docs/cli/index.html";
+    downloadPage = "https://console.bluemix.net/docs/cli/reference/bluemix_cli/download_cli.html#download_install";
+    license      = licenses.unfree;
+    maintainers  = maintainers.tazjin;
+    platforms    = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a5d8e6f0df..b65b28bb020 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -833,6 +833,8 @@ with pkgs;
 
   blink = callPackage ../applications/networking/instant-messengers/blink { };
 
+  bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
+
   libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { };
 
   quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { };
-- 
GitLab


From aad0a825f9190539002fbac010b06b268c1dadbf Mon Sep 17 00:00:00 2001
From: scalavision <scalavision@gmail.com>
Date: Tue, 8 May 2018 10:40:10 +0200
Subject: [PATCH 0335/1085] singularity: 2.4.6 -> 2.5.1

---
 pkgs/applications/virtualization/singularity/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index d6913a94432..2048d7d2ed9 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -13,11 +13,12 @@
 , gnused
 , curl
 , utillinux
+, libarchive
  }:
 
 stdenv.mkDerivation rec {
   name = "singularity-${version}";
-  version = "2.4.6";
+  version = "2.5.1";
 
   enableParallelBuilding = true;
 
@@ -45,11 +46,11 @@ stdenv.mkDerivation rec {
     owner = "singularityware";
     repo = "singularity";
     rev = version;
-    sha256 = "0bs1jqm7v7wv1kdxq8kyqn3gl5m76j0wwwgjyjnndrhczlsh5m1d";
+    sha256 = "1i029qs6dfpyirhbdz0nrx2sh5fddysk4wqkjqj5m60kxs4x8a3d";
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper ];
-  buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux ];
+  buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux libarchive ];
 
   meta = with stdenv.lib; {
     homepage = http://singularity.lbl.gov/;
-- 
GitLab


From 41d4bd29acbbbc65dc7412cdc1596fd7c2d861dc Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Mon, 23 Apr 2018 10:37:15 +0200
Subject: [PATCH 0336/1085] nixos/keepalived: Implemented vrrp-instance
 tracking scripts and interfaces. Tracking scripts in particular, cannot be
 included in extraOpts, because script declaration has to be above script
 usage in keepalived.conf. Changes are fully backward compatible.

---
 .../networking/keepalived/default.nix         | 62 +++++++++++++++++-
 ...-options.nix => vrrp-instance-options.nix} | 14 ++++
 .../keepalived/vrrp-script-options.nix        | 64 +++++++++++++++++++
 3 files changed, 138 insertions(+), 2 deletions(-)
 rename nixos/modules/services/networking/keepalived/{vrrp-options.nix => vrrp-instance-options.nix} (88%)
 create mode 100644 nixos/modules/services/networking/keepalived/vrrp-script-options.nix

diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix
index 378cd936584..c9ac2ee2599 100644
--- a/nixos/modules/services/networking/keepalived/default.nix
+++ b/nixos/modules/services/networking/keepalived/default.nix
@@ -8,10 +8,12 @@ let
 
   keepalivedConf = pkgs.writeText "keepalived.conf" ''
     global_defs {
+      ${optionalString cfg.enableScriptSecurity "enable_script_security"}
       ${snmpGlobalDefs}
       ${cfg.extraGlobalDefs}
     }
 
+    ${vrrpScriptStr}
     ${vrrpInstancesStr}
     ${cfg.extraConfig}
   '';
@@ -26,6 +28,22 @@ let
     + optionalString enableTraps "enable_traps"
   );
 
+  vrrpScriptStr = concatStringsSep "\n" (map (s:
+    ''
+      vrrp_script ${s.name} {
+        script "${s.script}"
+        interval ${toString s.interval}
+        fall ${toString s.fall}
+        rise ${toString s.rise}
+        timeout ${toString s.timeout}
+        weight ${toString s.weight}
+        user ${s.user} ${optionalString (s.group != null) s.group}
+
+        ${s.extraConfig}
+      }
+    ''
+  ) vrrpScripts);
+
   vrrpInstancesStr = concatStringsSep "\n" (map (i:
     ''
       vrrp_instance ${i.name} {
@@ -49,6 +67,18 @@ let
           ${concatMapStringsSep "\n" virtualIpLine i.virtualIps}
         }
 
+        ${optionalString (builtins.length i.trackScripts > 0) ''
+          track_script {
+            ${concatStringsSep "\n" i.trackScripts}
+          }
+        ''}
+
+        ${optionalString (builtins.length i.trackInterfaces > 0) ''
+          track_interface {
+            ${concatStringsSep "\n" i.trackInterfaces}
+          }
+        ''}
+
         ${i.extraConfig}
       }
     ''
@@ -64,6 +94,12 @@ let
 
   notNullOrEmpty = s: !(s == null || s == "");
 
+  vrrpScripts = mapAttrsToList (name: config:
+    {
+      inherit name;
+    } // config
+  ) cfg.vrrpScripts;
+
   vrrpInstances = mapAttrsToList (iName: iConfig:
     {
       name = iName;
@@ -86,7 +122,8 @@ let
     { assertion = !i.vmacXmitBase || i.useVmac;
       message = "services.keepalived.vrrpInstances.${i.name}.vmacXmitBase has no effect when services.keepalived.vrrpInstances.${i.name}.useVmac is not set.";
     }
-  ] ++ flatten (map (virtualIpAssertions i.name) i.virtualIps);
+  ] ++ flatten (map (virtualIpAssertions i.name) i.virtualIps)
+    ++ flatten (map (vrrpScriptAssertion i.name) i.trackScripts);
 
   virtualIpAssertions = vrrpName: ip: [
     { assertion = ip.addr != "";
@@ -94,6 +131,11 @@ let
     }
   ];
 
+  vrrpScriptAssertion = vrrpName: scriptName: {
+    assertion = builtins.hasAttr scriptName cfg.vrrpScripts;
+    message = "services.keepalived.vrrpInstances.${vrrpName} trackscript ${scriptName} is not defined in services.keepalived.vrrpScripts.";
+  };
+
   pidFile = "/run/keepalived.pid";
 
 in
@@ -110,6 +152,14 @@ in
         '';
       };
 
+      enableScriptSecurity = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Don't run scripts configured to be run as root if any part of the path is writable by a non-root user.
+        '';
+      };
+
       snmp = {
 
         enable = mkOption {
@@ -181,8 +231,16 @@ in
 
       };
 
+      vrrpScripts = mkOption {
+        type = types.attrsOf (types.submodule (import ./vrrp-script-options.nix {
+          inherit lib;
+        }));
+        default = {};
+        description = "Declarative vrrp script config";
+      };
+
       vrrpInstances = mkOption {
-        type = types.attrsOf (types.submodule (import ./vrrp-options.nix {
+        type = types.attrsOf (types.submodule (import ./vrrp-instance-options.nix {
           inherit lib;
         }));
         default = {};
diff --git a/nixos/modules/services/networking/keepalived/vrrp-options.nix b/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix
similarity index 88%
rename from nixos/modules/services/networking/keepalived/vrrp-options.nix
rename to nixos/modules/services/networking/keepalived/vrrp-instance-options.nix
index 79eff3ae541..85b9bc33772 100644
--- a/nixos/modules/services/networking/keepalived/vrrp-options.nix
+++ b/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix
@@ -108,6 +108,20 @@ with lib;
       description = "Declarative vhost config";
     };
 
+    trackScripts = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "chk_cmd1" "chk_cmd2" ];
+      description = "List of script names to invoke for health tracking.";
+    };
+
+    trackInterfaces = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "eth0" "eth1" ];
+      description = "List of network interfaces to monitor for health tracking.";
+    };
+
     extraConfig = mkOption {
       type = types.lines;
       default = "";
diff --git a/nixos/modules/services/networking/keepalived/vrrp-script-options.nix b/nixos/modules/services/networking/keepalived/vrrp-script-options.nix
new file mode 100644
index 00000000000..a3f794c40a8
--- /dev/null
+++ b/nixos/modules/services/networking/keepalived/vrrp-script-options.nix
@@ -0,0 +1,64 @@
+{ lib } :
+
+with lib;
+with lib.types;
+{
+  options = {
+
+    script = mkOption {
+      type = str;
+      example = "\${pkgs.curl} -f http://localhost:80";
+      description = "(Path of) Script command to execute followed by args, i.e. cmd [args]...";
+    };
+
+    interval = mkOption {
+      type = int;
+      default = 1;
+      description = "Seconds between script invocations.";
+    };
+
+    timeout = mkOption {
+      type = int;
+      default = 5;
+      description = "Seconds after which script is considered to have failed.";
+    };
+
+    weight = mkOption {
+      type = int;
+      default = 0;
+      description = "Following a failure, adjust the priority by this weight.";
+    };
+
+    rise = mkOption {
+      type = int;
+      default = 5;
+      description = "Required number of successes for OK transition.";
+    };
+
+    fall = mkOption {
+      type = int;
+      default = 3;
+      description = "Required number of failures for KO transition.";
+    };
+
+    user = mkOption {
+      type = str;
+      default = "keepalived_script";
+      description = "Name of user to run the script under.";
+    };
+
+    group = mkOption {
+      type = nullOr str;
+      default = null;
+      description = "Name of group to run the script under. Defaults to user group.";
+    };
+
+    extraConfig = mkOption {
+      type = lines;
+      default = "";
+      description = "Extra lines to be added verbatim to the vrrp_script section.";
+    };
+
+  };
+
+}
-- 
GitLab


From bf02618e1f26f914283a29ab458ad67464a20f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Tue, 8 May 2018 11:41:52 +0200
Subject: [PATCH 0337/1085] idrisPackages.vdom: init at 0.6.0

---
 pkgs/development/idris-modules/default.nix |  2 ++
 pkgs/development/idris-modules/vdom.nix    | 28 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/idris-modules/vdom.nix

diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 12fbc8dfd17..1dfa4e48899 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -194,6 +194,8 @@
 
     union_type = callPackage ./union_type.nix {};
 
+    vdom = callPackage ./vdom.nix {};
+
     vecspace = callPackage ./vecspace.nix {};
 
     webgl = callPackage ./webgl.nix {};
diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix
new file mode 100644
index 00000000000..034bda583db
--- /dev/null
+++ b/pkgs/development/idris-modules/vdom.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "vdom";
+  version = "0.6.0";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "brandondyck";
+    repo = "idris-vdom";
+    rev = "ff32c14feeac937f7418830a9a3463cd9582be8a";
+    sha256 = "0aila1qdpmhrp556dzaxk7yn7vgkwcnbp9jhw8f8pl51xs3s2kvf";
+  };
+
+  meta = {
+    description = "Virtual DOM in pure Idris";
+    homepage = https://github.com/brandondyck/idris-vdom;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}
-- 
GitLab


From eb774f30475547033d7059b1ea5de6393e3996bc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 8 May 2018 11:10:09 +0200
Subject: [PATCH 0338/1085] akonadi-import-wizard: Add package expression

This is required for kdepim-addons and packaging this is pretty much
straightforward with no hurdles.

I tried to keep the coding style close to other packages in
kdeApplications so that it stays consistent.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel, @vandenoever
---
 .../kde/akonadi-import-wizard.nix             | 20 +++++++++++++++++++
 pkgs/applications/kde/default.nix             |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/kde/akonadi-import-wizard.nix

diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix
new file mode 100644
index 00000000000..cc1acbc6dd0
--- /dev/null
+++ b/pkgs/applications/kde/akonadi-import-wizard.nix
@@ -0,0 +1,20 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, karchive, kcontacts, kcrash, kidentitymanagement, kio,
+  kmailtransport, kwallet, mailcommon, mailimporter, messagelib
+}:
+
+mkDerivation {
+  name = "akonadi-import-wizard";
+  meta = {
+    license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi karchive kcontacts kcrash kidentitymanagement kio
+    kmailtransport kwallet mailcommon mailimporter messagelib
+  ];
+  outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 5870179b6c0..5b21844dd18 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -67,6 +67,7 @@ let
       akonadi = callPackage ./akonadi {};
       akonadi-calendar = callPackage ./akonadi-calendar.nix {};
       akonadi-contacts = callPackage ./akonadi-contacts.nix {};
+      akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix {};
       akonadi-mime = callPackage ./akonadi-mime.nix {};
       akonadi-notes = callPackage ./akonadi-notes.nix {};
       akonadi-search = callPackage ./akonadi-search.nix {};
-- 
GitLab


From dace4813771fa3563eda06b83d8362388ba8a96b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 8 May 2018 11:22:28 +0200
Subject: [PATCH 0339/1085] kdepim-addons: Add package expression

This is needed in order to add location information to contacts in
KAddressbook.

Packaging was quite straightforward except that it needed
akonadi-import-wizard, which I have packaged in the previous commit.

I'm committing this directly to master without a pull request, because
nothing depends on it (for obvious reasons) and packaging was trivial
enough so that if things are not as they supposed to be it can still be
changed very easily.

Tested this using the following VM configuration, because I don't run a
Plasma desktop:

(import <nixpkgs/nixos> {
  configuration = { pkgs, ... }: {
    environment.systemPackages = with import <nixpkgs> {}; [
      kdeApplications.kaddressbook kdeApplications.kdepim-addons
    ];
    users.users.test.isNormalUser = true;
    virtualisation.diskSize = 4096;
    virtualisation.memorySize = 2048;

    services.xserver = {
      enable = true;
      inherit ((import <nixpkgs/nixos> {}).config.services.xserver) layout;
      displayManager.sddm.enable = true;
      displayManager.sddm.autoLogin.enable = true;
      displayManager.sddm.autoLogin.user = "test";
      desktopManager.default = "plasma5";
      desktopManager.plasma5.enable = true;
    };
  };
}).vm

The test I've done is using KAddressbook and check whether the location
tab is working and it does now.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel, @vandenoever
---
 pkgs/applications/kde/default.nix       |  1 +
 pkgs/applications/kde/kdepim-addons.nix | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/kde/kdepim-addons.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 5b21844dd18..f602e5c92d9 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -102,6 +102,7 @@ let
       kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
       kdenlive = callPackage ./kdenlive.nix {};
       kdepim-runtime = callPackage ./kdepim-runtime.nix {};
+      kdepim-addons = callPackage ./kdepim-addons.nix {};
       kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
       kdf = callPackage ./kdf.nix {};
       kdialog = callPackage ./kdialog.nix {};
diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix
new file mode 100644
index 00000000000..fd3fe2d6c09
--- /dev/null
+++ b/pkgs/applications/kde/kdepim-addons.nix
@@ -0,0 +1,23 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, shared-mime-info,
+  akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
+  incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
+  kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
+  libksieve, mailcommon, mailimporter, messagelib, poppler_qt5, prison
+}:
+
+mkDerivation {
+  name = "kdepim-addons";
+  meta = {
+    license = with lib.licenses; [ gpl2Plus lgpl21Plus ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
+  buildInputs = [
+    akonadi-import-wizard akonadi-notes calendarsupport eventviews
+    incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative
+    kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
+    libksieve mailcommon mailimporter messagelib poppler_qt5 prison
+  ];
+}
-- 
GitLab


From 199e7f18ede0057777ef19648ea7d27c623ed4dc Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Tue, 8 May 2018 11:53:33 +0200
Subject: [PATCH 0340/1085] bluemix: Fix eval of maintainers

---
 pkgs/tools/admin/bluemix-cli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix
index f014d09b5c7..2c24728fab9 100644
--- a/pkgs/tools/admin/bluemix-cli/default.nix
+++ b/pkgs/tools/admin/bluemix-cli/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     homepage     = "https://console.bluemix.net/docs/cli/index.html";
     downloadPage = "https://console.bluemix.net/docs/cli/reference/bluemix_cli/download_cli.html#download_install";
     license      = licenses.unfree;
-    maintainers  = maintainers.tazjin;
+    maintainers  = [ maintainers.tazjin ];
     platforms    = [ "x86_64-linux" ];
   };
 }
-- 
GitLab


From a604fc6fcb4c645ffe2d2738b1b0990c2f715707 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@gmail.com>
Date: Tue, 8 May 2018 12:08:06 +0200
Subject: [PATCH 0341/1085] kontemplate: 1.4.0 -> 1.5.0

Moves to release version 1.5.0 (released 2018-05-08).
---
 pkgs/applications/networking/cluster/kontemplate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix
index 56cbef7f005..fd599cd8658 100644
--- a/pkgs/applications/networking/cluster/kontemplate/default.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name          = "kontemplate-${version}";
-  version       = "1.4.0";
+  version       = "1.5.0";
   goPackagePath = "github.com/tazjin/kontemplate";
   goDeps        = ./deps.nix;
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "tazjin";
     repo   = "kontemplate";
     rev    = "v${version}";
-    sha256 = "11aqc9sgyqz3pscx7njnb3xghl7d61vzdgl3bqndady0dxsccrpj";
+    sha256 = "0k3yr0ypw6brj1lxqs041zsyi0r09113i0x3xfj48zv4ralq74b6";
   };
 
   meta = with lib; {
-- 
GitLab


From 6c4c36fcbc2fcf4b7c1fcf4b372a94b069d3ee3d Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Thu, 3 May 2018 14:05:43 +0200
Subject: [PATCH 0342/1085] NetworkManager: add noDns option

---
 nixos/doc/manual/release-notes/rl-1809.xml    |  6 +++++
 nixos/modules/rename.nix                      |  1 +
 .../services/networking/networkmanager.nix    | 23 ++++++++++++-------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 7259be4c904..01b5e9d7746 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -227,6 +227,12 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      </para>
     </note>
    </listitem>
+   <listitem>
+    <para>
+     <literal>networking.networkmanager.useDnsmasq</literal> has been deprecated. Use
+     <literal>networking.networkmanager.dns</literal> instead.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index a1ead80cc21..56b7bf00448 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -17,6 +17,7 @@ with lib;
     (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
     (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
     (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+    (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ])
 
     (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
     (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 10e96eb4036..f4c4adcaaeb 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -10,7 +10,8 @@ let
   stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc";
 
   dns =
-    if cfg.useDnsmasq then "dnsmasq"
+    if cfg.dns == "none" then "none"
+    else if cfg.dns == "dnsmasq" then "dnsmasq"
     else if config.services.resolved.enable then "systemd-resolved"
     else if config.services.unbound.enable then "unbound"
     else "default";
@@ -205,14 +206,20 @@ in {
         };
       };
 
-      useDnsmasq = mkOption {
-        type = types.bool;
-        default = false;
+      dns = mkOption {
+        type = types.enum [ "auto" "dnsmasq" "none" ];
+        default = "auto";
         description = ''
-          Enable NetworkManager's dnsmasq integration. NetworkManager will run
-          dnsmasq as a local caching nameserver, using a "split DNS"
-          configuration if you are connected to a VPN, and then update
-          resolv.conf to point to the local nameserver.
+          Options:
+            - auto: Check for systemd-resolved, unbound, or use default.
+            - dnsmasq:
+              Enable NetworkManager's dnsmasq integration. NetworkManager will run
+              dnsmasq as a local caching nameserver, using a "split DNS"
+              configuration if you are connected to a VPN, and then update
+              resolv.conf to point to the local nameserver.
+            - none:
+              Disable NetworkManager's DNS integration completely.
+              It will not touch your /etc/resolv.conf.
         '';
       };
 
-- 
GitLab


From 9ef306bb4dc930f967678d9a2e9b4d4f2d1d5d03 Mon Sep 17 00:00:00 2001
From: Ben Barclay <benbarclay@gmail.com>
Date: Tue, 8 May 2018 22:46:24 +1000
Subject: [PATCH 0343/1085] bazel: 0.11.1 -> 0.12.0 (#39585)

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

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 593fe6c159b..d5eaa24c167 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
 
-  version = "0.11.1";
+  version = "0.12.0";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "e8d762bcc01566fa50952c8028e95cfbe7545a39b8ceb3a0d0d6df33b25b333f";
+    sha256 = "3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754";
   };
 
   sourceRoot = ".";
-- 
GitLab


From 851d5d72a3c87d06d26dd78f8b3a421537fc8a52 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Wed, 25 Apr 2018 21:18:26 +0000
Subject: [PATCH 0344/1085] dovecot2: added ssl_dh using security.dhparams

The 18.03 channel includes dovecot 2.3, which requires ssl_dh to be set.
-> fixes https://github.com/nixcloud/nixcloud-webservices/issues/21
---
 nixos/modules/services/mail/dovecot.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 543e732127a..96e60f9c88e 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -25,6 +25,7 @@ let
       ssl_cert = <${cfg.sslServerCert}
       ssl_key = <${cfg.sslServerKey}
       ${optionalString (!(isNull cfg.sslCACert)) ("ssl_ca = <" + cfg.sslCACert)}
+      ssl_dh = <${config.security.dhparams.path}/dovecot2.pem
       disable_plaintext_auth = yes
     '')
 
@@ -297,10 +298,15 @@ in
 
 
   config = mkIf cfg.enable {
-
     security.pam.services.dovecot2 = mkIf cfg.enablePAM {};
 
-    services.dovecot2.protocols =
+    security.dhparams = mkIf (! isNull cfg.sslServerCert) {
+      enable = true;
+      params = {
+        dovecot2 = 2048;
+      };
+    };
+   services.dovecot2.protocols =
      optional cfg.enableImap "imap"
      ++ optional cfg.enablePop3 "pop3"
      ++ optional cfg.enableLmtp "lmtp";
-- 
GitLab


From d541169e1a28d22f591ad7ca0edc48f76fa8eff4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 8 May 2018 16:03:52 +0300
Subject: [PATCH 0345/1085] wesnoth: unite with wesnoth-dev

There's no Wesnoth development version now.
---
 pkgs/games/wesnoth/default.nix  | 27 ++++++++--------------
 pkgs/games/wesnoth/dev.nix      | 41 ---------------------------------
 pkgs/top-level/all-packages.nix |  2 +-
 3 files changed, 11 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/games/wesnoth/dev.nix

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index d3128210a1b..81ffd6b135f 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,35 +1,28 @@
-{ stdenv, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf
-, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre
-, makeWrapper, enableTools ? false
+{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
+, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
+, enableTools ? false
 }:
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.12.6";
+  version = "1.14.0";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "0kifp6g1dsr16m6ngjq2hx19h851fqg326ps3krnhpyix963h3x5";
+    sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext boost
-                  libvorbis fribidi dbus libpng pcre ];
+  buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost
+                  libvorbis fribidi dbus libpng pcre openssl icu ];
 
   cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ];
 
   enableParallelBuilding = true;
 
-  # Wesnoth doesn't support input frameworks and Unicode input breaks when they are enabled.
-  postInstall = ''
-    for i in $out/bin/*; do
-      wrapProgram "$i" --unset XMODIFIERS
-    done
-  '';
-
   meta = with stdenv.lib; {
     description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
     longDescription = ''
@@ -42,7 +35,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.wesnoth.org/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ kkallio abbradar ];
-    platforms = platforms.unix;
+    maintainers = with maintainers; [ abbradar ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix
deleted file mode 100644
index 81ffd6b135f..00000000000
--- a/pkgs/games/wesnoth/dev.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
-, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
-, enableTools ? false
-}:
-
-stdenv.mkDerivation rec {
-  pname = "wesnoth";
-  version = "1.14.0";
-
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw";
-  };
-
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost
-                  libvorbis fribidi dbus libpng pcre openssl icu ];
-
-  cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
-    longDescription = ''
-      The Battle for Wesnoth is a Free, turn-based tactical strategy
-      game with a high fantasy theme, featuring both single-player, and
-      online/hotseat multiplayer combat. Fight a desperate battle to
-      reclaim the throne of Wesnoth, or take hand in any number of other
-      adventures.
-    '';
-
-    homepage = http://www.wesnoth.org/;
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b65b28bb020..7ab3665873b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19622,7 +19622,7 @@ with pkgs;
 
   wesnoth = callPackage ../games/wesnoth { };
 
-  wesnoth-dev = callPackage ../games/wesnoth/dev.nix { };
+  wesnoth-dev = wesnoth;
 
   widelands = callPackage ../games/widelands {
     lua = lua5_2;
-- 
GitLab


From 9c50f53065917249a47693041e8ab52ae96e0d06 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Tue, 8 May 2018 13:19:14 +0200
Subject: [PATCH 0346/1085] squashfsTools: apply reproducibility patches

Without these patches, the output of mksquashfs is not reproducible.
The patches are taken from https://github.com/squashfskit/squashfskit,
a fork of squashfs-tools, licensed under the GPL2 or later like
squashfs-tools itself.
---
 ...POCH-is-set-override-timestamps-with.patch |  90 +++++++
 ...POCH-is-set-also-clamp-content-times.patch |  83 +++++++
 .../0003-remove-frag-deflator-thread.patch    | 220 ++++++++++++++++++
 pkgs/tools/filesystems/squashfs/default.nix   |   9 +
 4 files changed, 402 insertions(+)
 create mode 100644 pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
 create mode 100644 pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
 create mode 100644 pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch

diff --git a/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch b/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
new file mode 100644
index 00000000000..5626800e723
--- /dev/null
+++ b/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
@@ -0,0 +1,90 @@
+From 0ab12a8585373be2de5129e14d979c62e7a90d82 Mon Sep 17 00:00:00 2001
+From: Chris Lamb <lamby@debian.org>
+Date: Mon, 21 Nov 2016 09:33:05 +0100
+Subject: [PATCH] If SOURCE_DATE_EPOCH is set, override timestamps with that
+ value.
+
+See https://reproducible-builds.org/specs/source-date-epoch/ for more
+information about this environment variable.
+
+Based on a patch by Alexander Couzens <lynxis@fe...> posted on
+https://sourceforge.net/p/squashfs/mailman/message/34673610/
+
+Signed-off-by: Chris Lamb <lamby@debian.org>
+---
+ squashfs-tools/mksquashfs.c | 38 ++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 37 insertions(+), 1 deletion(-)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index c2098bd..b49e956 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -137,6 +137,9 @@ unsigned int cache_bytes = 0, cache_size = 0, inode_count = 0;
+ /* inode lookup table */
+ squashfs_inode *inode_lookup_table = NULL;
+ 
++/* override filesystem creation time */
++time_t mkfs_fixed_time = -1;
++
+ /* in memory directory data */
+ #define I_COUNT_SIZE		128
+ #define DIR_ENTRIES		32
+@@ -5104,6 +5107,9 @@ int main(int argc, char *argv[])
+ 	int total_mem = get_default_phys_mem();
+ 	int progress = TRUE;
+ 	int force_progress = FALSE;
++	char *source_date_epoch, *endptr;
++	unsigned long long epoch;
++
+ 	struct file_buffer **fragment = NULL;
+ 
+ 	if(argc > 1 && strcmp(argv[1], "-version") == 0) {
+@@ -5641,6 +5647,36 @@ printOptions:
+ 		}
+ 	}
+ 
++	/* if SOURCE_DATE_EPOCH is set, use that timestamp for the mkfs time */
++	source_date_epoch = getenv("SOURCE_DATE_EPOCH");
++	if(source_date_epoch) {
++		errno = 0;
++		epoch = strtoull(source_date_epoch, &endptr, 10);
++		if((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0))
++				|| (errno != 0 && epoch == 0)) {
++			ERROR("Environment variable $SOURCE_DATE_EPOCH: "
++				"strtoull: %s\n", strerror(errno));
++			EXIT_MKSQUASHFS();
++		}
++		if(endptr == source_date_epoch) {
++			ERROR("Environment variable $SOURCE_DATE_EPOCH: "
++				"No digits were found: %s\n", endptr);
++			EXIT_MKSQUASHFS();
++		}
++		if(*endptr != '\0') {
++			ERROR("Environment variable $SOURCE_DATE_EPOCH: "
++				"Trailing garbage: %s\n", endptr);
++			EXIT_MKSQUASHFS();
++		}
++		if(epoch > ULONG_MAX) {
++			ERROR("Environment variable $SOURCE_DATE_EPOCH: "
++				"value must be smaller than or equal to "
++				"%lu but was found to be: %llu \n", ULONG_MAX, epoch);
++			EXIT_MKSQUASHFS();
++		}
++		mkfs_fixed_time = (time_t)epoch;
++	}
++
+ 	/*
+ 	 * Some compressors may need the options to be checked for validity
+ 	 * once all the options have been processed
+@@ -5993,7 +6029,7 @@ printOptions:
+	sBlk.flags = SQUASHFS_MKFLAGS(noI, noD, noF, noX, no_fragments,
+		always_use_fragments, duplicate_checking, exportable,
+		no_xattrs, comp_opts);
+-	sBlk.mkfs_time = time(NULL);
++	sBlk.mkfs_time = mkfs_fixed_time != -1 ? mkfs_fixed_time : time(NULL);
+ 
+ 	disable_info();
+ 
+-- 
+2.17.0
+
diff --git a/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch b/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
new file mode 100644
index 00000000000..5002375887f
--- /dev/null
+++ b/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
@@ -0,0 +1,83 @@
+From 32a07d4156a281084c90a4b78affc8b0b32a26fc Mon Sep 17 00:00:00 2001
+From: intrigeri <intrigeri@boum.org>
+Date: Mon, 21 Nov 2016 11:41:28 +0000
+Subject: [PATCH] If SOURCE_DATE_EPOCH is set, also clamp content timestamps
+ with that value.
+
+Based on a patch by Alexander Couzens <lynxis@fe...> posted on
+https://sourceforge.net/p/squashfs/mailman/message/34673610/
+---
+ squashfs-tools/mksquashfs.c | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index b49e956..9f020bf 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -137,6 +137,9 @@ unsigned int cache_bytes = 0, cache_size = 0, inode_count = 0;
+ /* inode lookup table */
+ squashfs_inode *inode_lookup_table = NULL;
+ 
++/* clamp all timestamps to SOURCE_DATE_EPOCH */
++time_t content_clamp_time = -1;
++
+ /* override filesystem creation time */
+ time_t mkfs_fixed_time = -1;
+ 
+@@ -2246,6 +2249,8 @@ restat:
+ 			  pathname_reader(dir_ent), strerror(errno));
+ 		goto read_err;
+ 	}
++	if(content_clamp_time != -1 && buf2.st_mtime >= content_clamp_time)
++		buf2.st_mtime = content_clamp_time;
+ 
+ 	if(read_size != buf2.st_size) {
+ 		close(file);
+@@ -3101,7 +3106,7 @@ void dir_scan(squashfs_inode *inode, char *pathname,
+ 		buf.st_mode = S_IRWXU | S_IRWXG | S_IRWXO | S_IFDIR;
+ 		buf.st_uid = getuid();
+ 		buf.st_gid = getgid();
+-		buf.st_mtime = time(NULL);
++		buf.st_mtime = content_clamp_time != -1 ? content_clamp_time : time(NULL);
+ 		buf.st_dev = 0;
+ 		buf.st_ino = 0;
+ 		dir_ent->inode = lookup_inode2(&buf, PSEUDO_FILE_OTHER, 0);
+@@ -3127,6 +3115,8 @@ void dir_scan(squashfs_inode *inode, char *pathname,
+			/* source directory has disappeared? */
+			BAD_ERROR("Cannot stat source directory %s because %s\n",
+				pathname, strerror(errno));
++		if(content_clamp_time != -1 && buf.st_mtime >= content_clamp_time)
++			buf.st_mtime = content_clamp_time;
+ 		dir_ent->inode = lookup_inode(&buf);
+ 	}
+ 
+@@ -3365,6 +3372,8 @@ struct dir_info *dir_scan1(char *filename, char *subpath,
+ 			free_dir_entry(dir_ent);
+ 			continue;
+ 		}
++		if(content_clamp_time != -1 && buf.st_mtime >= content_clamp_time)
++			buf.st_mtime = content_clamp_time;
+ 
+ 		if((buf.st_mode & S_IFMT) != S_IFREG &&
+ 				(buf.st_mode & S_IFMT) != S_IFDIR &&
+@@ -3544,7 +3553,7 @@ void dir_scan2(struct dir_info *dir, struct pseudo *pseudo)
+		buf.st_gid = pseudo_ent->dev->gid;
+		buf.st_rdev = makedev(pseudo_ent->dev->major,
+			pseudo_ent->dev->minor);
+-		buf.st_mtime = time(NULL);
++		buf.st_mtime = content_clamp_time != -1 ? content_clamp_time : time(NULL);
+ 		buf.st_ino = pseudo_ino ++;
+ 
+ 		if(pseudo_ent->dev->type == 'd') {
+@@ -5674,7 +5683,7 @@ printOptions:
+ 				"%lu but was found to be: %llu \n", ULONG_MAX, epoch);
+ 			EXIT_MKSQUASHFS();
+ 		}
+-		mkfs_fixed_time = (time_t)epoch;
++		mkfs_fixed_time = content_clamp_time = (time_t)epoch;
+ 	}
+ 
+ 	/*
+-- 
+2.17.0
+
diff --git a/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch b/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch
new file mode 100644
index 00000000000..4be4b96369a
--- /dev/null
+++ b/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch
@@ -0,0 +1,220 @@
+From afc0c76a170bd17cbd29bbec6ae6d2227e398570 Mon Sep 17 00:00:00 2001
+From: Alexander Couzens <lynxis@fe80.eu>
+Date: Fri, 13 Jan 2017 22:00:37 +0100
+Subject: [PATCH] remove frag_deflator_thread
+
+frag_deflator_thread compress fragments.
+Replace the deflator_thread with a function and
+use the function instead of the to_frag queue.
+---
+ squashfs-tools/info.c       |  5 ---
+ squashfs-tools/mksquashfs.c | 76 +++++++++++++------------------------
+ squashfs-tools/mksquashfs.h |  2 +-
+ squashfs-tools/restore.c    | 15 +-------
+ 4 files changed, 30 insertions(+), 68 deletions(-)
+
+diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c
+index 7968c77..028d578 100644
+--- a/squashfs-tools/info.c
++++ b/squashfs-tools/info.c
+@@ -96,11 +96,6 @@ void dump_state()
+ 	printf("compressed block queue (deflate thread(s) -> main thread)\n");
+ 	dump_seq_queue(to_main, 0);
+ 
+-	printf("uncompressed packed fragment queue (main thread -> fragment"
+-						" deflate thread(s))\n");
+-	dump_queue(to_frag);
+-
+-
+ 	printf("locked frag queue (compressed frags waiting while multi-block"
+ 						" file is written)\n");
+ 	dump_queue(locked_fragment);
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index cf48e40..cacf14c 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -270,10 +270,10 @@ unsigned int sid_count = 0, suid_count = 0, sguid_count = 0;
+ struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
+ struct cache *bwriter_buffer, *fwriter_buffer;
+ struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
+-	*to_frag, *locked_fragment, *to_process_frag;
++	*locked_fragment, *to_process_frag;
+ struct seq_queue *to_main;
+ pthread_t reader_thread, writer_thread, main_thread;
+-pthread_t *deflator_thread, *frag_deflator_thread, *frag_thread;
++pthread_t *deflator_thread, *frag_thread;
+ pthread_t *restore_thread = NULL;
+ pthread_mutex_t	fragment_mutex = PTHREAD_MUTEX_INITIALIZER;
+ pthread_mutex_t	pos_mutex = PTHREAD_MUTEX_INITIALIZER;
+@@ -323,7 +323,7 @@ struct dir_info *scan1_opendir(char *pathname, char *subpath, int depth);
+ void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad);
+ unsigned short get_checksum_mem(char *buff, int bytes);
+ void check_usable_phys_mem(int total_mem);
+-
++void frag_deflator(struct file_buffer *file_buffer);
+ 
+ void prep_exit()
+ {
+@@ -1540,7 +1540,7 @@ void write_fragment(struct file_buffer *fragment)
+ 	pthread_mutex_lock(&fragment_mutex);
+ 	fragment_table[fragment->block].unused = 0;
+ 	fragments_outstanding ++;
+-	queue_put(to_frag, fragment);
++	frag_deflator(fragment);
+ 	pthread_cleanup_pop(1);
+ }
+ 
+@@ -2412,51 +2412,34 @@ void *deflator(void *arg)
+ }
+ 
+ 
+-void *frag_deflator(void *arg)
++void frag_deflator(struct file_buffer *file_buffer)
+ {
+-	void *stream = NULL;
+-	int res;
+ 
+-	res = compressor_init(comp, &stream, block_size, 1);
+-	if(res)
+-		BAD_ERROR("frag_deflator:: compressor_init failed\n");
+-
+-	pthread_cleanup_push((void *) pthread_mutex_unlock, &fragment_mutex);
+-
+-	while(1) {
+-		int c_byte, compressed_size;
+-		struct file_buffer *file_buffer = queue_get(to_frag);
+-		struct file_buffer *write_buffer =
++	int c_byte, compressed_size;
++	struct file_buffer *write_buffer =
+ 			cache_get(fwriter_buffer, file_buffer->block);
+ 
+-		c_byte = mangle2(stream, write_buffer->data, file_buffer->data,
+-			file_buffer->size, block_size, noF, 1);
+-		compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
+-		write_buffer->size = compressed_size;
+-		pthread_mutex_lock(&fragment_mutex);
+-		if(fragments_locked == FALSE) {
+-			fragment_table[file_buffer->block].size = c_byte;
+-			fragment_table[file_buffer->block].start_block = bytes;
+-			write_buffer->block = bytes;
+-			bytes += compressed_size;
+-			fragments_outstanding --;
+-			queue_put(to_writer, write_buffer);
+-			pthread_mutex_unlock(&fragment_mutex);
+-			TRACE("Writing fragment %lld, uncompressed size %d, "
+-				"compressed size %d\n", file_buffer->block,
+-				file_buffer->size, compressed_size);
+-		} else {
+-				add_pending_fragment(write_buffer, c_byte,
+-					file_buffer->block);
+-				pthread_mutex_unlock(&fragment_mutex);
+-		}
+-		cache_block_put(file_buffer);
++	c_byte = mangle2(stream, write_buffer->data, file_buffer->data,
++			 file_buffer->size, block_size, noF, 1);
++	compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
++	write_buffer->size = compressed_size;
++	if(fragments_locked == FALSE) {
++		fragment_table[file_buffer->block].size = c_byte;
++		fragment_table[file_buffer->block].start_block = bytes;
++		write_buffer->block = bytes;
++		bytes += compressed_size;
++		fragments_outstanding --;
++		queue_put(to_writer, write_buffer);
++		TRACE("Writing fragment %lld, uncompressed size %d, "
++		      "compressed size %d\n", file_buffer->block,
++		      file_buffer->size, compressed_size);
++	} else {
++		add_pending_fragment(write_buffer, c_byte,
++				     file_buffer->block);
+ 	}
+-
+-	pthread_cleanup_pop(0);
++	cache_block_put(file_buffer);
+ }
+ 
+-
+ struct file_buffer *get_file_buffer()
+ {
+ 	struct file_buffer *file_buffer = seq_queue_get(to_main);
+@@ -4257,19 +4240,17 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
+ 			multiply_overflow(processors * 3, sizeof(pthread_t)))
+ 		BAD_ERROR("Processors too large\n");
+ 
+-	deflator_thread = malloc(processors * 3 * sizeof(pthread_t));
++	deflator_thread = malloc(processors * 2 * sizeof(pthread_t));
+ 	if(deflator_thread == NULL)
+ 		MEM_ERROR();
+ 
+-	frag_deflator_thread = &deflator_thread[processors];
+-	frag_thread = &frag_deflator_thread[processors];
++	frag_thread = &deflator_thread[processors];
+ 
+ 	to_reader = queue_init(1);
+ 	to_deflate = queue_init(reader_size);
+ 	to_process_frag = queue_init(reader_size);
+ 	to_writer = queue_init(bwriter_size + fwriter_size);
+ 	from_writer = queue_init(1);
+-	to_frag = queue_init(fragment_size);
+ 	locked_fragment = queue_init(fragment_size);
+ 	to_main = seq_queue_init();
+ 	reader_buffer = cache_init(block_size, reader_size, 0, 0);
+@@ -4285,9 +4266,6 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
+ 	for(i = 0; i < processors; i++) {
+ 		if(pthread_create(&deflator_thread[i], NULL, deflator, NULL))
+ 			BAD_ERROR("Failed to create thread\n");
+-		if(pthread_create(&frag_deflator_thread[i], NULL, frag_deflator,
+-				NULL) != 0)
+-			BAD_ERROR("Failed to create thread\n");
+ 		if(pthread_create(&frag_thread[i], NULL, frag_thrd,
+ 				(void *) destination_file) != 0)
+ 			BAD_ERROR("Failed to create thread\n");
+diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
+index 55708a3..dc5bde4 100644
+--- a/squashfs-tools/mksquashfs.h
++++ b/squashfs-tools/mksquashfs.h
+@@ -135,7 +135,7 @@ struct append_file {
+ extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
+ struct cache *bwriter_buffer, *fwriter_buffer;
+ extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
+-	*to_frag, *locked_fragment, *to_process_frag;
++	*locked_fragment, *to_process_frag;
+ extern struct append_file **file_mapping;
+ extern struct seq_queue *to_main;
+ extern pthread_mutex_t fragment_mutex, dup_mutex;
+diff --git a/squashfs-tools/restore.c b/squashfs-tools/restore.c
+index 5e336b3..a7aaf2e 100644
+--- a/squashfs-tools/restore.c
++++ b/squashfs-tools/restore.c
+@@ -47,8 +47,8 @@
+ #define TRUE 1
+ 
+ extern pthread_t reader_thread, writer_thread, main_thread;
+-extern pthread_t *deflator_thread, *frag_deflator_thread, *frag_thread;
+-extern struct queue *to_deflate, *to_writer, *to_frag, *to_process_frag;
++extern pthread_t *deflator_thread, *frag_thread;
++extern struct queue *to_deflate, *to_writer, *to_process_frag;
+ extern struct seq_queue *to_main;
+ extern void restorefs();
+ extern int processors;
+@@ -120,17 +120,6 @@ void *restore_thrd(void *arg)
+ 		pthread_cancel(main_thread);
+ 		pthread_join(main_thread, NULL);
+ 
+-		/* then flush the main thread to fragment deflator thread(s)
+-		 * queue.  The fragment deflator thread(s) will idle
+-		 */
+-		queue_flush(to_frag);
+-
+-		/* now kill the fragment deflator thread(s) */
+-		for(i = 0; i < processors; i++)
+-			pthread_cancel(frag_deflator_thread[i]);
+-		for(i = 0; i < processors; i++)
+-			pthread_join(frag_deflator_thread[i], NULL);
+-
+ 		/*
+ 		 * then flush the main thread/fragment deflator thread(s)
+ 		 * to writer thread queue.  The writer thread will idle
+-- 
+2.17.0
+
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index a2fc5bc3d40..08951113b3b 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -15,6 +15,15 @@ stdenv.mkDerivation rec {
     rev = "9c1db6d13a51a2e009f0027ef336ce03624eac0d";
   };
 
+  # These patches ensures that mksquashfs output is reproducible.
+  # See also https://reproducible-builds.org/docs/system-images/
+  # and https://github.com/NixOS/nixpkgs/issues/40144.
+  patches = [
+    ./0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
+    ./0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
+    ./0003-remove-frag-deflator-thread.patch
+  ];
+
   buildInputs = [ zlib xz ]
     ++ stdenv.lib.optional lz4Support lz4;
 
-- 
GitLab


From 61a87491dc226267f7a979ea0f7ab81386c453d9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 May 2018 13:08:11 +0300
Subject: [PATCH 0347/1085] pacparser: init at 1.3.7

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

diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix
new file mode 100644
index 00000000000..54b3cf8fd81
--- /dev/null
+++ b/pkgs/tools/networking/pacparser/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "pacparser-${version}";
+  version = "1.3.7";
+
+  src = fetchurl {
+    url = "https://github.com/manugarg/pacparser/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0jfjm8lqyhdy9ny8a8icyd4rhclhfn608cr1i15jml82q8pyqj7b";
+  };
+
+  makeFlags = [ "NO_INTERNET=1" ];
+
+  preConfigure = ''
+    export makeFlags="$makeFlags PREFIX=$out"
+    patchShebangs tests/runtests.sh
+    cd src
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A library to parse proxy auto-config (PAC) files";
+    homepage = http://pacparser.manugarg.com/;
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ab3665873b..d6759098dfa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -657,6 +657,8 @@ with pkgs;
 
   lastpass-cli = callPackage ../tools/security/lastpass-cli { };
 
+  pacparser = callPackage ../tools/networking/pacparser { };
+
   pass = callPackage ../tools/security/pass { };
 
   passExtensions = recurseIntoAttrs pass.extensions;
-- 
GitLab


From a08645e9bea56a19df944763347269cf18a1b8ab Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 3 Apr 2018 10:43:15 +0300
Subject: [PATCH 0348/1085] nginx module: add upstream extraConfig

---
 nixos/modules/services/web-servers/nginx/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 815c3147e64..0aa780bf6da 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -38,6 +38,7 @@ let
       ${toString (flip mapAttrsToList upstream.servers (name: server: ''
         server ${name} ${optionalString server.backup "backup"};
       ''))}
+      ${upstream.extraConfig}
     }
   ''));
 
@@ -492,6 +493,13 @@ in
               '';
               default = {};
             };
+            extraConfig = mkOption {
+              type = types.lines;
+              default = "";
+              description = ''
+                These lines go to the end of the upstream verbatim.
+              '';
+            };
           };
         });
         description = ''
-- 
GitLab


From 3510b983c41196fce90729289c8c300ada1ccaea Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 8 May 2018 10:01:48 -0400
Subject: [PATCH 0349/1085] linux: 4.17-rc3 -> 4.17-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 d02ab415719..92225670330 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.17-rc3";
-  modDirVersion = "4.17.0-rc3";
+  version = "4.17-rc4";
+  modDirVersion = "4.17.0-rc4";
   extraMeta.branch = "4.17";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1divgjzmpl98b5j416vhkq53li0y9v5vvdwbgwpr2xznspzbkygq";
+    sha256 = "1y34hpzgxblwqslhsfsmzmpv9f3s936r93wgn4kmhkcwsm0in292";
   };
 
   # Should the testing kernels ever be built on Hydra?
-- 
GitLab


From 7936474efcef8fae93e96fe66d36b5cb363d4857 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Tue, 8 May 2018 10:49:49 -0400
Subject: [PATCH 0350/1085] gnucash: restore version 2.4

---
 pkgs/applications/office/gnucash/2.4.nix | 85 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  8 +++
 2 files changed, 93 insertions(+)
 create mode 100644 pkgs/applications/office/gnucash/2.4.nix

diff --git a/pkgs/applications/office/gnucash/2.4.nix b/pkgs/applications/office/gnucash/2.4.nix
new file mode 100644
index 00000000000..252c6d878d0
--- /dev/null
+++ b/pkgs/applications/office/gnucash/2.4.nix
@@ -0,0 +1,85 @@
+{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx
+, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
+, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
+, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar
+}:
+
+/* If you experience GConf errors when running GnuCash on NixOS, see
+ * http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications
+ * for a possible solution.
+ */
+
+stdenv.mkDerivation rec {
+  name = "gnucash-2.4.15";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
+    sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml
+    libgnomeprint goffice enchant gettext intltool perl guile slibGuile
+    swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
+    perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
+  ];
+  propagatedUserEnvPkgs = [ gconf ];
+
+  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking";
+
+  postInstall = ''
+    # Auto-updaters don't make sense in Nix.
+    rm $out/bin/gnc-fq-update
+
+    sed -i $out/bin/update-gnucash-gconf \
+       -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|'
+
+    for prog in $(echo "$out/bin/"*)
+    do
+      # Don't wrap the gnc-fq-* scripts, since gnucash calls them as
+      # "perl <script>', i.e. they must be Perl scripts.
+      if [[ $prog =~ gnc-fq ]]; then continue; fi
+      wrapProgram "$prog"                                               \
+        --set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH"                \
+        --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH"                 \
+        --prefix LD_LIBRARY_PATH ":" "${libgnomeui}/lib/libglade/2.0"   \
+        --prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0"  \
+        --prefix PERL5LIB ":" "$PERL5LIB"                               \
+        --set GCONF_CONFIG_SOURCE 'xml::~/.gconf'                       \
+        --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
+    done
+
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  # The following settings fix failures in the test suite. It's not required otherwise.
+  NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib.out}/lib";
+  preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
+
+  doCheck = false;      # https://github.com/NixOS/nixpkgs/issues/11084
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Personal and small-business financial-accounting application";
+
+    longDescription = ''
+      GnuCash is personal and small-business financial-accounting software,
+      freely licensed under the GNU GPL and available for GNU/Linux, BSD,
+      Solaris, macOS and Microsoft Windows.
+
+      Designed to be easy to use, yet powerful and flexible, GnuCash allows
+      you to track bank accounts, stocks, income and expenses.  As quick and
+      intuitive to use as a checkbook register, it is based on professional
+      accounting principles to ensure balanced books and accurate reports.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    homepage = http://www.gnucash.org/;
+
+    maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ];
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6759098dfa..028106713c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16056,6 +16056,14 @@ with pkgs;
     inherit (gnome3) dconf;
   };
 
+  gnucash24 = callPackage ../applications/office/gnucash/2.4.nix {
+    inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl;
+    gconf = gnome2.GConf;
+    guile = guile_1_8;
+    slibGuile = slibGuile.override { scheme = guile_1_8; };
+    goffice = goffice_0_8;
+  };
+
   gnucash26 = lowPrio (callPackage ../applications/office/gnucash/2.6.nix {
     inherit (gnome2) libgnomecanvas;
     inherit (gnome3) dconf;
-- 
GitLab


From 277ca33bee0a2b66ef21f4ed8e14414605ab42be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 May 2018 11:27:46 +0200
Subject: [PATCH 0351/1085] LTS Haskell 11.8

---
 .../configuration-hackage2nix.yaml            | 63 +++++++++----------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 412c3bfd57e..b3f8efa3963 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.7
+  # LTS Haskell 11.8
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -94,7 +94,7 @@ default-package-overrides:
   - amqp ==0.18.1
   - annotated-wl-pprint ==0.7.0
   - ansigraph ==0.3.0.5
-  - ansi-terminal ==0.8.0.2
+  - ansi-terminal ==0.8.0.3
   - ansi-wl-pprint ==0.6.8.2
   - ANum ==0.2.0.2
   - apecs ==0.2.4.7
@@ -158,7 +158,7 @@ default-package-overrides:
   - bbdb ==0.8
   - bcrypt ==0.0.11
   - beam-core ==0.7.2.1
-  - beam-migrate ==0.3.1.0
+  - beam-migrate ==0.3.2.0
   - beam-sqlite ==0.3.2.0
   - bench ==1.0.9
   - benchpress ==0.2.2.10
@@ -331,7 +331,7 @@ default-package-overrides:
   - codec ==0.2.1
   - code-page ==0.1.3
   - codo-notation ==0.5.2
-  - colorful-monoids ==0.2.1.0
+  - colorful-monoids ==0.2.1.1
   - colorize-haskell ==1.0.1
   - colour ==2.3.4
   - colour-accelerate ==0.2.0.0
@@ -488,7 +488,7 @@ default-package-overrides:
   - dice ==0.1
   - dictionaries ==0.2.0.4
   - Diff ==0.3.4
-  - diff3 ==0.3.0
+  - diff3 ==0.3.1
   - digest ==0.0.1.2
   - digits ==0.3.1
   - dimensional ==1.1
@@ -600,10 +600,10 @@ default-package-overrides:
   - exceptional ==0.3.0.0
   - exception-mtl ==0.4.0.1
   - exceptions ==0.8.3
-  - exception-transformers ==0.4.0.6
+  - exception-transformers ==0.4.0.7
   - executable-hash ==0.2.0.4
   - executable-path ==0.0.3.1
-  - exhaustive ==1.1.5
+  - exhaustive ==1.1.6
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9.2
   - exp-pairs ==0.1.6.0
@@ -798,7 +798,7 @@ default-package-overrides:
   - hackage-db ==2.0
   - hackage-security ==0.5.3.0
   - haddock-library ==1.4.5
-  - hailgun ==0.4.1.6
+  - hailgun ==0.4.1.7
   - hailgun-simple ==0.1.0.0
   - hakyll ==4.12.2.0
   - half ==0.2.2.3
@@ -830,7 +830,7 @@ default-package-overrides:
   - haskell-spacegoo ==0.2.0.1
   - haskell-src ==1.0.3.0
   - haskell-src-exts ==1.20.2
-  - haskell-src-exts-util ==0.2.2
+  - haskell-src-exts-util ==0.2.3
   - haskell-src-meta ==0.8.0.2
   - haskell-tools-ast ==1.0.1.1
   - haskell-tools-backend-ghc ==1.0.1.1
@@ -852,7 +852,7 @@ default-package-overrides:
   - haxr ==3000.11.2
   - hbeanstalk ==0.2.4
   - Hclip ==3.0.0.4
-  - HCodecs ==0.5
+  - HCodecs ==0.5.1
   - hdaemonize ==0.5.5
   - HDBC ==2.4.0.2
   - HDBC-mysql ==0.7.1.0
@@ -931,8 +931,8 @@ default-package-overrides:
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
-  - HSet ==0.0.1
   - hset ==2.2.0
+  - HSet ==0.0.1
   - hsexif ==0.6.1.5
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
@@ -991,7 +991,7 @@ default-package-overrides:
   - http-link-header ==1.0.3
   - http-media ==0.7.1.2
   - http-reverse-proxy ==0.5.0.1
-  - http-streams ==0.8.5.5
+  - http-streams ==0.8.6.1
   - http-types ==0.12.1
   - human-readable-duration ==0.2.0.3
   - HUnit ==1.6.0.0
@@ -1054,7 +1054,7 @@ default-package-overrides:
   - inflections ==0.4.0.1
   - influxdb ==1.3.0.1
   - ini ==0.3.6
-  - inline-c ==0.6.0.5
+  - inline-c ==0.6.0.6
   - inline-c-cpp ==0.2.1.0
   - inline-java ==0.8.2
   - inline-r ==0.9.1
@@ -1083,7 +1083,7 @@ default-package-overrides:
   - ip ==1.1.2
   - ip6addr ==0.5.3
   - iproute ==1.7.4
-  - IPv6Addr ==1.0.2
+  - IPv6Addr ==1.0.3
   - IPv6DB ==0.2.6
   - ipython-kernel ==0.9.0.2
   - irc ==0.6.1.0
@@ -1183,7 +1183,7 @@ default-package-overrides:
   - libinfluxdb ==0.0.4
   - libmpd ==0.9.0.8
   - liboath-hs ==0.0.1.0
-  - libsystemd-journal ==1.4.2
+  - libsystemd-journal ==1.4.3
   - libxml-sax ==0.7.5
   - LibZip ==1.0.1
   - licensor ==0.2.2
@@ -1212,7 +1212,7 @@ default-package-overrides:
   - log-elasticsearch ==0.9.1.0
   - logfloat ==0.13.3.3
   - logger-thread ==0.1.0.2
-  - logging-effect ==1.2.5
+  - logging-effect ==1.2.6
   - logging-effect-extra ==1.2.2
   - logging-effect-extra-file ==1.1.2
   - logging-effect-extra-handler ==1.1.4
@@ -1387,13 +1387,13 @@ default-package-overrides:
   - network-anonymous-i2p ==0.10.0
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
-  - network-carbon ==1.0.11
+  - network-carbon ==1.0.12
   - network-conduit-tls ==1.3.0
   - network-house ==0.1.0.2
   - network-info ==0.2.0.10
   - network-ip ==0.3.0.2
   - network-multicast ==0.2.0
-  - Network-NineP ==0.4.2
+  - Network-NineP ==0.4.3
   - network-simple ==0.4.0.5
   - network-transport ==0.5.2
   - network-transport-composed ==0.2.1
@@ -1537,7 +1537,7 @@ default-package-overrides:
   - pipes-extras ==1.0.14
   - pipes-fastx ==0.3.0.0
   - pipes-fluid ==0.6.0.0
-  - pipes-group ==1.0.9
+  - pipes-group ==1.0.10
   - pipes-misc ==0.4.0.1
   - pipes-mongodb ==0.1.0.0
   - pipes-network ==0.6.4.1
@@ -1611,19 +1611,19 @@ default-package-overrides:
   - prompt ==0.1.1.2
   - protobuf ==0.2.1.1
   - protobuf-simple ==0.1.0.5
-  - protocol-buffers ==2.4.8
-  - protocol-buffers-descriptor ==2.4.8
+  - protocol-buffers ==2.4.9
+  - protocol-buffers-descriptor ==2.4.9
   - protocol-radius ==0.0.1.0
   - protocol-radius-test ==0.0.1.0
   - proto-lens ==0.2.2.0
   - proto-lens-arbitrary ==0.1.1.1
   - proto-lens-descriptors ==0.2.2.0
-  - proto-lens-optparse ==0.1.1.0
+  - proto-lens-optparse ==0.1.1.1
   - protolude ==0.2.2
   - proxied ==0.3
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
-  - psqueues ==0.2.6.0
+  - psqueues ==0.2.7.0
   - pthread ==0.2.0
   - publicsuffix ==0.20171229
   - pure-io ==0.2.1
@@ -1705,7 +1705,7 @@ default-package-overrides:
   - regex-tdfa ==1.2.3
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
-  - relational-query ==0.11.0.0
+  - relational-query ==0.11.1.0
   - relational-query-HDBC ==0.6.6.1
   - relational-record ==0.2.1.2
   - relational-schemas ==0.1.6.1
@@ -1754,13 +1754,13 @@ default-package-overrides:
   - say ==0.1.0.0
   - sbp ==2.3.16
   - sbv ==7.5
-  - scalendar ==1.2.0
   - SCalendar ==1.1.0
+  - scalendar ==1.2.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
   - schematic ==0.4.2.0
-  - scientific ==0.3.5.3
+  - scientific ==0.3.6.0
   - scotty ==0.11.1
   - scrypt ==0.5.0
   - sdl2 ==2.4.0.1
@@ -1842,7 +1842,7 @@ default-package-overrides:
   - simple-session ==0.10.1.1
   - simple-templates ==0.8.0.1
   - singleton-bool ==0.1.4
-  - singleton-nats ==0.4.0.4
+  - singleton-nats ==0.4.1
   - singletons ==2.3.1
   - siphash ==1.0.3
   - skein ==1.0.9.4
@@ -1989,7 +1989,7 @@ default-package-overrides:
   - tasty-kat ==0.0.3
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.9.2
-  - tasty-rerun ==1.1.10
+  - tasty-rerun ==1.1.11
   - tasty-silver ==3.1.11
   - tasty-smallcheck ==0.8.1
   - tasty-stats ==0.2.0.3
@@ -2262,12 +2262,11 @@ default-package-overrides:
   - websockets-rpc ==0.6.0
   - websockets-simple ==0.0.6.3
   - websockets-snap ==0.10.2.5
-  - weigh ==0.0.7
+  - weigh ==0.0.11
   - wide-word ==0.1.0.6
   - wikicfp-scraper ==0.1.0.9
   - wild-bind ==0.1.2.0
   - wild-bind-x11 ==0.2.0.3
-  - Win32 ==2.5.4.1
   - Win32-notify ==0.3.0.3
   - wire-streams ==0.1.1.0
   - withdependencies ==0.2.4.2
@@ -2296,7 +2295,7 @@ default-package-overrides:
   - writer-cps-morph ==0.1.0.2
   - writer-cps-mtl ==0.1.1.4
   - writer-cps-transformers ==0.1.1.3
-  - wuss ==1.1.8
+  - wuss ==1.1.9
   - X11 ==1.8
   - X11-xft ==0.3.1
   - x11-xim ==0.0.9.0
@@ -2358,7 +2357,7 @@ default-package-overrides:
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.0
   - yesod-table ==2.0.3
-  - yesod-test ==1.6.3
+  - yesod-test ==1.6.4
   - yesod-websockets ==0.3.0
   - yes-precure5-command ==5.5.3
   - yi-core ==0.17.1
-- 
GitLab


From 26e961c1fb194678b7438152081cb9eb4faa6e34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 May 2018 02:31:25 +0200
Subject: [PATCH 0352/1085] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/7b40a148a0a32f0150b0a72f3f916af9723601b7.
---
 .../haskell-modules/hackage-packages.nix      | 919 ++++++------------
 1 file changed, 307 insertions(+), 612 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 197f2d7cb75..3c6a7949df6 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7339,21 +7339,6 @@ self: {
      }) {};
 
   "HCodecs" = callPackage
-    ({ mkDerivation, array, base, bytestring, QuickCheck, random }:
-     mkDerivation {
-       pname = "HCodecs";
-       version = "0.5";
-       sha256 = "0mhp1alx0p9lzq3vm0k802f8ndm2386sshprn9zb8xq8bsd11gxi";
-       libraryHaskellDepends = [
-         array base bytestring QuickCheck random
-       ];
-       testHaskellDepends = [ array base bytestring QuickCheck random ];
-       homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze";
-       description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HCodecs_0_5_1" = callPackage
     ({ mkDerivation, array, base, bytestring, QuickCheck, random
      , semigroups
      }:
@@ -7370,7 +7355,6 @@ self: {
        homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze";
        description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HDBC" = callPackage
@@ -10448,25 +10432,6 @@ self: {
      }) {};
 
   "IPv6Addr" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
-     , network-info, random, test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "IPv6Addr";
-       version = "1.0.2";
-       sha256 = "09gb38m1fw0a1x8saldgsd5x58ycqirk8h6z8dqzpcd7vz23vayn";
-       libraryHaskellDepends = [
-         aeson attoparsec base iproute network network-info random text
-       ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit text
-       ];
-       homepage = "https://github.com/MichelBoucey/IPv6Addr";
-       description = "Library to deal with IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "IPv6Addr_1_0_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
      , network-info, random, test-framework, test-framework-hunit, text
      }:
@@ -10483,7 +10448,6 @@ self: {
        homepage = "https://github.com/MichelBoucey/IPv6Addr";
        description = "Library to deal with IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IPv6DB" = callPackage
@@ -13338,26 +13302,6 @@ self: {
      }) {inherit (pkgs) net_snmp;};
 
   "Network-NineP" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, convertible
-     , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl
-     , network, NineP, regex-posix, stateref, transformers
-     }:
-     mkDerivation {
-       pname = "Network-NineP";
-       version = "0.4.2";
-       sha256 = "136pqyxpjyml0hfblpj6hmhsy2i8r796shcnl0rwljmvw1mhcg6d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers convertible exceptions hslogger
-         monad-loops monad-peel mstate mtl network NineP regex-posix
-         stateref transformers
-       ];
-       description = "High-level abstraction over 9P protocol";
-       license = "unknown";
-     }) {};
-
-  "Network-NineP_0_4_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, convertible
      , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl
      , network, NineP, regex-posix, stateref, transformers
@@ -13375,7 +13319,6 @@ self: {
        ];
        description = "High-level abstraction over 9P protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NewBinary" = callPackage
@@ -19352,26 +19295,6 @@ self: {
      }) {};
 
   "Win32" = callPackage
-    ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32
-     , msimg32, shell32, shfolder, shlwapi, user32, winmm
-     }:
-     mkDerivation {
-       pname = "Win32";
-       version = "2.5.4.1";
-       sha256 = "0r1xzm0w3kg8rqq24j17405ic6yix53r9sq9wpl4zl2sajg3w66c";
-       libraryHaskellDepends = [ base bytestring filepath ];
-       librarySystemDepends = [
-         advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm
-       ];
-       homepage = "https://github.com/haskell/win32";
-       description = "A binding to part of the Win32 library";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
-     }) {advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null; 
-         shell32 = null; shfolder = null; shlwapi = null; user32 = null; 
-         winmm = null;};
-
-  "Win32_2_8_0_0" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "Win32";
@@ -23832,8 +23755,8 @@ self: {
     ({ mkDerivation, base, util }:
      mkDerivation {
        pname = "alg";
-       version = "0.2.2.0";
-       sha256 = "1hhmzlq831618j36yq8kjh4sagmhg3w1ghr53lip06avis2c0gl7";
+       version = "0.2.4.0";
+       sha256 = "1brpqs6xxi7vlpa7230n7910j2zq3w79kw6hfs2xi07kaz0f2lyd";
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
@@ -27277,8 +27200,8 @@ self: {
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.8.0.2";
-       sha256 = "1yph18lklk9hrj1m5gjwygnqbmpg333zyf4bmmm1zvlzflrwj6l9";
+       version = "0.8.0.3";
+       sha256 = "18466bjgsmn2f96i3q6sp5f72paa2flqh40n9h137z29kvr53sva";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
@@ -27287,12 +27210,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ansi-terminal_0_8_0_3" = callPackage
+  "ansi-terminal_0_8_0_4" = callPackage
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.8.0.3";
-       sha256 = "18466bjgsmn2f96i3q6sp5f72paa2flqh40n9h137z29kvr53sva";
+       version = "0.8.0.4";
+       sha256 = "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
@@ -33828,14 +33751,14 @@ self: {
      , gitrev, hspec, http-conduit, HUnit, lifted-base, listsafe, memory
      , monad-control, monad-logger, monad-loops, mtl, network-uri
      , ostree, parsec, parsec-numbers, persistent, persistent-sqlite
-     , persistent-template, process, regex-pcre, resourcet, split, tar
-     , tar-conduit, temporary, text, time, unix, unordered-containers
-     , xml-conduit
+     , persistent-template, regex-pcre, resourcet, split
+     , string-conversions, tar, tar-conduit, temporary, text, time
+     , typed-process, unix, unordered-containers, xml-conduit
      }:
      mkDerivation {
        pname = "bdcs";
-       version = "0.5.0";
-       sha256 = "1anb8nz25a0cvfn6ksn01y6sbjg3cn9pd8lwg8hpjza11hm33kcg";
+       version = "0.6.0";
+       sha256 = "0irxrabxrdf20mc7b0kknnch0fhxgafh2mdrrksj78jx2dbmn85h";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -33846,15 +33769,15 @@ self: {
          directory esqueleto exceptions filepath gi-gio gi-glib gi-ostree
          gitrev http-conduit lifted-base listsafe memory monad-control
          monad-logger mtl network-uri parsec parsec-numbers persistent
-         persistent-sqlite persistent-template process regex-pcre resourcet
-         split tar tar-conduit temporary text time unix unordered-containers
-         xml-conduit
+         persistent-sqlite persistent-template regex-pcre resourcet split
+         string-conversions tar tar-conduit temporary text time
+         typed-process unix unordered-containers xml-conduit
        ];
        libraryPkgconfigDepends = [ ostree ];
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring cond conduit content-store
-         directory filepath monad-logger monad-loops mtl network-uri
-         persistent-sqlite process regex-pcre text time
+         directory filepath lifted-base monad-logger monad-loops mtl
+         network-uri persistent-sqlite regex-pcre text time typed-process
        ];
        testHaskellDepends = [
          aeson base bytestring codec-rpm cond conduit conduit-combinators
@@ -33957,28 +33880,6 @@ self: {
      }) {};
 
   "beam-migrate" = callPackage
-    ({ mkDerivation, aeson, base, beam-core, bytestring, containers
-     , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable
-     , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text
-     , time, unordered-containers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "beam-migrate";
-       version = "0.3.1.0";
-       sha256 = "03chg3xbsvpcq4m4vvmr1jwslaj9ik8v3x8fiw8b5r6x401pf8za";
-       libraryHaskellDepends = [
-         aeson base beam-core bytestring containers deepseq dependent-map
-         dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel
-         pqueue pretty scientific text time unordered-containers uuid-types
-         vector
-       ];
-       homepage = "https://travis.athougies.net/projects/beam.html";
-       description = "SQL DDL support and migrations support library for Beam";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "beam-migrate_0_3_2_0" = callPackage
     ({ mkDerivation, aeson, base, beam-core, bytestring, containers
      , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable
      , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text
@@ -35852,8 +35753,8 @@ self: {
     ({ mkDerivation, base, bindings-DSL, blas, liblapack }:
      mkDerivation {
        pname = "bindings-levmar";
-       version = "1.1.0.4";
-       sha256 = "1dxr9lbgf08a143d4vm78d1iibafzjx6zdlvpdxfri1v523z3sgd";
+       version = "1.1.0.5";
+       sha256 = "1pbxwzslg2b1nn66nk8w5z1ryfz205m94ry9vidzyalpz2wnr074";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ blas liblapack ];
        homepage = "https://github.com/basvandijk/bindings-levmar";
@@ -42480,8 +42381,8 @@ self: {
        pname = "cacophony";
        version = "0.10.0";
        sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv";
-       revision = "1";
-       editedCabalFile = "0j73lknyxlj5zs36sjm3z1z4azqi2zzm5aas6c635k6bqpn4wac6";
+       revision = "2";
+       editedCabalFile = "0w7nq4c5i89vmslxhvzw8299gig2wrr0ayddqjk5dxghmmly3hdw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45905,17 +45806,17 @@ self: {
 
   "chronos" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
-     , hashable, HUnit, primitive, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, torsor
-     , vector
+     , hashable, HUnit, primitive, QuickCheck, semigroups
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, torsor, vector
      }:
      mkDerivation {
        pname = "chronos";
-       version = "1.0.1";
-       sha256 = "1vbjjnsp61km96adlk6ywhhfakmcac680aliavbh18rc00vfi3cj";
+       version = "1.0.3";
+       sha256 = "0xaw13qq3ifjk4x33q5vvbv2k1ydg673s0hsxrdi5kwl2rw0zi70";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring clock hashable primitive text
-         torsor vector
+         aeson attoparsec base bytestring clock hashable primitive
+         semigroups text torsor vector
        ];
        testHaskellDepends = [
          attoparsec base bytestring HUnit QuickCheck test-framework
@@ -49116,19 +49017,6 @@ self: {
      }) {};
 
   "colorful-monoids" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "colorful-monoids";
-       version = "0.2.1.0";
-       sha256 = "0ck5n318al2w0kb00n3vjd17db8bj3laws09iw81kg4y474kcvj2";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/minad/colorful-monoids#readme";
-       description = "Styled console text output using ANSI escape sequences";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "colorful-monoids_0_2_1_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "colorful-monoids";
@@ -49139,7 +49027,6 @@ self: {
        homepage = "https://github.com/minad/colorful-monoids#readme";
        description = "Styled console text output using ANSI escape sequences";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colorize-haskell" = callPackage
@@ -50400,8 +50287,8 @@ self: {
     ({ mkDerivation, base, doctest, QuickCheck }:
      mkDerivation {
        pname = "composition-tree";
-       version = "0.2.0.3";
-       sha256 = "1k2mnb2cy42k0fk2q6lh6qzqm5jnmbjxx1k9g9frlyjmxf8k2920";
+       version = "0.2.0.4";
+       sha256 = "0n707qc1xx96wpq4vl1fs47jkm9vbxp8ff3hi7bj1cnd77yzhf01";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck ];
        homepage = "https://github.com/liamoc/composition-tree";
@@ -61735,8 +61622,8 @@ self: {
      }:
      mkDerivation {
        pname = "df1";
-       version = "0.1";
-       sha256 = "0crcwg63d1m47qj44774ydk9v5sssg08vwbjgh1lg8qvqss7qk8l";
+       version = "0.1.1";
+       sha256 = "1qrgf823bf33g6vvilg9q4v1avdwh0iprf26qypzjsbzykbhj91n";
        libraryHaskellDepends = [
          attoparsec base bytestring containers text time
        ];
@@ -62112,8 +61999,8 @@ self: {
      }:
      mkDerivation {
        pname = "di-df1";
-       version = "1.0";
-       sha256 = "07lz6vb4dxa6j3xxlwxv23gps5xv4rimz571h2n95hhldx8n9jnp";
+       version = "1.0.1";
+       sha256 = "1l83xl2ljql615h33h2l3ckqdx8r0wqjfpygd4xhx975lm3gllck";
        libraryHaskellDepends = [
          base df1 di-core di-handle di-monad stm
        ];
@@ -62146,8 +62033,8 @@ self: {
      }:
      mkDerivation {
        pname = "di-monad";
-       version = "1.0";
-       sha256 = "1kb2dx4whbl0lp0yb5y7m66ma0qywprzy5zs3msxiqfdbc3ghqvx";
+       version = "1.0.2";
+       sha256 = "1s2f2rvchfc6ha8w75rcz5w9706vf9zmxgrimav211vph3hpjkdq";
        libraryHaskellDepends = [
          base containers di-core exceptions mtl pipes stm transformers
        ];
@@ -62945,23 +62832,6 @@ self: {
      }) {};
 
   "diff3" = callPackage
-    ({ mkDerivation, base, Diff, QuickCheck, test-framework
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "diff3";
-       version = "0.3.0";
-       sha256 = "09gamh675nqw8ac6whn05i716k089p7zbyisglifgvvhf1gpmicd";
-       libraryHaskellDepends = [ base Diff ];
-       testHaskellDepends = [
-         base QuickCheck test-framework test-framework-quickcheck2
-       ];
-       homepage = "http://github.com/ocharles/diff3.git";
-       description = "Perform a 3-way difference of documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diff3_0_3_1" = callPackage
     ({ mkDerivation, base, Diff, QuickCheck, test-framework
      , test-framework-quickcheck2
      }:
@@ -62976,7 +62846,6 @@ self: {
        homepage = "http://github.com/ocharles/diff3.git";
        description = "Perform a 3-way difference of documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diffarray" = callPackage
@@ -67276,8 +67145,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamodb-simple";
-       version = "0.5.0.0";
-       sha256 = "12jkl425nzgds8zszhk41ns4mg3rn9mjfmd853b88x6dn9wk95g7";
+       version = "0.6.0.0";
+       sha256 = "0dshi4binsfjrlw7sl1jxa09a1s4qkp3g48x6hchaipk6b1nx960";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-dynamodb base bytestring
          conduit containers double-conversion exceptions generics-sop
@@ -71870,26 +71739,6 @@ self: {
      }) {};
 
   "exception-transformers" = callPackage
-    ({ mkDerivation, base, HUnit, stm, test-framework
-     , test-framework-hunit, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "exception-transformers";
-       version = "0.4.0.6";
-       sha256 = "0abxwkq28wasy06njhaibf8cki9hifk5rjck6r3izbnswjcdn65m";
-       libraryHaskellDepends = [
-         base stm transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit transformers
-         transformers-compat
-       ];
-       description = "Type classes and monads for unchecked extensible exceptions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "exception-transformers_0_4_0_7" = callPackage
     ({ mkDerivation, base, HUnit, stm, test-framework
      , test-framework-hunit, transformers, transformers-compat
      }:
@@ -72067,21 +71916,6 @@ self: {
      }) {};
 
   "exhaustive" = callPackage
-    ({ mkDerivation, base, generics-sop, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "exhaustive";
-       version = "1.1.5";
-       sha256 = "1qkv6ibdp0a7hi57dhxy3yfbwbs1asmjvqs5nh1p34awz7npvrh9";
-       libraryHaskellDepends = [
-         base generics-sop template-haskell transformers
-       ];
-       homepage = "http://github.com/ocharles/exhaustive";
-       description = "Compile time checks that a computation considers producing data through all possible constructors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "exhaustive_1_1_6" = callPackage
     ({ mkDerivation, base, generics-sop, template-haskell, transformers
      }:
      mkDerivation {
@@ -72094,7 +71928,6 @@ self: {
        homepage = "http://github.com/ocharles/exhaustive";
        description = "Compile time checks that a computation considers producing data through all possible constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exherbo-cabal" = callPackage
@@ -72375,17 +72208,22 @@ self: {
      }) {};
 
   "expiring-containers" = callPackage
-    ({ mkDerivation, base, containers, hashable, int-multimap, time
+    ({ mkDerivation, base, containers, hashable, int-multimap
+     , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, time
      , timestamp, unordered-containers
      }:
      mkDerivation {
        pname = "expiring-containers";
-       version = "0.1.1.1";
-       sha256 = "0v35m5bl6y5l4m8gfs6wrcs0pqmgk52aaa261jg92jkvhji21ki5";
+       version = "0.1.2";
+       sha256 = "10j5hqlp7bmiywa79xcgp1a87x6a9kxvzdg061innyh08344k0sv";
        libraryHaskellDepends = [
          base containers hashable int-multimap time timestamp
          unordered-containers
        ];
+       testHaskellDepends = [
+         base containers hashable int-multimap quickcheck-instances tasty
+         tasty-hunit tasty-quickcheck time timestamp unordered-containers
+       ];
        homepage = "https://github.com/metrix-ai/expiring-containers";
        description = "Expiring containers";
        license = stdenv.lib.licenses.mit;
@@ -72732,15 +72570,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "extensible-effects_2_6_1_1" = callPackage
+  "extensible-effects_2_6_2_0" = callPackage
     ({ mkDerivation, base, criterion, HUnit, monad-control, mtl
      , QuickCheck, silently, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, transformers-base
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "2.6.1.1";
-       sha256 = "0rx1m6pw2prgfr0wsgnqf1hqsrwq43clpahk79z972bdmh9v3352";
+       version = "2.6.2.0";
+       sha256 = "1gc7packzrh405sz2v4h088knn192kq0hq6zvjab6xqxmrl6bm6f";
        libraryHaskellDepends = [ base monad-control transformers-base ];
        testHaskellDepends = [
          base HUnit monad-control QuickCheck silently test-framework
@@ -76180,14 +76018,14 @@ self: {
      }) {};
 
   "flay" = callPackage
-    ({ mkDerivation, base, constraints, ghc-prim, tasty
-     , tasty-quickcheck
+    ({ mkDerivation, base, constraints, tasty, tasty-quickcheck
+     , transformers
      }:
      mkDerivation {
        pname = "flay";
-       version = "0.2";
-       sha256 = "1sdwcjjsgq0ba84474pdnvppg66vmqsqn6frb97ricdnyy78lg11";
-       libraryHaskellDepends = [ base constraints ghc-prim ];
+       version = "0.3";
+       sha256 = "1m5580xbmk9113ksx7b5z27b03b9w21ayn9y13hv7dk5khlividx";
+       libraryHaskellDepends = [ base constraints transformers ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/k0001/flay";
        description = "Work generically on your datatype without knowing its shape nor its contents";
@@ -85627,6 +85465,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "github-release_1_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, mime-types, optparse-generic, text
+     , unordered-containers, uri-templater
+     }:
+     mkDerivation {
+       pname = "github-release";
+       version = "1.2.0";
+       sha256 = "0rfg0l5f0g1qdpvj5xsynxkkwgdaxnsphrif02fk48khhad0i4p9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       homepage = "https://github.com/tfausak/github-release#readme";
+       description = "Upload files to GitHub releases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-tools" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, github
      , groom, html, http-client, http-client-tls, monad-parallel
@@ -89152,8 +89015,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-translate";
-       version = "0.4.1";
-       sha256 = "0xpi3qss2cnv0dxgiwffzk6isgfgb95hfd5j62vc5jkjgkyzfqxn";
+       version = "0.5";
+       sha256 = "09mkhbdfcyw2hiqlijnv0lwlk9rka64hqmx8jhrdyksgsz6hc6gl";
        libraryHaskellDepends = [
          aeson base bytestring http-api-data http-client servant
          servant-client text transformers
@@ -93966,25 +93829,6 @@ self: {
      }) {};
 
   "hailgun" = 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.6";
-       sha256 = "0hkz666vd02iknkxv0l60l3ara0yaszc6583sry0shk2cd74lv06";
-       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;
-     }) {};
-
-  "hailgun_0_4_1_7" = callPackage
     ({ mkDerivation, aeson, base, bytestring, email-validate
      , exceptions, filepath, http-client, http-client-tls, http-types
      , tagsoup, text, time, transformers
@@ -94001,7 +93845,6 @@ self: {
        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
@@ -98273,25 +98116,6 @@ self: {
      }) {};
 
   "haskell-src-exts-util" = callPackage
-    ({ mkDerivation, base, containers, data-default, haskell-src-exts
-     , semigroups, transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-src-exts-util";
-       version = "0.2.2";
-       sha256 = "14rhwcrdz3kfb69c64qn8kybl7wnpajrjlfz5p95ca4bva4mwclg";
-       revision = "1";
-       editedCabalFile = "14mrpj2xmpdhib9l5qacslkm4n0rh5yjwy6n5dhp7152m69hgfdl";
-       libraryHaskellDepends = [
-         base containers data-default haskell-src-exts semigroups
-         transformers uniplate
-       ];
-       homepage = "https://github.com/pepeiborra/haskell-src-exts-util";
-       description = "Helper functions for working with haskell-src-exts trees";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src-exts-util_0_2_3" = callPackage
     ({ mkDerivation, base, containers, data-default, haskell-src-exts
      , semigroups, transformers, uniplate
      }:
@@ -98306,7 +98130,6 @@ self: {
        homepage = "https://github.com/pepeiborra/haskell-src-exts-util";
        description = "Helper functions for working with haskell-src-exts trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-meta" = callPackage
@@ -110091,8 +109914,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "hs-functors";
-       version = "0.1.1.0";
-       sha256 = "0fd9sn0l5q6qxk8br0pa6k3sbv3r0ccij6lb9jm1a174kxjfxzma";
+       version = "0.1.2.0";
+       sha256 = "0jhhli0hhhmrh313nnydblyz68rhhmf4g6yrn35m8davj5cg1wd7";
        libraryHaskellDepends = [ base transformers ];
        description = "Functors from products of Haskell and its dual to Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -115545,41 +115368,6 @@ self: {
      }) {};
 
   "http-streams" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
-     , base64-bytestring, blaze-builder, bytestring, Cabal
-     , case-insensitive, directory, ghc-prim, HsOpenSSL, hspec
-     , hspec-expectations, http-common, HUnit, io-streams, lifted-base
-     , mtl, network, network-uri, openssl-streams, snap-core
-     , snap-server, system-fileio, system-filepath, text, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "http-streams";
-       version = "0.8.5.5";
-       sha256 = "1g2ygxyfq2x923df5q83wkrwhy2631r33zvffgj3fn0zwr024hhf";
-       revision = "1";
-       editedCabalFile = "0mgj62khq2abq53y03qww66k74pxhnid8yiqrlhggj9cjv7m2my5";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-builder bytestring
-         case-insensitive directory HsOpenSSL http-common io-streams mtl
-         network network-uri openssl-streams text transformers
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty attoparsec base base64-bytestring blaze-builder
-         bytestring case-insensitive directory ghc-prim HsOpenSSL hspec
-         hspec-expectations http-common HUnit io-streams lifted-base mtl
-         network network-uri openssl-streams snap-core snap-server
-         system-fileio system-filepath text transformers
-         unordered-containers
-       ];
-       homepage = "http://github.com/afcowie/http-streams/";
-       description = "An HTTP client using io-streams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-streams_0_8_6_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base64-bytestring, blaze-builder, bytestring, Cabal
      , case-insensitive, directory, ghc-prim, HsOpenSSL, hspec
@@ -115610,7 +115398,6 @@ self: {
        homepage = "https://github.com/afcowie/http-streams/";
        description = "An HTTP client using io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-test" = callPackage
@@ -120868,8 +120655,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.6.0.5";
-       sha256 = "0fy19z3r6xyzhkkagi050rasc4ak8xmvdgidy4wplayck9fr3z47";
+       version = "0.6.0.6";
+       sha256 = "0ggfnnds3lshiasf2kkyxc3nd5y9b3jr6xraxmwgpikmf21yac4i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120885,7 +120672,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "inline-c_0_6_0_6" = callPackage
+  "inline-c_0_6_1_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
      , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
      , regex-posix, template-haskell, transformers, unordered-containers
@@ -120893,8 +120680,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.6.0.6";
-       sha256 = "0ggfnnds3lshiasf2kkyxc3nd5y9b3jr6xraxmwgpikmf21yac4i";
+       version = "0.6.1.0";
+       sha256 = "0vbfrsqsi7mdziqsnj68bsqlwbqxxhvrmy9rv6w8z18d1m8w3n6h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120940,6 +120727,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-c-cpp_0_2_2_0" = callPackage
+    ({ mkDerivation, base, hspec, inline-c, safe-exceptions
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "inline-c-cpp";
+       version = "0.2.2.0";
+       sha256 = "1sglwjg8agzi3gspv97g999vb0zzsf5c41znqnnnvqx605jpsd5g";
+       libraryHaskellDepends = [
+         base inline-c safe-exceptions template-haskell
+       ];
+       testHaskellDepends = [ base hspec inline-c safe-exceptions ];
+       description = "Lets you embed C++ code into Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inline-c-win32" = callPackage
     ({ mkDerivation, base, containers, inline-c, template-haskell
      , Win32
@@ -122283,6 +122087,8 @@ self: {
        pname = "ip";
        version = "1.2.0";
        sha256 = "09d1y0x5cri08kx5c52jblnj1679z0yw0byigjvwics6pwkgrx0f";
+       revision = "1";
+       editedCabalFile = "09g6nhh6r52dnk6adnxv6qiin6fxif567dl1nca49z5njphcvyl3";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive semigroups text
          vector
@@ -126133,6 +125939,8 @@ self: {
        pname = "jwt";
        version = "0.8.0";
        sha256 = "0ij921vgm0sqlc2ryymqxz6ipgl2iwm0916ny7g5l47qh2fjhcjg";
+       revision = "1";
+       editedCabalFile = "0b0znxxh6zgbq5xhxds2a1yxaqg5rka3xkhlchrbjabi9m5ndp84";
        libraryHaskellDepends = [
          aeson base bytestring containers cryptonite HsOpenSSL http-types
          memory network-uri RSA scientific semigroups text time
@@ -131990,8 +131798,8 @@ self: {
     ({ mkDerivation, base, bindings-levmar, hmatrix, vector }:
      mkDerivation {
        pname = "levmar";
-       version = "1.2.1.7";
-       sha256 = "07sdxa5xbgp26bjpchiy1g2n37chy95v0hfy8al5wyfbnlfws5xg";
+       version = "1.2.1.8";
+       sha256 = "0v2mfqw4irzpfq100i1rm5djfqzvxilq9i7pcslsb92jkcv2zgbc";
        libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
        homepage = "https://github.com/basvandijk/levmar";
        description = "An implementation of the Levenberg-Marquardt algorithm";
@@ -132802,25 +132610,6 @@ self: {
      }) {libsystemd-daemon = null; systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
-    ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
-     , pipes-safe, systemd, text, transformers, uniplate
-     , unix-bytestring, unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "libsystemd-journal";
-       version = "1.4.2";
-       sha256 = "0pdb4spffm4q7xxc3nd8zn4y91v5cf4xmdgb4zls3nnh579h1ygk";
-       libraryHaskellDepends = [
-         base bytestring hashable hsyslog pipes pipes-safe text transformers
-         uniplate unix-bytestring unordered-containers uuid vector
-       ];
-       libraryPkgconfigDepends = [ systemd ];
-       homepage = "http://github.com/ocharles/libsystemd-journal";
-       description = "Haskell bindings to libsystemd-journal";
-       license = stdenv.lib.licenses.bsd3;
-     }) {systemd = null;};
-
-  "libsystemd-journal_1_4_3" = callPackage
     ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
      , pipes-safe, semigroups, systemd, text, transformers, uniplate
      , unix-bytestring, unordered-containers, uuid, vector
@@ -132838,7 +132627,6 @@ self: {
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {systemd = null;};
 
   "libtagc" = callPackage
@@ -135679,17 +135467,18 @@ self: {
      }) {};
 
   "log-effect" = callPackage
-    ({ mkDerivation, base, bytestring, extensible-effects, fast-logger
-     , time
+    ({ mkDerivation, base, bytestring, extensible-effects
+     , monad-control, text, transformers-base
      }:
      mkDerivation {
        pname = "log-effect";
-       version = "0.4.0.1";
-       sha256 = "05rx54bsypisw6k8xm87a4rssyb0lwx7xavwamb1ciiwmvg3j14m";
+       version = "1.0.0";
+       sha256 = "0xj0g5g054ayycdajryischj2yy9rb75cm782sgsj67p04943c5y";
        libraryHaskellDepends = [
-         base bytestring extensible-effects fast-logger time
+         base bytestring extensible-effects monad-control text
+         transformers-base
        ];
-       homepage = "https://github.com/ibotty/log-effect";
+       homepage = "https://github.com/greydot/log-effect";
        description = "An extensible log effect using extensible-effects";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135926,29 +135715,6 @@ self: {
      }) {};
 
   "logging-effect" = callPackage
-    ({ mkDerivation, async, base, bytestring, criterion, exceptions
-     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
-     , semigroups, stm, stm-delay, text, time, transformers
-     , transformers-base, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect";
-       version = "1.2.5";
-       sha256 = "1db8x2rihkddww54cyzww0c65vk90nlnp82xrw226wliknbikri3";
-       libraryHaskellDepends = [
-         async base exceptions free monad-control mtl semigroups stm
-         stm-delay text time transformers transformers-base wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion fast-logger lifted-async monad-logger
-         text time wl-pprint-text
-       ];
-       homepage = "https://github.com/ocharles/logging-effect";
-       description = "A mtl-style monad transformer for general purpose & compositional logging";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "logging-effect_1_2_6" = callPackage
     ({ mkDerivation, async, base, bytestring, criterion, exceptions
      , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
      , semigroups, stm, stm-delay, text, time, transformers
@@ -135969,7 +135735,6 @@ self: {
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-effect-extra" = callPackage
@@ -142773,6 +142538,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mintty_0_1_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "mintty";
+       version = "0.1.2";
+       sha256 = "1njhz7wjmsk5pbr7gfkl95k50npkmm0iyxp3j93bbsg4rmxzg2kw";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/RyanGlScott/mintty";
+       description = "A reliable way to detect the presence of a MinTTY console on Windows";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mios" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, primitive, vector }:
      mkDerivation {
@@ -143694,8 +143472,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-classes";
-       version = "0.3.2.1";
-       sha256 = "0vclcwxy0qc9y1i3iw0ysymcvikn12mi5lfbarxykdhygmi1w5m5";
+       version = "0.3.2.2";
+       sha256 = "15g4llzym636ynf8jrfmlcqn6z4ybwfbg6l8ij73h5m1fkrzwgi7";
        libraryHaskellDepends = [
          base ghc-prim mmorph monad-control peano reflection transformers
          transformers-base transformers-compat
@@ -150113,20 +149891,6 @@ self: {
      }) {};
 
   "network-carbon" = callPackage
-    ({ mkDerivation, base, bytestring, network, text, time, vector }:
-     mkDerivation {
-       pname = "network-carbon";
-       version = "1.0.11";
-       sha256 = "1nkyj9114k2b6gwdd93yfrmf9zbziymbnbh3wxnz0vnk1hl2j5yq";
-       libraryHaskellDepends = [
-         base bytestring network text time vector
-       ];
-       homepage = "http://github.com/ocharles/network-carbon";
-       description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-carbon_1_0_12" = callPackage
     ({ mkDerivation, base, bytestring, network, text, time, vector }:
      mkDerivation {
        pname = "network-carbon";
@@ -150138,7 +149902,6 @@ self: {
        homepage = "http://github.com/ocharles/network-carbon";
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-conduit" = callPackage
@@ -162639,23 +162402,6 @@ self: {
      }) {};
 
   "pipes-group" = callPackage
-    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
-     , pipes-parse, transformers
-     }:
-     mkDerivation {
-       pname = "pipes-group";
-       version = "1.0.9";
-       sha256 = "16yczij987r6j7gzp3nvgl1c5x2b7skvqsq38ns7p9z34kvy8sby";
-       libraryHaskellDepends = [
-         base free pipes pipes-parse transformers
-       ];
-       testHaskellDepends = [ base doctest lens-family-core ];
-       description = "Group streams into substreams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "pipes-group_1_0_10" = callPackage
     ({ mkDerivation, base, doctest, free, lens-family-core, pipes
      , pipes-parse, transformers
      }:
@@ -166085,8 +165831,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-hasql";
-       version = "1.2";
-       sha256 = "1viq19rycrm8zdwj3anqam45hlmdlh9wqji3xf120nk8ffqnwks1";
+       version = "1.3";
+       sha256 = "0n8ysdcg8p40idbbnyrmhjyh1hxhg7nrv5yf03fb0cvx5mwdgh11";
        libraryHaskellDepends = [
          base bytestring hasql potoki potoki-core profunctors text vector
        ];
@@ -168936,20 +168682,6 @@ self: {
      }) {};
 
   "proto-lens-optparse" = callPackage
-    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
-     mkDerivation {
-       pname = "proto-lens-optparse";
-       version = "0.1.1.0";
-       sha256 = "0m32sb05mjajwli9ivrcblkxyy8hrgi8sm2zwjlrjai6aq0ckh1c";
-       libraryHaskellDepends = [
-         base optparse-applicative proto-lens text
-       ];
-       homepage = "https://github.com/google/proto-lens#readme";
-       description = "Adapting proto-lens to optparse-applicative ReadMs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens-optparse_0_1_1_1" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
        pname = "proto-lens-optparse";
@@ -168961,7 +168693,6 @@ self: {
        homepage = "https://github.com/google/proto-lens#readme";
        description = "Adapting proto-lens to optparse-applicative ReadMs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-protobuf-types" = callPackage
@@ -169083,23 +168814,6 @@ self: {
      }) {};
 
   "protocol-buffers" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, filepath, mtl, parsec, syb, utf8-string
-     }:
-     mkDerivation {
-       pname = "protocol-buffers";
-       version = "2.4.8";
-       sha256 = "0inwj82pqbfqbgrzbs47g51k5nkx74hvbr76qc0a7kq0ss0rgnyb";
-       libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath mtl
-         parsec syb utf8-string
-       ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
-       description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers_2_4_9" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, filepath, mtl, parsec, syb, utf8-string
      }:
@@ -169114,25 +168828,9 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
-    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
-     mkDerivation {
-       pname = "protocol-buffers-descriptor";
-       version = "2.4.8";
-       sha256 = "1j8q6qj1gck13qxwrq2cslhw3pcc9kr6h7iqs4229lhsf73lql9a";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers protocol-buffers
-       ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
-       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers-descriptor_2_4_9" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
@@ -169145,7 +168843,6 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -169447,29 +169144,6 @@ self: {
      }) {};
 
   "psqueues" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, deepseq
-     , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
-     , QuickCheck, random, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, unordered-containers
-     }:
-     mkDerivation {
-       pname = "psqueues";
-       version = "0.2.6.0";
-       sha256 = "0n39s1i88j6s7vvsdhpbhcr3gpbwlzabwcc3nbd7nqb4kb4i0sls";
-       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
-       testHaskellDepends = [
-         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq fingertree-psqueue ghc-prim
-         hashable mtl PSQueue random unordered-containers
-       ];
-       description = "Pure priority search queues";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "psqueues_0_2_7_0" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
      , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
      , QuickCheck, random, tagged, test-framework, test-framework-hunit
@@ -169490,7 +169164,6 @@ self: {
        ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pstemmer" = callPackage
@@ -171099,6 +170772,8 @@ self: {
        pname = "quantification";
        version = "0.3";
        sha256 = "0hljd4m55254kmcrp3iar8ya7ky5a73vk3vrmgandmb15fsp2wvy";
+       revision = "1";
+       editedCabalFile = "1kcx4z6xwpbzkydl1kknf5kr1p2ry163jrw5k58f5jpv5gkn7mgn";
        libraryHaskellDepends = [
          aeson base containers ghc-prim hashable path-pieces text
          unordered-containers vector
@@ -176684,29 +176359,6 @@ self: {
      }) {};
 
   "relational-query" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, dlist
-     , names-th, persistable-record, product-isomorphic
-     , quickcheck-simple, sql-words, template-haskell, text
-     , th-reify-compat, time, time-locale-compat, transformers
-     }:
-     mkDerivation {
-       pname = "relational-query";
-       version = "0.11.0.0";
-       sha256 = "0v0syrcagwmwqs9gikhdj0ji3cypfvfy9if8zyajkvxdkxpwvmaz";
-       libraryHaskellDepends = [
-         array base bytestring containers dlist names-th persistable-record
-         product-isomorphic sql-words template-haskell text th-reify-compat
-         time time-locale-compat transformers
-       ];
-       testHaskellDepends = [
-         base containers product-isomorphic quickcheck-simple transformers
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Typeful, Modular, Relational, algebraic query engine";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-query_0_11_1_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, dlist
      , names-th, persistable-record, product-isomorphic
      , quickcheck-simple, sql-words, template-haskell, text
@@ -176727,7 +176379,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Typeful, Modular, Relational, algebraic query engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-query-HDBC" = callPackage
@@ -177685,6 +177336,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "req_1_1_0" = callPackage
+    ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
+     , bytestring, case-insensitive, connection, data-default-class
+     , hspec, hspec-core, hspec-discover, http-api-data, http-client
+     , http-client-tls, http-types, monad-control, mtl, QuickCheck
+     , retry, text, time, transformers, transformers-base
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "req";
+       version = "1.1.0";
+       sha256 = "08jfq1fsqd57l7csw4fg22wppq06wddh8qxxms5z6bay55nqikc7";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson authenticate-oauth base blaze-builder bytestring
+         case-insensitive connection data-default-class http-api-data
+         http-client http-client-tls http-types monad-control mtl retry text
+         time transformers transformers-base
+       ];
+       testHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive
+         data-default-class hspec hspec-core http-client http-types
+         monad-control mtl QuickCheck text time unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
+       doCheck = false;
+       homepage = "https://github.com/mrkkrp/req";
+       description = "Easy-to-use, type-safe, expandable, high-level HTTP client 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
@@ -182685,8 +182368,8 @@ self: {
      }:
      mkDerivation {
        pname = "scientific";
-       version = "0.3.5.3";
-       sha256 = "0j67qa7iqlkx0l9xlgxsyzv53bnrs7fdhv2xj1zlnkn22wsd39hj";
+       version = "0.3.6.0";
+       sha256 = "1rdwqw2xi1c6305vbxa0sfyl18rjgir7flbdz2pbdvaj3nw44lr4";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq hashable integer-gmp
          integer-logarithms primitive text
@@ -182701,7 +182384,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "scientific_0_3_6_0" = callPackage
+  "scientific_0_3_6_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , deepseq, hashable, integer-gmp, integer-logarithms, primitive
      , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
@@ -182709,8 +182392,8 @@ self: {
      }:
      mkDerivation {
        pname = "scientific";
-       version = "0.3.6.0";
-       sha256 = "1rdwqw2xi1c6305vbxa0sfyl18rjgir7flbdz2pbdvaj3nw44lr4";
+       version = "0.3.6.2";
+       sha256 = "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq hashable integer-gmp
          integer-logarithms primitive text
@@ -190199,18 +189882,6 @@ self: {
      }) {};
 
   "singleton-nats" = callPackage
-    ({ mkDerivation, base, singletons }:
-     mkDerivation {
-       pname = "singleton-nats";
-       version = "0.4.0.4";
-       sha256 = "1cizvqiv1hw7an2c2k1mbj9089n6rrggyf5pv2pcl7knpy07hph4";
-       libraryHaskellDepends = [ base singletons ];
-       homepage = "https://github.com/AndrasKovacs/singleton-nats";
-       description = "Unary natural numbers relying on the singletons infrastructure";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "singleton-nats_0_4_1" = callPackage
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "singleton-nats";
@@ -190220,7 +189891,6 @@ self: {
        homepage = "https://github.com/AndrasKovacs/singleton-nats";
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "singleton-typelits" = callPackage
@@ -200429,10 +200099,11 @@ self: {
     ({ mkDerivation, base, Cabal, containers, directory, filepath }:
      mkDerivation {
        pname = "superdoc";
-       version = "0.1.2.5";
-       sha256 = "0b0610pg2b9j5phc0mwsyk8rzp4w77453g4631p3j2wgrjiw425n";
+       version = "0.1.2.7";
+       sha256 = "0pfqvw6a9c29fsar1xiqwbsdc294l9iy3jlc6ax0wxdkfqyqwagv";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal containers directory filepath ];
        libraryHaskellDepends = [
          base Cabal containers directory filepath
        ];
@@ -200478,8 +200149,8 @@ self: {
      }:
      mkDerivation {
        pname = "supermonad";
-       version = "0.2.0.1";
-       sha256 = "15hw8bzafvg492zcdj5f0r67fmrqay5kj9jwfm9wd3qv7k8iszrk";
+       version = "0.2.1.1";
+       sha256 = "1bnj0kva6nh1565fvakwqbx8as7v415fqd7s33dvbfzk8dpkld8z";
        libraryHaskellDepends = [
          base containers fgl ghc mtl transformers
        ];
@@ -203922,23 +203593,6 @@ self: {
      }) {};
 
   "tasty-rerun" = callPackage
-    ({ mkDerivation, base, containers, mtl, optparse-applicative
-     , reducers, split, stm, tagged, tasty, transformers
-     }:
-     mkDerivation {
-       pname = "tasty-rerun";
-       version = "1.1.10";
-       sha256 = "1776fx700wlc9spn0dh3x4nh44x2yg33z9zyqzqlpwrhrkpaz91b";
-       libraryHaskellDepends = [
-         base containers mtl optparse-applicative reducers split stm tagged
-         tasty transformers
-       ];
-       homepage = "http://github.com/ocharles/tasty-rerun";
-       description = "Run tests by filtering the test tree depending on the result of previous test runs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-rerun_1_1_11" = callPackage
     ({ mkDerivation, base, containers, mtl, optparse-applicative
      , reducers, split, stm, tagged, tasty, transformers
      }:
@@ -203953,7 +203607,6 @@ self: {
        homepage = "http://github.com/ocharles/tasty-rerun";
        description = "Run tests by filtering the test tree depending on the result of previous test runs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-silver" = callPackage
@@ -211353,8 +211006,8 @@ self: {
      }:
      mkDerivation {
        pname = "trasa";
-       version = "0.2";
-       sha256 = "1570f4612nfslcxr0mjwf4zzgfninb0mv1d0n6livcks8jd4w4ph";
+       version = "0.3";
+       sha256 = "0v1srhmzwc8vdkwwpik91bvrq73driryl0lyazx7zvpvmqhxkmi6";
        libraryHaskellDepends = [
          base binary bytestring hashable http-media http-types text
          unordered-containers vinyl
@@ -211370,15 +211023,17 @@ self: {
      }) {};
 
   "trasa-client" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, http-client
-     , http-media, http-types, ip, text, trasa, unordered-containers
+    ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive
+     , containers, http-client, http-media, http-types, ip, text, trasa
+     , unordered-containers
      }:
      mkDerivation {
        pname = "trasa-client";
-       version = "0.2";
-       sha256 = "0cgsjaclcqy4nprp7ndr4di1km0fp70zfgv1r4v172mk2q0n06nx";
+       version = "0.3";
+       sha256 = "1cq0wbjv0kbhvprrggbkqqy6h6ixywfr816b9pd2qqmsnw4lq6ns";
        libraryHaskellDepends = [
-         base binary bytestring http-client http-media http-types text trasa
+         base binary bytestring case-insensitive containers http-client
+         http-media http-types text trasa
        ];
        testHaskellDepends = [
          aeson base http-client http-types ip text trasa
@@ -212449,8 +212104,8 @@ self: {
     ({ mkDerivation, base, generics-sop }:
      mkDerivation {
        pname = "tuple-sop";
-       version = "0.2.0.1";
-       sha256 = "1l2llpn3b3v5hly3bpzyhzagnrrs830xgpqaab8w1rcbhkmqby12";
+       version = "0.3.0.0";
+       sha256 = "1m9xsjnnyavms4hxgdam79vc9c4bf6ssmammmzvvidqvyl9z1g15";
        libraryHaskellDepends = [ base generics-sop ];
        testHaskellDepends = [ base generics-sop ];
        homepage = "https://github.com/Ferdinand-vW/tuple-sop#readme";
@@ -213005,23 +212660,18 @@ self: {
      }) {};
 
   "twiml" = callPackage
-    ({ mkDerivation, base, Cabal, data-default, deepseq, Diff, HUnit
-     , lens, network-uri, parsec, should-not-typecheck, template-haskell
-     , text, void, xml
+    ({ mkDerivation, base, data-default, deepseq, doctest, lens
+     , network-uri, parsec, template-haskell, text, void, xml
      }:
      mkDerivation {
        pname = "twiml";
-       version = "0.2.0.1";
-       sha256 = "1x4jhvz0590zlpy74yjwjxkrllk7yvpgf2srkisi10klmarsjygd";
-       enableSeparateDataOutput = true;
+       version = "0.2.1.0";
+       sha256 = "1y6szzr951if5lal2rfknybd11a2r13xrykpsyrqvq5dzq2yx67z";
        libraryHaskellDepends = [
          base data-default deepseq lens network-uri parsec template-haskell
          text void xml
        ];
-       testHaskellDepends = [
-         base Cabal data-default deepseq Diff HUnit lens
-         should-not-typecheck void
-       ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/markandrus/twiml-haskell";
        description = "TwiML library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -215077,6 +214727,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "unexceptionalio_0_4_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "unexceptionalio";
+       version = "0.4.0";
+       sha256 = "09gynk472l7nn5l2w320n4dwigwp0wh0shfp6dyw6r5h2jdxz18p";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/singpolyma/unexceptionalio";
+       description = "IO without any non-error, synchronous exceptions";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "unexceptionalio-trans" = callPackage
+    ({ mkDerivation, base, transformers, unexceptionalio }:
+     mkDerivation {
+       pname = "unexceptionalio-trans";
+       version = "0.4.0";
+       sha256 = "19jzvxx0z4w7d1mp09spiz01sd349376hf5xkg8r2zfr8fx7hj71";
+       libraryHaskellDepends = [ base transformers unexceptionalio ];
+       homepage = "https://github.com/singpolyma/unexceptionalio-trans";
+       description = "A wrapper around UnexceptionalIO using monad transformers";
+       license = "unknown";
+     }) {};
+
   "unfoldable" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
      , random, transformers
@@ -217355,14 +217030,25 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "util";
-       version = "0.1.7.0";
-       sha256 = "1g5pgwkw1kqfskk131v2vaqcvyxqgslff62qamjz4dzray9fa9cp";
+       version = "0.1.10.0";
+       sha256 = "1cp7vxhg6m02j7zj7z6zss38rsykrk596qakzczsxjx7yraxwdxb";
        libraryHaskellDepends = [ base ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "util-exception" = callPackage
+    ({ mkDerivation, base, lifted-base, monad-control, util }:
+     mkDerivation {
+       pname = "util-exception";
+       version = "0.1.0.0";
+       sha256 = "0y1d1y421sx8imibi235zc2f3cpjgg9pl6wkmigrxn4q4nwigkbr";
+       libraryHaskellDepends = [ base lifted-base monad-control util ];
+       description = "Exceptional utilities";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "util-plus" = callPackage
     ({ mkDerivation, array, base, containers, hashable, HTF, QuickCheck
      , safe, unordered-containers
@@ -223572,23 +223258,6 @@ self: {
      }) {};
 
   "weigh" = callPackage
-    ({ mkDerivation, base, deepseq, mtl, process, split
-     , template-haskell, temporary
-     }:
-     mkDerivation {
-       pname = "weigh";
-       version = "0.0.7";
-       sha256 = "1k5mxk0cn82x1lc1j0ik4sfkr0q4ipa2ls9sm5g39hl6bjwp1lp3";
-       libraryHaskellDepends = [
-         base deepseq mtl process split template-haskell temporary
-       ];
-       testHaskellDepends = [ base deepseq ];
-       homepage = "https://github.com/fpco/weigh#readme";
-       description = "Measure allocations of a Haskell functions/values";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "weigh_0_0_11" = callPackage
     ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
      mkDerivation {
        pname = "weigh";
@@ -223601,7 +223270,6 @@ self: {
        homepage = "https://github.com/fpco/weigh#readme";
        description = "Measure allocations of a Haskell functions/values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weighted" = callPackage
@@ -224429,12 +224097,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "wl-pprint-text_1_1_1_1" = callPackage
+  "wl-pprint-text_1_2_0_0" = callPackage
     ({ mkDerivation, base, base-compat, text }:
      mkDerivation {
        pname = "wl-pprint-text";
-       version = "1.1.1.1";
-       sha256 = "1v227rc24ibb6qxiyhq9v9hv8ilkrm6i1snl5icblm8zgvpymplb";
+       version = "1.2.0.0";
+       sha256 = "0g3w92rad6x5appfb22rbzcas2ix2h0hy91sdxhq8a4a5cnlrpa0";
        libraryHaskellDepends = [ base base-compat text ];
        description = "A Wadler/Leijen Pretty Printer for Text values";
        license = stdenv.lib.licenses.bsd3;
@@ -225519,21 +225187,6 @@ self: {
      }) {};
 
   "wuss" = callPackage
-    ({ mkDerivation, base, bytestring, connection, network, websockets
-     }:
-     mkDerivation {
-       pname = "wuss";
-       version = "1.1.8";
-       sha256 = "1isw32n4qdaip350928v7v7cph4p4sb28hva5vd3jvq4309n65df";
-       libraryHaskellDepends = [
-         base bytestring connection network websockets
-       ];
-       homepage = "https://github.com/tfausak/wuss#readme";
-       description = "Secure WebSocket (WSS) clients";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wuss_1_1_9" = callPackage
     ({ mkDerivation, base, bytestring, connection, network, websockets
      }:
      mkDerivation {
@@ -225546,7 +225199,6 @@ self: {
        homepage = "https://github.com/tfausak/wuss#readme";
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wx" = callPackage
@@ -228247,6 +227899,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_30" = callPackage
+    ({ mkDerivation, aeson, 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.30";
+       sha256 = "11dyjqs1rzhpidzfqdw3lg8rsm32jhjph54kc68k4dwib6fnwnyi";
+       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 ];
+       testHaskellDepends = [
+         aeson 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
@@ -229545,6 +229227,47 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_6_5" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
+     , blaze-markup, byteable, bytestring, case-insensitive, cereal
+     , clientsession, conduit, conduit-extra, containers, cookie
+     , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec
+     , hspec-expectations, http-types, HUnit, monad-logger, mtl, network
+     , old-locale, parsec, path-pieces, primitive, QuickCheck, random
+     , resourcet, safe, semigroups, shakespeare, streaming-commons
+     , template-haskell, text, time, transformers, unix-compat, unliftio
+     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
+     , word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.6.5";
+       sha256 = "0yj06bfw7cln4waf76nfj1dm1f5fd13i896f5iy33035xc0bwiml";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-html blaze-markup byteable bytestring
+         case-insensitive cereal clientsession conduit conduit-extra
+         containers cookie deepseq deepseq-generics directory fast-logger
+         http-types monad-logger mtl old-locale parsec path-pieces primitive
+         random resourcet safe semigroups shakespeare template-haskell text
+         time transformers unix-compat unliftio unordered-containers vector
+         wai wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base bytestring clientsession conduit conduit-extra
+         containers cookie hspec hspec-expectations http-types HUnit network
+         path-pieces QuickCheck random resourcet shakespeare
+         streaming-commons template-haskell text transformers unliftio wai
+         wai-extra
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring gauge 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
@@ -230767,33 +230490,6 @@ self: {
      }) {};
 
   "yesod-test" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, conduit, containers
-     , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
-     , network, persistent, pretty-show, semigroups, text, time
-     , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types
-     , yesod-core, yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.6.3";
-       sha256 = "0mxjkk6bkxgjpdifvz7qlqg0ms1xh19b8r7f96lp0pcnfksnil4d";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive conduit containers cookie hspec-core html-conduit
-         http-types HUnit network persistent pretty-show semigroups text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit text
-         unliftio wai wai-extra 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_6_4" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, conduit, containers
      , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
@@ -230818,7 +230514,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
-- 
GitLab


From c5338e5acb9c1af43aa95ffa31a24c4cde1fec1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 May 2018 11:30:36 +0200
Subject: [PATCH 0353/1085] haskell-gi: remember the URL to the PR that
 explains why the override is necessary

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2c16b37bba8..45560de984f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -422,8 +422,7 @@ self: super: {
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
 
-  # The doctest phase fails because it does not have a proper environment in
-  # which to run the commands it's ought to test.
+  # https://github.com/haskell-gi/haskell-gi/pull/163
   haskell-gi = dontCheck super.haskell-gi;
 
   # https://github.com/basvandijk/threads/issues/10
-- 
GitLab


From 6db7f92cc2af827e8b8b181bf5ed828a1d0f141d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 May 2018 17:48:02 +0200
Subject: [PATCH 0354/1085] all-cabal-hashes: update to latest version

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index e758c56f023..1ef00de5b83 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/462dbb7e8a2ca65807ae21d1cc5f5c5454a9a327.tar.gz";
-  sha256 = "09rq2r9ydvmhk9182xl0yz4dbr84ncj8a7fc2qzln784zrd12aph";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a2febcad5a83b15dea74462890e3c48c13f55f1.tar.gz";
+  sha256 = "1z6mfk49hsxvcpv183wayirspx78xd1l0w42wf8mfyf0jh8grfff";
 }
-- 
GitLab


From a365b59deb07f0ffd0eff329a92a3cbc56ae1521 Mon Sep 17 00:00:00 2001
From: Valentin Heidelberger <github@valentinsblog.com>
Date: Tue, 8 May 2018 19:19:49 +0200
Subject: [PATCH 0355/1085] keepassxc: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 0e1aecaab1d..373320dfe15 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -26,13 +26,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassxc-${version}";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "1xlg8zb22c2f1pi2has4f4qwggd0m2z254f0d6jrgz368x4g3p87";
+    sha256 = "13gf7rsan6fjkdr46xkr08d150nh194fkbzb4cazwd7rf05agw1y";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
-- 
GitLab


From 4a30fc25228a02d3aa3bf374b1643a400433cb39 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Tue, 8 May 2018 01:36:33 +0200
Subject: [PATCH 0356/1085] bamf: init at 0.5.3

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

diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
new file mode 100644
index 00000000000..dd926ac2081
--- /dev/null
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig
+, libstartup_notification, gobjectIntrospection, gtk-doc
+, python27, pythonPackages, libxml2 }:
+
+stdenv.mkDerivation rec {
+  pname = "bamf";
+  version = "0.5.3";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz";
+    sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    gtk-doc
+    gobjectIntrospection
+  ];
+
+  buildInputs = [ libgtop libwnck3 vala libstartup_notification
+                  python27 pythonPackages.libxslt libxml2 glib ];
+
+  postPatch = ''
+    substituteInPlace data/Makefile.in \
+      --replace '/usr/lib/systemd/user' '@datarootdir@/systemd/user'
+  '';
+
+  # fix paths
+  makeFlags = [
+    "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+  ];
+
+  # ignore deprecation errors
+  NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+
+  meta = with stdenv.lib; {
+    description = "Application matching framework";
+    longDescription = ''
+      Removes the headache of applications matching
+      into a simple DBus daemon and c wrapper library.
+    '';
+    homepage = https://launchpad.net/bamf;
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ davidak ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d0b125b8a2..a654d197d3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8527,6 +8527,8 @@ with pkgs;
 
   backward-cpp = callPackage ../development/libraries/backward-cpp { };
 
+  bamf = callPackage ../development/libraries/bamf { };
+
   bctoolbox = callPackage ../development/libraries/bctoolbox {
     mbedtls = mbedtls_1_3;
   };
-- 
GitLab


From 296e7717e0be6d45ce5da17d4d42d81f9647b6d5 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Tue, 8 May 2018 01:36:59 +0200
Subject: [PATCH 0357/1085] plank: init at 0.11.4

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

diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
new file mode 100644
index 00000000000..3e69f4a97c1
--- /dev/null
+++ b/pkgs/applications/misc/plank/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
+, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
+, bamf, gdk_pixbuf, libdbusmenu-gtk3, file
+, wrapGAppsHook, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  pname = "plank";
+  version = "0.11.4";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://launchpad.net/${pname}/1.0/${version}/+download/${name}.tar.xz";
+    sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    libxml2 # xmllint
+    wrapGAppsHook
+    gobjectIntrospection
+  ];
+
+  buildInputs = [ vala atk cairo glib gnome3.gnome-menus
+                  gtk3 gnome3.libgee libwnck3 libX11 libXfixes
+                  libXi pango gnome3.gnome-common bamf gdk_pixbuf
+                  libdbusmenu-gtk3 gnome3.dconf ];
+
+  # fix paths
+  makeFlags = [
+    "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+  ];
+
+  postPatch = ''
+    substituteInPlace ./configure \
+      --replace "/usr/bin/file" "${file}/bin/file"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Elegant, simple, clean dock";
+    homepage = https://launchpad.net/plank;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ davidak ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a654d197d3c..8bdb6666e3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17088,6 +17088,8 @@ with pkgs;
 
   pijul = callPackage ../applications/version-management/pijul {};
 
+  plank = callPackage ../applications/misc/plank { };
+
   planner = callPackage ../applications/office/planner { };
 
   playonlinux = callPackage ../applications/misc/playonlinux {
-- 
GitLab


From e711da345ca51744b37aa9249bb84d4faea10082 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 28 Oct 2017 17:58:59 +0300
Subject: [PATCH 0358/1085] base profile: add mkpasswd to system packages

Allows the user to generate password hashes for the installed system easier.
---
 nixos/modules/profiles/base.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 3bf06a95119..52481d90eab 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -17,6 +17,7 @@
     pkgs.ddrescue
     pkgs.ccrypt
     pkgs.cryptsetup # needed for dm-crypt volumes
+    pkgs.mkpasswd # for generating password files
 
     # Some networking tools.
     pkgs.fuse
-- 
GitLab


From 88946527a50324ab0c8c0861529ad679b33c9e0d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 8 May 2018 23:19:47 +0200
Subject: [PATCH 0359/1085] eclipse-plugin-jsonedit: 1.1.0 -> 1.1.1

---
 pkgs/applications/editors/eclipse/plugins.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 136ef7dfc23..adb763c1250 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -432,11 +432,11 @@ rec {
 
   jsonedit = buildEclipsePlugin rec {
     name = "jsonedit-${version}";
-    version = "1.1.0";
+    version = "1.1.1";
 
     srcFeature = fetchurl {
       url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar";
-      sha256 = "1qqbzh9sv0s9p0irim7kimvzdkw0hg6yv090bz5ifpzqdxc4v9r5";
+      sha256 = "0zkg8d8x3l5jpfxi0mz9dn62wmy4fjgpwdikj280fvsklmcw5b86";
     };
 
     srcPlugins =
@@ -448,13 +448,13 @@ rec {
           };
       in
         map fetch [
-          { n = "core"; h = "1fl4api6j0wp4vfbyabxqsrjvvpclp8p3b4xnxxpn4v8g12q526m"; }
-          { n = "editor"; h = "1kn15qampdlpxblj2bv94b3bb15qfwng27lk0n578585yqmb3p66"; }
-          { n = "folding"; h = "1qnzdx4xx9ma3p6lg1ab8xf3nik1yrww33nksi0j3vnvh8i9ihdm"; }
-          { n = "model"; h = "0n8855ma1h2as0skrrp2qy3sdkmnhl5vlqxcjv8xlc3faa72174a"; }
-          { n = "outline"; h = "07i2spmzghs49pkxl8z9c29n6l38x26v20prkh4a7i1rf9whg1q8"; }
-          { n = "preferences"; h = "0d1m8pb903wpc4vvhsp0gx0h65r432ax898wif3a23c5wxj4nh9i"; }
-          { n = "text"; h = "0z80d9qgpbx88jrq8b4r478lrcrf52gxqkl94l13wrk7rszjpldh"; }
+          { n = "core"; h = "0svs0aswnhl26cqw6bmw30cisx4cr50kc5njg272sy5c1dqjm1zq"; }
+          { n = "editor"; h = "1q62dinrbb18aywbvii4mlr7rxa20rdsxxd6grix9y8h9776q4l5"; }
+          { n = "folding"; h = "1qh4ijfb1gl9xza5ydi87v1kyima3a9sh7lncwdy1way3pdhln1y"; }
+          { n = "model"; h = "1pr6k2pdfdwx8jqs7gx7wzn3gxsql3sk6lnjha8m15lv4al6d4kj"; }
+          { n = "outline"; h = "1jgr2g16j3id8v367jbgd6kx6g2w636fbzmd8jvkvkh7y1jgjqxm"; }
+          { n = "preferences"; h = "027fhaqa5xbil6dmhvkbpha3pgw6dpmc2im3nlliyds57mdmdb1h"; }
+          { n = "text"; h = "0clywylyidrxlqs0n816nhgjmk1c3xl7sn904ki4q050amfy0wb2"; }
         ];
 
     propagatedBuildInputs = [ antlr-runtime_4_7 ];
-- 
GitLab


From 92af917827cd7f56ffcb525ff05cad3d633e587e Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 8 May 2018 18:17:44 -0500
Subject: [PATCH 0360/1085] git-secrets: fix homepage url

---
 .../version-management/git-and-tools/git-secrets/default.nix    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
index 14026df8185..a2f0c8ae414 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation {
 
   meta = {
     description = "Prevents you from committing passwords and other sensitive information to a git repository";
-    homepage = https://github.com/awslabs/git-secretshttps://github.com/awslabs/git-secrets;
+    homepage = https://github.com/awslabs/git-secrets;
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.all;
   };
-- 
GitLab


From 2cac5d73ce022d2c6e82cec39b7de973c08b55c4 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Mon, 5 Mar 2018 14:31:01 -0800
Subject: [PATCH 0361/1085] cloud-sql-proxy: init at 1.11

---
 pkgs/tools/misc/cloud-sql-proxy/default.nix | 28 ++++++++++++
 pkgs/tools/misc/cloud-sql-proxy/deps.nix    | 48 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 3 files changed, 78 insertions(+)
 create mode 100644 pkgs/tools/misc/cloud-sql-proxy/default.nix
 create mode 100644 pkgs/tools/misc/cloud-sql-proxy/deps.nix

diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix
new file mode 100644
index 00000000000..5059b395610
--- /dev/null
+++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "cloud-sql-proxy-${version}";
+  version = "1.11";
+
+  goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy";
+
+  subPackages = [ "cmd/cloud_sql_proxy" ];
+
+  src = fetchgit {
+    rev = version;
+    url = "https://${goPackagePath}";
+    sha256 = "13g68i51f03xdh7a1qjmj8j5ljn4drd3n44fn348xfdxqclnx90l";
+  };
+
+  goDeps = ./deps.nix;
+
+  buildFlagsArray = [ "-ldflags=" "-X main.versionString=${version}" ];
+
+  meta = with stdenv.lib; {
+    description = "An authenticating proxy for Second Generation Google Cloud SQL databases";
+    homepage = https://github.com/GoogleCloudPlatform/cloudsql-proxy;
+    license = licenses.asl20;
+    maintainers = [ maintainers.nicknovitski ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/misc/cloud-sql-proxy/deps.nix b/pkgs/tools/misc/cloud-sql-proxy/deps.nix
new file mode 100644
index 00000000000..7021b4b05b2
--- /dev/null
+++ b/pkgs/tools/misc/cloud-sql-proxy/deps.nix
@@ -0,0 +1,48 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "bazil.org/fuse";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bazil/fuse";
+      rev = "65cc252bf6691cb3c7014bcb2c8dc29de91e3a7e";
+      sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk";
+    };
+  }
+  {
+    goPackagePath = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev = "e9284bade4f43071dac5ec56c73a03a3c9fa7772";
+      sha256 = "0qm0s97bj21m04a07yni09hdh0aycgmklm5mg6flx17lrp2av9j8";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "3a7846fea0afe8cc88deb31d8cfb1fa15a3615ef";
+      sha256 = "1dxvliqc79bl0waczzy8ajm7jpbnn2bszwfcd71zjjxph8jz75kg";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269";
+      sha256 = "182is558nfvk4x1cm8sqzaym8kfcaaxaga9ggqhvzqrs8mncbj22";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/api";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/google-api-go-client";
+      rev = "20530fd5d65ad2caee87891f9896d7547cb400c9";
+      sha256 = "06fsnml2kfzifxp2d5anb6vxjlgpkwl82xcddf0cg0v1bnx5mnrd";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24b33231f77..d8e1943157d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -609,6 +609,8 @@ with pkgs;
 
   bonfire = callPackage ../tools/misc/bonfire { };
 
+  cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { };
+
   container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
 
   cconv = callPackage ../tools/text/cconv { };
-- 
GitLab


From 48808f1c93502359147bf92aca298db093339ae4 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Wed, 9 May 2018 10:19:38 +1000
Subject: [PATCH 0362/1085] singularity: add missing file dependency

---
 pkgs/applications/virtualization/singularity/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 2048d7d2ed9..b6f4a5976e4 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -14,6 +14,7 @@
 , curl
 , utillinux
 , libarchive
+, file
  }:
 
 stdenv.mkDerivation rec {
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper ];
-  buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux libarchive ];
+  buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux libarchive file ];
 
   meta = with stdenv.lib; {
     homepage = http://singularity.lbl.gov/;
-- 
GitLab


From 2be9f022012a499c941e3a044a70f90388cd946d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 9 May 2018 03:12:24 +0200
Subject: [PATCH 0363/1085] gnome3.gnome-clocks: add fallback sound theme

---
 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 09c00677199..78366755ad6 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
-, vala, gobjectIntrospection, libxml2, gtk3, glib, gsound
+, vala, gobjectIntrospection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
 , gnome3, gdk_pixbuf, geoclue2, libgweather }:
 
 stdenv.mkDerivation rec {
@@ -30,6 +30,13 @@ stdenv.mkDerivation rec {
     gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound
   ];
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      # Fallback sound theme
+      --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"
+    )
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Clocks;
     description = "Clock application designed for GNOME 3";
-- 
GitLab


From a4c86b421f13a8dec9c2a639ebb78d50f4f0461c Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Tue, 8 May 2018 21:33:38 -0400
Subject: [PATCH 0364/1085] webkitgtk: add missing libXdamage dependency

Closes #40193
---
 pkgs/development/libraries/webkitgtk/2.4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 18d20bf9c78..39a76a74711 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk2 libwebp enchant
     libxml2 libxslt
-    gst-plugins-base sqlite xorg.libXt
+    gst-plugins-base sqlite xorg.libXt xorg.libXdamage
   ] ++ optionals enableCredentialStorage [
     libsecret
   ] ++ (if stdenv.isDarwin then [
-- 
GitLab


From 33bc4a7b3bf25caa4f2d16da2ced4d80b4724189 Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack@jackkelly.name>
Date: Wed, 9 May 2018 12:05:26 +1000
Subject: [PATCH 0365/1085] haskellPackages.blank-canvas_0_6_2: dontCheck

Same reason as 2d01bb7f6a5ab80fa7e7f03559e082ba42140db6, but for the
specific-version package.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index acbcb1320e6..9f6959542df 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -502,6 +502,7 @@ self: super: builtins.intersectAttrs super {
 
   # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
   blank-canvas = dontCheck super.blank-canvas;
+  blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
 
   # cabal2nix generates a dependency on base-compat, which is the wrong version
   base-compat-batteries = super.base-compat-batteries.override {
-- 
GitLab


From f6e061f62f63028959f0921963c4e6738db5662f Mon Sep 17 00:00:00 2001
From: Nathan Smyth <nathan.smyth@mongodb.com>
Date: Wed, 9 May 2018 12:14:37 +1000
Subject: [PATCH 0366/1085] mongodb-compass: init at 1.13.1

---
 pkgs/tools/misc/mongodb-compass/default.nix | 86 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 88 insertions(+)
 create mode 100644 pkgs/tools/misc/mongodb-compass/default.nix

diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix
new file mode 100644
index 00000000000..f8475ee2e0e
--- /dev/null
+++ b/pkgs/tools/misc/mongodb-compass/default.nix
@@ -0,0 +1,86 @@
+{ stdenv, fetchurl, dpkg
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
+, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }:
+
+let
+
+  version = "1.13.1";
+
+  rpath = stdenv.lib.makeLibraryPath [
+    alsaLib
+    atk
+    cairo
+    cups
+    curl
+    dbus
+    expat
+    fontconfig
+    freetype
+    glib
+    gnome2.GConf
+    gnome2.gdk_pixbuf
+    gnome2.gtk
+    gnome2.pango
+    libnotify
+    libxcb
+    nspr
+    nss
+    stdenv.cc.cc
+    systemd
+
+    xorg.libxkbfile
+    xorg.libX11
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libXScrnSaver
+  ] + ":${stdenv.cc.cc.lib}/lib64";
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
+        sha256 = "0x23jshnr0rafm5sn2vhq2y2gryg8mksahzyv5fszblgaxay234p";
+      }
+    else
+      throw "MongoDB compass is not supported on ${stdenv.system}";
+
+in stdenv.mkDerivation {
+  name = "mongodb-compass-${version}";
+
+  inherit src;
+
+  buildInputs = [ dpkg ];
+  unpackPhase = "true";
+
+  buildCommand = ''
+    IFS=$'\n'
+    dpkg -x $src $out
+    cp -av $out/usr/* $out
+    rm -rf $out/share/lintian
+    #The node_modules are bringing in non-linux files/dependencies
+    find $out -name "*.app" -exec rm -rf {} \; || true
+    find $out -name "*.dll" -delete
+    find $out -name "*.exe" -delete
+    # Otherwise it looks "suspicious"
+    chmod -R g-w $out
+    for file in `find $out -type f -perm /0111 -o -name \*.so\*`; do
+      echo "Manipulating file: $file"
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+      patchelf --set-rpath ${rpath}:$out/share/mongodb-compass "$file" || true
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The GUI for MongoDB";
+    homepage = https://www.mongodb.com/products/compass;
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 719a5c66db7..e76826407f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1420,6 +1420,8 @@ with pkgs;
 
   mcrypt = callPackage ../tools/misc/mcrypt { };
 
+  mongodb-compass = callPackage ../tools/misc/mongodb-compass { };
+  
   mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
 
   mozlz4a = callPackage ../tools/compression/mozlz4a {
-- 
GitLab


From b6f3fcf1405415dd290f23f955568ab290e8de2f Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Tue, 8 May 2018 20:03:14 +0200
Subject: [PATCH 0367/1085] multibootusb: init at 9.2.0

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

diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix
new file mode 100644
index 00000000000..02541842c36
--- /dev/null
+++ b/pkgs/applications/misc/multibootusb/default.nix
@@ -0,0 +1,59 @@
+{ lib, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5 }:
+python36Packages.buildPythonApplication rec {
+  pname = "multibootusb";
+  name = "${pname}-${version}";
+  version = "9.2.0";
+
+  buildInputs = [
+    python36Packages.dbus-python
+    python36Packages.pyqt5
+    python36Packages.pytest-shutil
+    python36Packages.python
+    python36Packages.pyudev
+    python36Packages.six
+    libxcb
+    mtools
+    p7zip
+    parted
+    procps
+    qt5.full
+    utillinux
+  ];
+
+  src = fetchFromGitHub {
+    owner = "mbusb";
+    repo = pname;
+    rev = "v${version}";
+
+    sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3";
+  };
+
+  # Skip the fixup stage where stuff is shrinked (can't shrink text files)
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    share="$out/share/${pname}"
+    mkdir -p "$share"
+    cp -r data "$share/data"
+    cp -r scripts "$share/scripts"
+    cp "${pname}" "$share/${pname}"
+
+    mkdir "$out/bin"
+    cat > "$out/bin/${pname}" <<EOF
+      #!/bin/sh
+      cd "$share"
+      export PYTHONPATH="$PYTHONPATH:$share"
+      export PATH="$PATH:${parted}/bin:${procps}/bin"
+
+      "${python36Packages.python}/bin/python" "${pname}"
+    EOF
+    chmod +x "$out/bin/${pname}"
+  '';
+
+  meta = with lib; {
+    description = "Multiboot USB creator for Linux live disks";
+    homepage = http://multibootusb.org/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ jD91mZM2 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6759098dfa..c2708ef7bfb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16094,6 +16094,8 @@ with pkgs;
 
   moe =  callPackage ../applications/editors/moe { };
 
+  multibootusb = callPackage ../applications/misc/multibootusb {};
+
   praat = callPackage ../applications/audio/praat { };
 
   quvi = callPackage ../applications/video/quvi/tool.nix {
-- 
GitLab


From 444d43de3f5719c6d632893fb55179f8a4e756d6 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Wed, 9 May 2018 00:40:32 -0400
Subject: [PATCH 0368/1085] twine: update 1.9.1 -> 1.11.0

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

diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index 63f8c3b9055..9cb3a09d363 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "twine";
-  version = "1.9.1";
+  version = "1.11.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "caa45b7987fc96321258cd7668e3be2ff34064f5c66d2d975b641adca659c1ab";
+    sha256 = "09cz9v63f8mrs4znbjapjj2z3wdfryq8q364zm0wzjhbzzcs9n9g";
   };
 
   propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 ];
-- 
GitLab


From ab613b933671e2d4bbdfeda81ad8356ea3a88152 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 9 May 2018 14:31:26 +0900
Subject: [PATCH 0369/1085] wireshark: run binary from nix-shell

when in a shell, export variable WIRESHARK_RUN_FROM_BUILD_DIRECTORY to be able to run the newly built wireshark
else one get:
./build/run/wireshark: error while loading shared libraries: libwscodecs.so.0: cannot open shared object file: No such file or directory

see https://github.com/NixOS/nixpkgs/issues/29638
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index d8ff5f3100a..8c745a4aa3f 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -82,6 +82,11 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  shellHook = ''
+    # to be able to run the resulting binary
+    export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://www.wireshark.org/;
     description = "Powerful network protocol analyzer";
-- 
GitLab


From 1276e82c2ec22fc17c14f6d1a5933acf87320e7b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 2 May 2018 15:14:22 +0000
Subject: [PATCH 0370/1085] coqPackages.dpdgraph: init at 0.6.3 for Coq 8.8

---
 pkgs/development/coq-modules/dpdgraph/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index 390ced8fdad..5b9437e7c27 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -1,6 +1,11 @@
 { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:
 
 let params = {
+  "8.8" = {
+    version = "0.6.3";
+    rev = "0acbd0a594c7e927574d5f212cc73a486b5305d2";
+    sha256 = "0c95b0bz2kjm6swr5na4gs06lxxywradszxbr5ldh2zx02r3f3rx";
+  };
   "8.7" = {
     version = "0.6.2";
     rev = "d76ddde37d918569945774733b7997e8b24daf51";
-- 
GitLab


From 97263dfb928646b40a9a1407e79b9fb257df33fb Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Wed, 9 May 2018 09:59:52 +0300
Subject: [PATCH 0371/1085] bat: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 5516f4a26a3..b869f1e634c 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -2,24 +2,24 @@
 
 rustPlatform.buildRustPackage rec {
   name    = "bat-${version}";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = "bat";
     rev    = "v${version}";
-    sha256 = "0qbjkrakcpvnzzljifykw88g0qmmk60id23sjvhp4md54h4xg29p";
+    sha256 = "15d7i0iy5lks3jg9js6n6fy4xanjk76fpryl2kq88kdkq67hpzfp";
   };
 
-  cargoSha256 = "07r10wwxv8svrw94djl092zj512868izlxldsiljfj34230abl02";
+  cargoSha256 = "179a7abhzpxjp3cc820jzxg0qk1fiv9rkpazwnzhkjl8yd7b7qi3";
 
-  buildInputs = with pkgs; [ openssl pkgconfig cmake zlib file perl curl ];
+  buildInputs = with pkgs; [ pkgconfig cmake zlib file perl curl ];
 
   meta = with stdenv.lib; {
     description = "A cat(1) clone with syntax highlighting and Git integration";
     homepage    = https://github.com/sharkdp/bat;
-    license     = licenses.mit;
-    maintainers = [];
+    license     = with licenses; [ asl20 /* or */ mit ];
+    maintainers = with maintainers; [ dywedir ];
     platforms   = platforms.linux;
   };
 }
-- 
GitLab


From e203a9a553fb4e1218ca15a57a0b7944abeacbca Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 9 May 2018 02:51:59 -0500
Subject: [PATCH 0372/1085] pthread-w32: add missing args

Fixes #40207
---
 pkgs/os-specific/windows/pthread-w32/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix
index f0b6852d5bf..ef42dadc297 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/pkgs/os-specific/windows/pthread-w32/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, mingw_headers }:
+{ fetchurl, stdenv, mingw_header, hostPlatform, buildPlatform }:
 
 # This file is tweaked for cross-compilation only.
 assert hostPlatform != buildPlatform;
-- 
GitLab


From 9b7d3f10e43bbad23730467ceb37acd7f0891074 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 18 Apr 2018 18:53:42 -0400
Subject: [PATCH 0373/1085] graphicsmagick-imagemagick-compat: init at 1.3.28

---
 .../graphics/graphicsmagick/compat.nix        | 37 +++++++++++++++++++
 .../graphics/graphicsmagick/default.nix       |  5 +--
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/graphics/graphicsmagick/compat.nix

diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix
new file mode 100644
index 00000000000..bd1ce2ed893
--- /dev/null
+++ b/pkgs/applications/graphics/graphicsmagick/compat.nix
@@ -0,0 +1,37 @@
+{ stdenv, graphicsmagick }:
+
+stdenv.mkDerivation rec {
+  name = "graphicsmagick-imagemagick-compat-${version}";
+  inherit (graphicsmagick) version;
+
+  unpackPhase = "true";
+  buildPhase = "true";
+
+  utils = [
+    "composite"
+    "conjure"
+    "convert"
+    "identify"
+    "mogrify"
+    "montage"
+    "animate"
+    "display"
+    "import"
+  ];
+
+  # TODO: symlink libraries?
+  installPhase = ''
+    mkdir -p "$out"/bin
+    mkdir -p "$out"/share/man/man1
+    for util in ''${utils[@]}; do
+      ln -s ${graphicsmagick}/bin/gm "$out/bin/$util"
+      ln -s ${graphicsmagick}/share/man/man1/gm.1.gz "$out/share/man/man1/$util.1.gz"
+    done
+  '';
+
+  meta = {
+    description = "ImageMagick interface for GraphicsMagick";
+    license = stdenv.lib.licenses.free;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 4258d91b42a..872afb39ec6 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -2,10 +2,9 @@
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
 
-let version = "1.3.29"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "graphicsmagick-${version}";
+  version = "1.3.29";
 
   src = fetchurl {
     url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6759098dfa..1079126521e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16142,6 +16142,8 @@ with pkgs;
   graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
   graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; };
 
+  graphicsmagick-imagemagick-compat = callPackage ../applications/graphics/graphicsmagick/compat.nix { };
+
   grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; };
 
   gtkpod = callPackage ../applications/audio/gtkpod { };
-- 
GitLab


From 0d78386e21d0dcb72aeaac5cedac65b6170d9c84 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 18 Apr 2018 19:02:46 -0400
Subject: [PATCH 0374/1085] rivet: switch to graphicsmagick

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1079126521e..3f1adea55f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20540,7 +20540,9 @@ with pkgs;
 
   pythia = callPackage ../development/libraries/physics/pythia { };
 
-  rivet = callPackage ../development/libraries/physics/rivet { };
+  rivet = callPackage ../development/libraries/physics/rivet {
+    imagemagick = graphicsmagick-imagemagick-compat;
+  };
 
   thepeg = callPackage ../development/libraries/physics/thepeg { };
 
-- 
GitLab


From 1d55c211cbc494d3882fc2f6819a961a3dca0465 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 9 May 2018 03:57:38 -0500
Subject: [PATCH 0375/1085] kpmcore: fix build

Fixes #39834

Fallout from moving "eject" command to unixtools.
---
 pkgs/development/libraries/kpmcore/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix
index 2a2f0c79490..c6c3ba53d2c 100644
--- a/pkgs/development/libraries/kpmcore/default.nix
+++ b/pkgs/development/libraries/kpmcore/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchurl, extra-cmake-modules, pkgconfig
 , qtbase, kdeFrameworks
-, eject, libatasmart, parted }:
+, libatasmart, parted
+, utillinux }:
 
 let
   pname = "kpmcore";
@@ -16,11 +17,12 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     qtbase
-    eject # this is to get libblkid
     libatasmart
     parted # we only need the library
 
     kdeFrameworks.kio
+
+    utillinux # needs blkid (note that this is not provided by utillinux-compat)
   ];
   nativeBuildInputs = [ extra-cmake-modules ];
   enableParallelBuilding = true;
-- 
GitLab


From f8f65f837f130ca68c1caf068a05d13eb1219095 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 9 May 2018 11:20:38 +0200
Subject: [PATCH 0376/1085] monero: fix daemon crash

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

diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index 8be24522f56..cbba1ecba14 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, git
+{ stdenv, fetchFromGitHub, fetchpatch
+, cmake, pkgconfig, git
 , boost, miniupnpc, openssl, unbound, cppzmq
 , zeromq, pcsclite, readline
 , CoreData, IOKit, PCSC
@@ -21,6 +22,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig git ];
 
+  patches = [
+    # fix daemon crash, remove with 0.12.1.0 update
+    (fetchpatch {
+      url    = "https://github.com/monero-project/monero/commit/08343ab.diff";
+      sha256 = "0f1snrl2mk2czwk1ysympzr8ismjx39fcqgy13276vcmw0cfqi83";
+    })
+  ];
+
   buildInputs = [
     boost miniupnpc openssl unbound
     cppzmq zeromq pcsclite readline
-- 
GitLab


From 1f2647aad5ab9c50e3a6c84a23a57da23b98c1b6 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 9 May 2018 11:40:10 +0200
Subject: [PATCH 0377/1085] grafana: 5.1.1 -> 5.1.2

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index bcae836cbf2..f9fb4efa04b 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 = "5.1.1";
+  version = "5.1.2";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0b8i293bfxyblfqwxpb1dkgva95f0bljpvp27j4l4hmjm2g8bpd9";
+    sha256 = "0iw0mr6m99z6vy9mz9fdhmn4fxi359n3ns71bm5a71np8lf4qs36";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "0kyfyxcj2yy9v1in6h6kh6sl5p7m03g643qpjriplwwa93bdmk8k";
+    sha256 = "18bqmvyfjkvkrdbxa989aa6c7ri3b4wdb7ai543hiaz00s9mnpzm";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
-- 
GitLab


From dd32c31605cd635f56030f0392f69044ad657cab Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 9 May 2018 13:00:08 +0300
Subject: [PATCH 0378/1085] jetbrains.idea-community: 2018.1.2 -> 2018.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 98172ce1905..fa9985a665c 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -276,12 +276,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3"; /* updated by script */
     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 = "0s5vbdg8ajaac1jqh8ypy20fp061aqjhiyi20kdcsb0856nw5frg"; /* updated by script */
+      sha256 = "0ws5s8bvjpz60pdyak3vb22x27qi00ajxx18wia1hql8831gsk3m"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IDEA_Release";
-- 
GitLab


From b184f60d7a65d0a8fa1091e9900f1c2e1eb8f7d7 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 9 May 2018 13:00:26 +0300
Subject: [PATCH 0379/1085] jetbrains.idea-ultimate: 2018.1.2 -> 2018.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 fa9985a665c..f81d4c544b7 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -289,12 +289,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3"; /* updated by script */
     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 = "1rrqc9sj0ibkkj627hzwdh7l5z8zm6cmaz0yzx6xhyi989ivfy2r"; /* updated by script */
+      sha256 = "14h71x3jidwiwv73g48f6bd0y4p3s33jb4wdr5grdhm677pqb702"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IDEA_Release";
-- 
GitLab


From 494188557bda81c6e4362faa157c3e487af8b7e1 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 9 May 2018 13:00:48 +0300
Subject: [PATCH 0380/1085] jetbrains.ruby-mine: 2018.1.1 -> 2018.1.2

---
 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 f81d4c544b7..3f5ca934221 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -354,12 +354,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2018.1.1"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     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 = "1nh2m10ikwl85n66aspkmgxmbk98amhlgj2xl2sasjfwn5pn1wmf"; /* updated by script */
+      sha256 = "0bnzn811rmgn0kig3mzbwgx85490dqg4sg3pmmmk20n8hcph8zca"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "rm2018.1";
-- 
GitLab


From 27dc2a68836d33263ae9b1b11e57f915c2922a8e Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 9 May 2018 13:01:08 +0300
Subject: [PATCH 0381/1085] jetbrains.webstorm: 2018.1.2 -> 2018.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 3f5ca934221..2de973d41f6 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -367,12 +367,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3"; /* updated by script */
     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 = "14fmny9i0cgkplna0li5q2c5wiqk71k6c5h480ia85jaqi2vm8jh"; /* updated by script */
+      sha256 = "03nhs4vmqbm5s4ykjz475nvcbwvp2hb0bq5ijfjxwayj3jgv0zbm"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WS_Release";
-- 
GitLab


From 844698c436d8857fe07cd95a89e967506d9cf98b Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Wed, 9 May 2018 12:38:09 +0200
Subject: [PATCH 0382/1085] nixos/tests/statsd: fix non-deterministic failure

Test failed sometimes because the service took more time to start.
---
 nixos/tests/statsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix
index a9d7dc61cb6..c71949249a4 100644
--- a/nixos/tests/statsd.nix
+++ b/nixos/tests/statsd.nix
@@ -35,6 +35,6 @@ with lib;
   testScript = ''
     $statsd1->start();
     $statsd1->waitForUnit("statsd.service");
-    $statsd1->succeed("nc -z 127.0.0.1 8126");
+    $statsd1->waitUntilSucceeds("nc -z 127.0.0.1 8126");
   '';
 })
-- 
GitLab


From 04703916cf1d962cd932d49f53a0ea0b116b4257 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Wed, 9 May 2018 21:14:44 +1000
Subject: [PATCH 0383/1085] nix-pin: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index 6f109cd9f41..89342953705 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -1,15 +1,15 @@
 { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }:
 let self = stdenv.mkDerivation rec {
   name = "nix-pin-${version}";
-  version = "0.3.0";
+  version = "0.3.1";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-pin";
-    rev = "version-0.3.0";
-    sha256 = "1kq50v8m8y1wji63b7y3wh6nv3ahvdxvvbsb07day2zzf5ysy8kj";
+    rev = "version-0.3.1";
+    sha256 = "1sldbrz33wz30d3vv3d2clyqyd6x1y6h6xjz1xv55fa97ig1h481";
   };
   buildInputs = [ python3 mypy makeWrapper ];
-  buildPhase = ''
+  checkPhase = ''
     mypy bin/*
   '';
   installPhase = ''
-- 
GitLab


From f0353d417f87caf532a70100f74fba76e886d7b5 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Tue, 8 May 2018 13:32:06 +0200
Subject: [PATCH 0384/1085] squashfsTools: update package metadata

I am adding myself as maintainer here for lack of a better candidate,
but I am not experienced with Nix, and I am not a squashfs expert
either.
---
 maintainers/maintainer-list.nix             | 5 +++++
 pkgs/tools/filesystems/squashfs/default.nix | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e31b84b03b0..4683a02e123 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3234,6 +3234,11 @@
     github = "rushmorem";
     name = "Rushmore Mushambi";
   };
+  ruuda = {
+    email = "dev+nix@veniogames.com";
+    github = "ruuda";
+    name = "Ruud van Asseldonk";
+  };
   rvl = {
     email = "dev+nix@rodney.id.au";
     github = "rvl";
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 08951113b3b..a7f4e85eb34 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -38,5 +38,7 @@ stdenv.mkDerivation rec {
     homepage = http://squashfs.sourceforge.net/;
     description = "Tool for creating and unpacking squashfs filesystems";
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ ruuda ];
   };
 }
-- 
GitLab


From 77a6cbb1c1feeb6b6424d35319ac6226c780b34a Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Wed, 9 May 2018 14:58:29 +0200
Subject: [PATCH 0385/1085] zsh: move setEnvironment stuff to zprofile

---
 nixos/modules/programs/zsh/zsh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index f689250dc61..b88f54678ee 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -108,8 +108,6 @@ in
         if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
         export __ETC_ZSHENV_SOURCED=1
 
-        ${config.system.build.setEnvironment.text}
-
         ${cfge.shellInit}
 
         ${cfg.shellInit}
@@ -129,6 +127,8 @@ in
         if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
         __ETC_ZPROFILE_SOURCED=1
 
+        ${config.system.build.setEnvironment.text}
+
         ${cfge.loginShellInit}
 
         ${cfg.loginShellInit}
-- 
GitLab


From 4a2bf9c4ec6477c4ca4440c29115e227b5092c89 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 6 May 2018 15:19:41 -0400
Subject: [PATCH 0386/1085] input-utils: init at 1.3

---
 .../os-specific/linux/input-utils/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/os-specific/linux/input-utils/default.nix

diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix
new file mode 100644
index 00000000000..cd0fc01384b
--- /dev/null
+++ b/pkgs/os-specific/linux/input-utils/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, linuxHeaders }:
+
+stdenv.mkDerivation rec {
+  name = "input-utils-${version}";
+  version = "1.3";
+  
+  src = fetchurl {
+    url = "https://www.kraxel.org/releases/input/input-${version}.tar.gz";
+    sha256 = "11w0pp20knx6qpgzmawdbk1nj2z3fzp8yd6nag6s8bcga16w6hli";
+  };
+
+  prePatch = ''
+    # Use proper include path for kernel include files.
+    substituteInPlace ./name.sh --replace "/usr/include/linux/" "${linuxHeaders}/include/linux/"
+    substituteInPlace ./lirc.sh --replace "/usr/include/linux/" "${linuxHeaders}/include/linux/"
+  '';
+
+  makeFlags = [
+    "prefix=$(out)"
+    "STRIP=-s"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Input layer utilities, includes lsinput";
+    homepage    = https://www.kraxel.org/blog/linux/input/;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ samueldr ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 567167fc460..45ca547b7bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3047,6 +3047,8 @@ with pkgs;
 
   innoextract = callPackage ../tools/archivers/innoextract { };
 
+  input-utils = callPackage ../os-specific/linux/input-utils { };
+
   intecture-agent = callPackage ../tools/admin/intecture/agent.nix { };
 
   intecture-auth = callPackage ../tools/admin/intecture/auth.nix { };
-- 
GitLab


From d0cfb273f0ee499261746a414c653f9a82dcd73f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 9 May 2018 06:41:45 +0000
Subject: [PATCH 0387/1085] ocamlPackages.ocaml_pcre: cleanup

---
 pkgs/development/ocaml-modules/pcre/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index e5533d3ad4b..fb3b67b03b7 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -1,21 +1,19 @@
-{stdenv, buildOcaml, fetchurl, pcre, ocaml, findlib}:
+{ stdenv, fetchurl, pcre, ocaml, findlib, ocamlbuild }:
 
-buildOcaml {
-  name = "pcre";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-pcre-${version}";
   version = "7.2.3";
 
   src = fetchurl {
-    url = "https://github.com/mmottl/pcre-ocaml/releases/download/v7.2.3/pcre-ocaml-7.2.3.tar.gz";
+    url = "https://github.com/mmottl/pcre-ocaml/releases/download/v${version}/pcre-ocaml-${version}.tar.gz";
     sha256 = "0rj6dw79px4sj2kq0iss2nzq3rnsn9wivvc0f44wa1mppr6njfb3";
   };
 
-  buildInputs = [ocaml findlib];
+  buildInputs = [ ocaml findlib ocamlbuild ];
   propagatedBuildInputs = [pcre];
 
   createFindlibDestdir = true;
 
-  hasSharedObjects = true;
-
   configurePhase = "true";	# Skip configure phase
 
   meta = with stdenv.lib; {
-- 
GitLab


From 4a0c93f078f6fd74aec90d6a0fb8feb4ec1446ca Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 9 May 2018 15:56:27 +0000
Subject: [PATCH 0388/1085] =?UTF-8?q?ocamlPackages.ocaml=5Fhttp:=20disable?=
 =?UTF-8?q?=20on=20OCaml=20=E2=89=A5=204.06?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/http/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix
index f25a6f97b39..b9b530ac599 100644
--- a/pkgs/development/ocaml-modules/http/default.nix
+++ b/pkgs/development/ocaml-modules/http/default.nix
@@ -1,5 +1,9 @@
 {stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}:
 
+if stdenv.lib.versionAtLeast ocaml.version "4.06"
+then throw "ocaml-http is not available for OCaml ${ocaml.version}"
+else
+
 stdenv.mkDerivation {
   name = "ocaml-http-0.1.5";
 
-- 
GitLab


From 9c6be76276f0f318ccdd48c6f551a54977e5a4a9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 9 May 2018 16:38:47 +0000
Subject: [PATCH 0389/1085] ocamlPackages.gapi_ocaml: disable for OCaml < 4.02

---
 pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index b4e06d3c999..a7c32a069fc 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,5 +1,9 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "gapi-ocaml is not available for OCaml ${ocaml.version}"
+else
+
 stdenv.mkDerivation rec {
   name = "gapi-ocaml-${version}";
   version = "0.3.6";
-- 
GitLab


From ca7eb9901ee75b7af6546095bba756179dce2905 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 9 May 2018 05:59:18 +0000
Subject: [PATCH 0390/1085] ocamlPackages.ocamlnet: 4.1.5 -> 4.1.6

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

diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index 492bb9c67cd..33f32879211 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -1,23 +1,17 @@
 { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
-, gnutls, nettle, fetchpatch
+, gnutls, nettle
 }:
 
-let version = "4.1.5"; in
+let version = "4.1.6"; in
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-ocamlnet-${version}";
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
-    sha256 = "1ppcd2zjhj6s3ib9q8dngnr53qlmkhvv7a8hzp88r79k6jygn4cm";
+    sha256 = "1j0k0drybcjpysvs8xpq3cnpg3wqk6d5sy7y1h5rq8jk7hrirf0k";
   };
 
-  patches = [ (fetchpatch {
-      url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocamlnet/ocamlnet.4.1.5/files/netgzip.patch";
-      sha256 = "1say7zzgk24qcy9m91gcfgvz4fv7nksx4j5qnbxyq8wqw0g88ba0";
-    })
-  ];
-
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ];
 
-- 
GitLab


From 0198bcc1eb018c2891ca89b902ddf950cd048393 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Wed, 9 May 2018 13:21:38 -0400
Subject: [PATCH 0391/1085] gnucash: add upgrade instructions to NixOS release
 notes

---
 nixos/doc/manual/release-notes/rl-1809.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 01b5e9d7746..e10827d5db2 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -107,6 +107,17 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      a stable URL for Nixpkgs to use to package this proprietary software.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     <literal>gnucash</literal> has changed from version 2.4 to 3.x.
+     If you've been using <literal>gnucash</literal> (version 2.4) instead of
+     <literal>gnucash26</literal> (version 2.6) you must open your Gnucash 
+     data file(s) with <literal>gnucash26</literal> and then save them to
+     upgrade the file format. Then you may use your data file(s) with
+     Gnucash 3.x. See the upgrade <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>.
+     Gnucash 2.4 is still available under the attribute <literal>gnucash24</literal>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
-- 
GitLab


From 8a9402c207189b3c3604c60d84f8dcbc0e1a9371 Mon Sep 17 00:00:00 2001
From: Brian Dawn <brian.t.dawn@gmail.com>
Date: Tue, 8 May 2018 13:53:23 -0500
Subject: [PATCH 0392/1085] librealsense: init at 2.11.0

---
 maintainers/maintainer-list.nix               |  5 +++
 .../libraries/librealsense/default.nix        | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/libraries/librealsense/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e31b84b03b0..d5020b77b22 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -676,6 +676,11 @@
     github = "bramd";
     name = "Bram Duvigneau";
   };
+  brian-dawn = {
+    email = "brian.t.dawn@gmail.com";
+    github = "brian-dawn";
+    name = "Brian Dawn";
+  };
   bstrik = {
     email = "dutchman55@gmx.com";
     github = "bstrik";
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
new file mode 100644
index 00000000000..c61000066f4
--- /dev/null
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, cmake, libusb, ninja, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  name = "librealsense-${version}";
+  version = "2.11.0";
+
+  src = fetchFromGitHub {
+    owner = "IntelRealSense";
+    repo = "librealsense";
+    rev = "v${version}";
+    sha256 = "11vzs2m6jh9v1xbffr2k541pymmih6g4w641mp8rll8qzqfh89i0";
+  };
+
+  buildInputs = [
+    libusb
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkgconfig
+  ];
+
+  cmakeFlags = [ "-DBUILD_EXAMPLES=false" ];
+
+  meta = with stdenv.lib; {
+    description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)";
+    homepage = https://github.com/IntelRealSense/librealsense;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ brian-dawn ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6759098dfa..0a0c0302b05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13801,6 +13801,8 @@ with pkgs;
 
   libraw1394 = callPackage ../development/libraries/libraw1394 { };
 
+  librealsense = callPackage ../development/libraries/librealsense { };
+
   libsass = callPackage ../development/libraries/libsass { };
 
   libsexy = callPackage ../development/libraries/libsexy { };
-- 
GitLab


From 7a64b0726a6be48a35d71ea14d5fa643b61ce240 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 9 May 2018 14:05:29 -0400
Subject: [PATCH 0393/1085] bicgl: init at 2017-09-10

---
 .../science/biology/bicgl/default.nix         | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/science/biology/bicgl/default.nix

diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/pkgs/development/libraries/science/biology/bicgl/default.nix
new file mode 100644
index 00000000000..3c9b8f8257c
--- /dev/null
+++ b/pkgs/development/libraries/science/biology/bicgl/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }:
+
+stdenv.mkDerivation rec {
+  pname = "bicgl";
+  name  = "${pname}-2017-09-10";
+
+  owner = "BIC-MNI";
+
+  src = fetchFromGitHub {
+    inherit owner;
+    repo   = pname;
+    rev    = "b7f7e52d1039d6202a93d9055f516186033656cc";
+    sha256 = "0lzirdi1mf4yl8srq7vjn746sbydz7h0wjh7wy8gycy6hq04qrg4";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libminc bicpl freeglut mesa_glu ];
+
+  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/${owner}/${pname}";
+    description = "Brain Imaging Centre graphics library";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+    license   = licenses.free;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26f3e499eee..d2700233f1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8561,6 +8561,8 @@ with pkgs;
 
   bicpl = callPackage ../development/libraries/science/biology/bicpl { };
 
+  bicgl = callPackage ../development/libraries/science/biology/bicgl { };
+
   # TODO(@Ericson2314): Build bionic libc from source
   bionic = assert hostPlatform.useAndroidPrebuilt;
     androidenv.androidndkPkgs.libraries;
-- 
GitLab


From 5c26dd319570ff94c73b4311007d921594675685 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 May 2018 02:30:36 +0200
Subject: [PATCH 0394/1085] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/6ab957cb8135bd5eb47a0e335db40a956ee28349.
---
 .../haskell-modules/hackage-packages.nix      | 520 +++++++++++++-----
 1 file changed, 386 insertions(+), 134 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3c6a7949df6..bad45c3a27e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5957,6 +5957,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Frames_0_4_0" = callPackage
+    ({ mkDerivation, base, contravariant, criterion, deepseq, directory
+     , discrimination, ghc-prim, hashable, hspec, htoml, HUnit, pipes
+     , pipes-bytestring, pipes-group, pipes-parse, pipes-safe
+     , pipes-text, pretty, primitive, readable, regex-applicative
+     , template-haskell, temporary, text, transformers
+     , unordered-containers, vector, vinyl
+     }:
+     mkDerivation {
+       pname = "Frames";
+       version = "0.4.0";
+       sha256 = "06yh8vl3s5543nxhndjd2wsbclka4in4nsbjqzbpcg9g8s8x3z20";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base contravariant deepseq discrimination ghc-prim hashable pipes
+         pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text
+         primitive readable template-haskell text transformers vector vinyl
+       ];
+       testHaskellDepends = [
+         base directory hspec htoml HUnit pipes pretty regex-applicative
+         template-haskell temporary text unordered-containers vinyl
+       ];
+       benchmarkHaskellDepends = [ base criterion pipes transformers ];
+       description = "Data frames For working with tabular data files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Frank" = callPackage
     ({ mkDerivation, base, mtl, newtype, she, void }:
      mkDerivation {
@@ -16498,17 +16527,17 @@ self: {
     ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
      , bytestring, cereal, cereal-vector, containers, data-default-class
      , diagrams-core, diagrams-lib, directory, parsec, split, text
-     , tuple, vector, xml
+     , vector, xml
      }:
      mkDerivation {
        pname = "SVGFonts";
-       version = "1.6.0.3";
-       sha256 = "11sqycvvsg9avxqh3z82x3wllhy6a9c0d36qzm2w6w4hg5iqi3xw";
+       version = "1.7";
+       sha256 = "1k9ili7l9pp5a009jh55vigb917wdnsl6iaz0ggp6d4nw1jwsg6s";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base blaze-markup blaze-svg bytestring cereal
          cereal-vector containers data-default-class diagrams-core
-         diagrams-lib directory parsec split text tuple vector xml
+         diagrams-lib directory parsec split text vector xml
        ];
        description = "Fonts from the SVG-Font format";
        license = stdenv.lib.licenses.bsd3;
@@ -17727,8 +17756,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "StringUtils";
-       version = "0.2.0.1";
-       sha256 = "1sxqcc17949kn9xbspyz4npbnqzsz05di22g3qdqc78b8mxi2psg";
+       version = "0.2.0.2";
+       sha256 = "1wbixjgzad3s9jj16kl0gvwg82g3hqvkag9wr5j58w98a4qyqw8i";
        libraryHaskellDepends = [ base ];
        description = "String manipulation utilities";
        license = stdenv.lib.licenses.lgpl3;
@@ -23755,8 +23784,8 @@ self: {
     ({ mkDerivation, base, util }:
      mkDerivation {
        pname = "alg";
-       version = "0.2.4.0";
-       sha256 = "1brpqs6xxi7vlpa7230n7910j2zq3w79kw6hfs2xi07kaz0f2lyd";
+       version = "0.2.4.1";
+       sha256 = "0fx3q5ivd942yly212k0qdrhwbjpx0y4sj1r2r9lbhxb2941rg4n";
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
@@ -31518,8 +31547,8 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.3.0.1";
-       sha256 = "1day4zpypk1jirkn0zfvmfwy0pnsvggibi9k2gk23kqnn904sv77";
+       version = "0.3.0.2";
+       sha256 = "0kfw8srq675hinf1gajkngbpx15xc5w74vvf76yarmaal1vaavm4";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -32543,7 +32572,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "backprop_0_2_0_0" = callPackage
+  "backprop_0_2_1_0" = callPackage
     ({ mkDerivation, base, bifunctors, containers, criterion, deepseq
      , directory, hmatrix, lens, microlens, mnist-idx, mwc-random
      , primitive, reflection, time, transformers, type-combinators
@@ -32551,8 +32580,8 @@ self: {
      }:
      mkDerivation {
        pname = "backprop";
-       version = "0.2.0.0";
-       sha256 = "1h2cb3birbcgm0fyqr4i2d85dkwrpbqkd67a6imh3z9nsc7zy66y";
+       version = "0.2.1.0";
+       sha256 = "0qm352klwjv1fy2gpsr8xhd9byaydps6fwhwrr9fldmj2bn1220m";
        libraryHaskellDepends = [
          base containers deepseq microlens primitive reflection transformers
          type-combinators vector
@@ -33599,8 +33628,8 @@ self: {
      }:
      mkDerivation {
        pname = "battleplace";
-       version = "0.1.0.3";
-       sha256 = "0kvw69br5nrx4nnrp0r00wr55w15wq5kh68df2r89yrd8l5vp02x";
+       version = "0.1.0.4";
+       sha256 = "0n3fw4z48hz188i4f02ya2wcaicl0l5nhb2w1r8hsvvgf0cixsxl";
        libraryHaskellDepends = [
          aeson base bytestring cereal data-default hashable memory servant
          text vector
@@ -39229,7 +39258,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_36_3" = callPackage
+  "brick_0_37" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, QuickCheck, stm, template-haskell, text
@@ -39237,8 +39266,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.36.3";
-       sha256 = "1j53pj4axgyah3qj9zkaicbccmypm8cjfrpdjzarpcnb1za9y60n";
+       version = "0.37";
+       sha256 = "1v9ydqwaq116n8f4q9ln4zf9jr28y730y7l7m1r2ipjfjassxfq2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52146,6 +52175,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "constraint-reflection" = callPackage
+    ({ mkDerivation, base, category, constraint, reflection }:
+     mkDerivation {
+       pname = "constraint-reflection";
+       version = "0.1.0.0";
+       sha256 = "1v1m5vvicjmmz7mdp6fqf75fi2vf0hy25fyxgxpd4d7fbbyjvnh1";
+       libraryHaskellDepends = [ base category constraint reflection ];
+       description = "Constraint reflection";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "constraints" = callPackage
     ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
      , hspec-discover, mtl, semigroups, transformers
@@ -52275,20 +52315,13 @@ self: {
      }) {};
 
   "container" = callPackage
-    ({ mkDerivation, base, containers, data-default, data-layer
-     , functor-utils, lens, lens-utils, mtl, template-haskell, text
-     , transformers, transformers-base, typelevel, vector
-     }:
+    ({ mkDerivation, base, containers, convert, lens, text }:
      mkDerivation {
        pname = "container";
-       version = "1.0.2";
-       sha256 = "0y8vyh9a3fv3jpjal22fg1r7ms7f2vc3ax2lhnxci6cg9zgz4gj1";
-       libraryHaskellDepends = [
-         base containers data-default data-layer functor-utils lens
-         lens-utils mtl template-haskell text transformers transformers-base
-         typelevel vector
-       ];
-       homepage = "https://github.com/wdanilo/containers";
+       version = "1.1.0";
+       sha256 = "19x7jvzc499y4349gallwwy4wpw4pf4azbsp4gr8ly4j0flfgk6g";
+       libraryHaskellDepends = [ base containers convert lens text ];
+       homepage = "https://github.com/luna/container";
        description = "Containers abstraction and utilities";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53694,6 +53727,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cppfilt" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hspec }:
+     mkDerivation {
+       pname = "cppfilt";
+       version = "0.1.0.0";
+       sha256 = "0ls98z5bswcsayqday350b90m256dscr2li14dnlkfckynpnqqzk";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hspec ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       homepage = "https://github.com/0xd34df00d/cppfilt#readme";
+       description = "Bindings for C++ demangling routines";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cpphs" = callPackage
     ({ mkDerivation, base, directory, old-locale, old-time, polyparse
      }:
@@ -61965,8 +62012,8 @@ self: {
      }:
      mkDerivation {
        pname = "di";
-       version = "1.0";
-       sha256 = "1bsgq1x4xc1nhfx2wkzmhy3hfy11xkdic35x0lxdc282k2iw7f4i";
+       version = "1.0.1";
+       sha256 = "0h7c6s18vj60higi23icjsf1ky756l553v3a18bdkf4dgcxfs4r9";
        libraryHaskellDepends = [
          base df1 di-core di-df1 di-handle di-monad exceptions
        ];
@@ -61999,8 +62046,8 @@ self: {
      }:
      mkDerivation {
        pname = "di-df1";
-       version = "1.0.1";
-       sha256 = "1l83xl2ljql615h33h2l3ckqdx8r0wqjfpygd4xhx975lm3gllck";
+       version = "1.0.2";
+       sha256 = "1imk26njmr7hj56227yxgshjh4dicgr2c9bpc2m9nvsw2qbqslfh";
        libraryHaskellDepends = [
          base df1 di-core di-handle di-monad stm
        ];
@@ -62373,8 +62420,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.4.2.1";
-       sha256 = "17vmjcshq6kdpy4qvwabrd7yp7is7zrs6lf3zn25l2ya8a3m0a17";
+       version = "1.4.2.2";
+       sha256 = "1rfn1fk251n84bxfn6p82p62gdjiq4yp4dwqmspp7ha2x6abn2s7";
        libraryHaskellDepends = [
          active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -65113,14 +65160,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "docker-build-cacher_1_9_3" = callPackage
+  "docker-build-cacher_1_9_4" = callPackage
     ({ mkDerivation, base, containers, foldl, language-docker
      , system-filepath, text, turtle
      }:
      mkDerivation {
        pname = "docker-build-cacher";
-       version = "1.9.3";
-       sha256 = "12x91w3wq0hndssz48xka0cb7ajmlrvdv2ysc0pv333smkmclsw1";
+       version = "1.9.4";
+       sha256 = "1p62q8hq19zgjwaqgclkjqh6ylpbr5jxw82f36xzqximws1jsmkp";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -71670,8 +71717,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "exception-hierarchy";
-       version = "0.0.0.2";
-       sha256 = "1lk73pmz2qhzmsj29vc8c1xsq0rcn7gqv4yik7av7iscrq49r2cc";
+       version = "0.1.0.1";
+       sha256 = "1zk06z8fwr4g701c79vvsqmagjcm2h850d9m96zrig08kz3lshm9";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "yet";
        description = "Exception type hierarchy with TemplateHaskell";
@@ -73035,6 +73082,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "familiar-reflection" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "familiar-reflection";
+       version = "0.1.0.0";
+       sha256 = "1yqbq038axx9a2j3kbdm11w3fgvkix2w7dqhrbf353r2n8vigxg8";
+       libraryHaskellDepends = [ base ];
+       description = "Reifies arbitrary terms into types that can be reflected back into terms";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "family-tree" = callPackage
     ({ mkDerivation, base, binary, containers, hashable, intervals
      , lens, tables, text, time, unordered-containers
@@ -74369,8 +74427,8 @@ self: {
      }:
      mkDerivation {
        pname = "ffmpeg-light";
-       version = "0.12.0.1";
-       sha256 = "1ikyhdkr3pvkpmqw7j4xgz07bnxnvckld8kd06191kgqlvr2k764";
+       version = "0.12.1.0";
+       sha256 = "081qrvf3hpnn7mgj6i7z8lh1jfmz0ndawc7ya9x3nx7kx3d35crp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77219,8 +77277,8 @@ self: {
        pname = "force-layout";
        version = "0.4.0.6";
        sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp";
-       revision = "2";
-       editedCabalFile = "1dj785ih5bla68yzxkpsilwj1p1xv6a8rh76rz799aap5injda0z";
+       revision = "3";
+       editedCabalFile = "0rp5ggzdqy9i8bsjz7i36l8l2b04vjy6sqm6gxmb4pqmakj1x8q6";
        libraryHaskellDepends = [
          base containers data-default-class lens linear
        ];
@@ -79547,6 +79605,45 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "funflow" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, clock, constraints
+     , containers, contravariant, cryptonite, data-default, directory
+     , exceptions, filepath, ghc-prim, hashable, hedis, hinotify
+     , hostname, integer-gmp, katip, lens, lifted-async, memory
+     , monad-control, mtl, optparse-applicative, path, path-io, pretty
+     , process, random, safe-exceptions, scientific, sqlite-simple, stm
+     , store, tasty, tasty-hunit, template-haskell, temporary, text
+     , time, transformers, unix, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "funflow";
+       version = "1.0.0";
+       sha256 = "1lcww83dzhbmml5l4yrypbw18l8x1m3pzblcnmgd90a9874gmq0f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring clock constraints containers
+         contravariant cryptonite data-default directory exceptions filepath
+         ghc-prim hashable hedis hinotify hostname integer-gmp katip lens
+         lifted-async memory monad-control mtl path path-io pretty process
+         random safe-exceptions scientific sqlite-simple stm store
+         template-haskell text time transformers unix unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring clock hedis optparse-applicative path
+         safe-exceptions text unix
+       ];
+       testHaskellDepends = [
+         async base containers data-default directory filepath hedis path
+         path-io process random safe-exceptions tasty tasty-hunit temporary
+         text unix
+       ];
+       homepage = "https://github.com/tweag/funflow";
+       description = "Workflows with arrows";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "funion" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, haskell98
      , HFuse, unix
@@ -83238,6 +83335,19 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-tcplugins-extra_0_3" = callPackage
+    ({ mkDerivation, base, ghc }:
+     mkDerivation {
+       pname = "ghc-tcplugins-extra";
+       version = "0.3";
+       sha256 = "0k1ph8za52mx6f146xhaakn630xrzk42ylchv4b9r04hslhzvb1h";
+       libraryHaskellDepends = [ base ghc ];
+       homepage = "http://github.com/clash-lang/ghc-tcplugins-extra";
+       description = "Utilities for writing GHC type-checker plugins";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-time-alloc-prof" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, tasty, tasty-hunit, temporary, text, time
@@ -83293,6 +83403,29 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-extra_0_2_5" = callPackage
+    ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
+     , tasty, tasty-hunit, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-extra";
+       version = "0.2.5";
+       sha256 = "0waznf99wryc0sjyk9xb5c0vsalmmhx0v5vbqsyf5q7r6cjcig4s";
+       libraryHaskellDepends = [
+         base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
+         ghc-typelits-natnormalise integer-gmp transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
+         tasty-hunit template-haskell
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "Additional type-level operations on GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-knownnat" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
@@ -83314,6 +83447,28 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-knownnat_0_5" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
+     , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-knownnat";
+       version = "0.5";
+       sha256 = "0mix7zgbnyc3216ykcrjl09rpidq5n2y886k03g8r5pziq1xki00";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
+         template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "http://clash-lang.org/";
+       description = "Derive KnownNat constraints from other KnownNat constraints";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-natnormalise" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit, template-haskell
@@ -83331,14 +83486,14 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "ghc-typelits-natnormalise_0_6" = callPackage
+  "ghc-typelits-natnormalise_0_6_1" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit, template-haskell, transformers
      }:
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
-       version = "0.6";
-       sha256 = "0xs5d7bsyp53nzg509gs2qyfrj5fjp7bpyw3pjnnqk8d4xcgmf2w";
+       version = "0.6.1";
+       sha256 = "0xzwlxcmd3vll86mdjk8pph6f0nw3vq0h3airzv7jagc4j3x9c7x";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra integer-gmp transformers
        ];
@@ -83926,9 +84081,9 @@ self: {
      }) {inherit (pkgs) cairo;};
 
   "gi-dbusmenu" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, dbusmenu-glib
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
+     , libdbusmenu-glib, text, transformers
      }:
      mkDerivation {
        pname = "gi-dbusmenu";
@@ -83939,19 +84094,19 @@ self: {
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ dbusmenu-glib ];
+       libraryPkgconfigDepends = [ libdbusmenu-glib ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Dbusmenu bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {dbusmenu-glib = null;};
+     }) {inherit (pkgs) libdbusmenu-glib;};
 
   "gi-dbusmenugtk3" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, dbusmenu-gtk3
-     , gi-atk, gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject
-     , gi-gtk, haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+     , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading
+     , libdbusmenu-gtk3, text, transformers
      }:
      mkDerivation {
        pname = "gi-dbusmenugtk3";
@@ -83963,13 +84118,13 @@ self: {
          gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base
          haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ dbusmenu-gtk3 ];
+       libraryPkgconfigDepends = [ libdbusmenu-gtk3 ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "DbusmenuGtk bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {dbusmenu-gtk3 = null;};
+     }) {inherit (pkgs) libdbusmenu-gtk3;};
 
   "gi-gdk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -102061,8 +102216,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedgehog-gen-json";
-       version = "0.3.0";
-       sha256 = "09b362v9cdl9jwrx0hyb7hhf2krg3rhrsgssz4dl3sjz3y2a8i1h";
+       version = "0.5.1";
+       sha256 = "0cc46l1ls4dzlchwcd6cqmsa66qffjq01dhcj2k84gjw8gg4wnnx";
        libraryHaskellDepends = [
          aeson base bytestring containers exceptions hedgehog lens protolude
          regex-genex scientific text time timerep tz unordered-containers
@@ -104321,24 +104476,24 @@ self: {
 
   "hierarchy" = callPackage
     ({ mkDerivation, base, directory, doctest, exceptions, filepath
-     , free, hspec, hspec-expectations, mmorph, monad-control, mtl
-     , pipes, semigroups, transformers, transformers-base
+     , free, mmorph, monad-control, mtl, transformers, transformers-base
      , transformers-compat
      }:
      mkDerivation {
        pname = "hierarchy";
-       version = "0.3.1.4";
-       sha256 = "0bli7mv2d6lmxc89fysmkhb9kamhzs2rqx75rn4mbcw61il1cznq";
+       version = "1.0.1";
+       sha256 = "11xnqf5s0vda2wjgdazkgkmjp46jyl9zcaia5r01szfwjihj5ldg";
        libraryHaskellDepends = [
-         base exceptions free mmorph monad-control mtl pipes semigroups
-         transformers transformers-base transformers-compat
+         base exceptions free mmorph monad-control mtl transformers
+         transformers-base transformers-compat
        ];
        testHaskellDepends = [
-         base directory doctest filepath hspec hspec-expectations mtl pipes
-         semigroups transformers
+         base directory doctest exceptions filepath free mmorph
+         monad-control mtl transformers transformers-base
+         transformers-compat
        ];
-       homepage = "https://github.com/jwiegley/hierarchy";
-       description = "Pipes-based library for predicated traversal of generated trees";
+       homepage = "https://github.com/jwiegley/hierarchy#readme";
+       description = "Predicated traversal of generated trees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -107040,30 +107195,61 @@ self: {
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, criterion
-     , data-fix, deepseq, deriving-compat, parsers, regex-tdfa
-     , regex-tdfa-text, semigroups, tasty, tasty-hunit, tasty-th, text
-     , transformers, trifecta, unordered-containers
+    ({ mkDerivation, aeson, ansi-wl-pprint, array, base
+     , base16-bytestring, binary, bytestring, containers, criterion
+     , cryptohash-md5, cryptohash-sha1, cryptohash-sha256
+     , cryptohash-sha512, data-fix, deepseq, deriving-compat, Diff
+     , directory, exceptions, filepath, generic-random, Glob, hashable
+     , hashing, haskeline, http-client, http-client-tls, http-types
+     , interpolate, lens-family, lens-family-core, lens-family-th
+     , logict, megaparsec, monadlist, mtl, optparse-applicative
+     , pretty-show, process, QuickCheck, quickcheck-instances
+     , regex-tdfa, regex-tdfa-text, repline, scientific, semigroups
+     , serialise, split, syb, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-th, template-haskell, text, these, time, transformers, unix
+     , unordered-containers, vector, xml
      }:
      mkDerivation {
        pname = "hnix";
-       version = "0.4.0";
-       sha256 = "0rgx97ckv5zvly6x76h7nncswfw0ik4bhnlj8n5bpl4rqzd7d4fd";
+       version = "0.5.1";
+       sha256 = "1rhbx7ixzg4147j3pcqvfzn1k2b1xcn8428z98cq6ghnrmgss9al";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base containers data-fix deepseq deriving-compat
-         parsers regex-tdfa regex-tdfa-text semigroups text transformers
-         trifecta unordered-containers
+         aeson ansi-wl-pprint array base base16-bytestring binary bytestring
+         containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256
+         cryptohash-sha512 data-fix deepseq deriving-compat directory
+         exceptions filepath hashable hashing haskeline http-client
+         http-client-tls http-types lens-family lens-family-core
+         lens-family-th logict megaparsec monadlist mtl optparse-applicative
+         pretty-show process regex-tdfa regex-tdfa-text scientific
+         semigroups serialise split syb template-haskell text these time
+         transformers unix unordered-containers vector xml
        ];
        executableHaskellDepends = [
-         ansi-wl-pprint base containers data-fix deepseq
+         aeson ansi-wl-pprint base base16-bytestring bytestring containers
+         cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
+         data-fix deepseq exceptions filepath hashing haskeline mtl
+         optparse-applicative pretty-show repline serialise template-haskell
+         text time transformers unordered-containers
        ];
        testHaskellDepends = [
-         base containers data-fix tasty tasty-hunit tasty-th text
+         ansi-wl-pprint base base16-bytestring bytestring containers
+         cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
+         data-fix deepseq Diff directory exceptions filepath generic-random
+         Glob hashing interpolate megaparsec mtl optparse-applicative
+         pretty-show process QuickCheck quickcheck-instances serialise split
+         tasty tasty-hunit tasty-quickcheck tasty-th template-haskell text
+         time transformers unix unordered-containers
        ];
-       benchmarkHaskellDepends = [ base containers criterion text ];
-       homepage = "http://github.com/jwiegley/hnix";
+       benchmarkHaskellDepends = [
+         ansi-wl-pprint base base16-bytestring bytestring containers
+         criterion cryptohash-md5 cryptohash-sha1 cryptohash-sha256
+         cryptohash-sha512 data-fix deepseq exceptions filepath hashing mtl
+         optparse-applicative serialise template-haskell text time
+         transformers unordered-containers
+       ];
+       homepage = "https://github.com/jwiegley/hnix#readme";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109801,6 +109987,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hs-conllu" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, megaparsec
+     , void
+     }:
+     mkDerivation {
+       pname = "hs-conllu";
+       version = "0.1.2";
+       sha256 = "1dvayafvf14gbir7cafhzlscqlffaws5ajilm5h520ji449jh2aa";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath megaparsec void
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath megaparsec
+       ];
+       homepage = "https://github.com/odanoburu/hs-conllu";
+       description = "Conllu validating parser and utils";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "hs-di" = callPackage
     ({ mkDerivation, base, compose-ltr, containers, deepseq
      , foreign-store, ghcid, haskell-src-meta, hspec, hspec-core
@@ -123914,6 +124121,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "javascript-extras_0_4_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }:
+     mkDerivation {
+       pname = "javascript-extras";
+       version = "0.4.0.0";
+       sha256 = "0qpz8q5pr939y35y3r8x83irb2nl9vmh50wzjii824kr25z5wipd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base deepseq ghcjs-base-stub parallel text
+       ];
+       executableHaskellDepends = [ base ghcjs-base-stub ];
+       homepage = "https://github.com/louispan/javascript-extras#readme";
+       description = "Extra javascript functions when using GHCJS";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "javasf" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, doctest
      , filepath, language-java-classfile, QuickCheck
@@ -126597,20 +126822,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "katydid_0_3_0_0" = callPackage
+  "katydid_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , directory, either, extra, filepath, HUnit, hxt, ilist, json, mtl
      , parsec, primes, regex-tdfa, tasty, tasty-hunit, text
+     , transformers-either
      }:
      mkDerivation {
        pname = "katydid";
-       version = "0.3.0.0";
-       sha256 = "1r95yxhrsw0ghv55xlq987yzhly69ihiy4bz6k3k41mfj8d7kj8v";
+       version = "0.3.0.1";
+       sha256 = "08q8qmvxc47y8rxs8vam31xwjgwyjga4bdd65m1n4plpndi0zhyg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers deepseq either extra hxt ilist json mtl
-         parsec regex-tdfa text
+         parsec regex-tdfa text transformers-either
        ];
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [
@@ -129244,15 +129470,15 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "language-docker_5_0_0" = callPackage
+  "language-docker_5_0_1" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, free, Glob
      , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck, split
      , template-haskell, text, th-lift, time
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "5.0.0";
-       sha256 = "16shdy1dh0bsalj0ciwg7h9dkjfjgkrfmq7g81z3k8fgy1w2y81n";
+       version = "5.0.1";
+       sha256 = "0y2kb2g9w34p3yw8cdjr4f0xkq9j065khlk1mbk7061gg2rhpykv";
        libraryHaskellDepends = [
          base bytestring free mtl parsec pretty split template-haskell text
          th-lift time
@@ -130585,8 +130811,8 @@ self: {
      }:
      mkDerivation {
        pname = "layouting";
-       version = "1.1.2";
-       sha256 = "1j3bki62ldi5gbl3asa31rjjlah2842rhgylxwab13c3r50a7p85";
+       version = "1.1.3";
+       sha256 = "1ji0hmfa87n3pl61gmgk4phmpir29j5r81ack95s3h7nxh0q5qh7";
        libraryHaskellDepends = [
          base container layered-state prologue terminal-text text
        ];
@@ -134789,7 +135015,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {llvm-config = null;};
 
-  "llvm-hs_6_1_1" = callPackage
+  "llvm-hs_6_2_0" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
      , containers, exceptions, llvm-config, llvm-hs-pure, mtl
      , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -134797,8 +135023,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-hs";
-       version = "6.1.1";
-       sha256 = "0vlp1rgddgavs4kg0s1qmny6mlx4rpz12ybcrqg6vmv68w1qyr5r";
+       version = "6.2.0";
+       sha256 = "1s7n0sansq1mhs6dibp3ikkpn3n0h6cw2ja5m36nphjmzn47dvrk";
        setupHaskellDepends = [ base Cabal containers ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -134859,15 +135085,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "llvm-hs-pure_6_1_0" = callPackage
+  "llvm-hs-pure_6_2_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, fail
      , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
      , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "llvm-hs-pure";
-       version = "6.1.0";
-       sha256 = "12fivm5w4nz306p7w0bxsmgb2cnbkp06dyrdfi64vrsgm9kgbqmw";
+       version = "6.2.0";
+       sha256 = "1qqwhq9mjlgpyy5h8wnk1zg8y16c229397fslxyyz3bjqg5a0ghv";
        libraryHaskellDepends = [
          attoparsec base bytestring containers fail mtl template-haskell
          transformers unordered-containers
@@ -144602,16 +144828,19 @@ self: {
      }) {};
 
   "monadiccp" = callPackage
-    ({ mkDerivation, base, containers, mtl, parsec, pretty, random }:
+    ({ mkDerivation, base, containers, mtl, parsec, pretty, random
+     , semigroups
+     }:
      mkDerivation {
        pname = "monadiccp";
-       version = "0.7.6";
-       sha256 = "083ppr53ac85r5ybndngsfwxgalj63giz32aa7wpcm629b9g4lxc";
+       version = "0.7.7";
+       sha256 = "1l6g2gbxmw0avyr7mfjadhads6raz6cwvmg57vb7ssryd9j21vp4";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base containers mtl parsec pretty random
+         base containers mtl parsec pretty random semigroups
        ];
-       homepage = "http://users.ugent.be/~tschrijv/MCP/";
+       testHaskellDepends = [ base ];
+       homepage = "https://people.cs.kuleuven.be/~tom.schrijvers/MCP/";
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152602,12 +152831,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask_0_2_0_0" = callPackage
+  "numhask_0_2_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "numhask";
-       version = "0.2.0.0";
-       sha256 = "1n465rjgmpwjixnnwn054323rg55abbj98brqzw4ff17hrvy97g0";
+       version = "0.2.1.0";
+       sha256 = "04bz8ddip48fiszjqc6km9xg63sn26jrnjxswc3qfls37jqzk2c3";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tonyday567/numhask#readme";
        description = "numeric classes";
@@ -152622,8 +152851,8 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-array";
-       version = "0.2.0.1";
-       sha256 = "05y41d8xnrzgrb5w6skkac5hr6c7npwzmryx308cd0lp4nbfmvql";
+       version = "0.2.1.0";
+       sha256 = "0d800ghafzfyz6afnaqza6b44pmjh8zq0gbxvxg2ach2wfcknd0h";
        libraryHaskellDepends = [
          adjunctions base deepseq dimensions distributive numhask-prelude
          protolude QuickCheck singletons vector
@@ -152661,12 +152890,12 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-prelude";
-       version = "0.0.3.0";
-       sha256 = "128hnq32826d2rmrlik4p0c72jnsy586gz9lgfk7hnx0fqpr94gy";
+       version = "0.0.4.0";
+       sha256 = "11kwszs98c00bcjr318rm7yfc0h304s6vnrmh97mp4xp4bk7fqq1";
        libraryHaskellDepends = [
          base numhask protolude QuickCheck tasty tasty-quickcheck
        ];
-       testHaskellDepends = [ base doctest tasty ];
+       testHaskellDepends = [ base doctest QuickCheck tasty ];
        homepage = "https://github.com/tonyday567/numhask#readme";
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
@@ -152779,6 +153008,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nuxeo" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, conduit
+     , conduit-extra, text, time
+     }:
+     mkDerivation {
+       pname = "nuxeo";
+       version = "0.2.0.1";
+       sha256 = "046vwj0p53pzrdmni08gqyzrr0mhz8qrf5zn09plgzjadq3yp2p2";
+       libraryHaskellDepends = [
+         attoparsec base bytestring conduit conduit-extra text time
+       ];
+       description = "Nuxeo";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nvim-hs" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
      , containers, data-default, deepseq, directory, dyre, filepath
@@ -156403,12 +156647,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "palette_0_3" = callPackage
+  "palette_0_3_0_1" = callPackage
     ({ mkDerivation, array, base, colour, containers, MonadRandom }:
      mkDerivation {
        pname = "palette";
-       version = "0.3";
-       sha256 = "1wpzrhr3b9psa7b56ys34vnaag6z12xam2rymld2g8fd13jlkxh6";
+       version = "0.3.0.1";
+       sha256 = "0ylwgb7a0mhffz00hmhx93y4kyjb9xgm96jrfcxl464x8cjka5gi";
        libraryHaskellDepends = [
          array base colour containers MonadRandom
        ];
@@ -158594,8 +158838,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.7.0.0";
-       sha256 = "0w7k1s8nma0bp4cvacmpa3fxxslarcijpxvbvasjyik3inazqhsd";
+       version = "0.7.2.0";
+       sha256 = "1kn739dywchvvvcp972yyxg7r4n81s3qbrni684ag7493nck12iw";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -167935,8 +168179,8 @@ self: {
      }:
      mkDerivation {
        pname = "profiteur";
-       version = "0.4.4.0";
-       sha256 = "08pnybyr6l39h7lxvgxi014wb7cf6i8qfygx4xkfzkj9p23mp3h9";
+       version = "0.4.5.0";
+       sha256 = "18wyq1czj99zxgqmv6v2qpwlax3a4r7d93pc24ihzg5v8ps6iz89";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -173811,12 +174055,16 @@ self: {
      }) {};
 
   "reactive-banana-automation" = callPackage
-    ({ mkDerivation, base, doctest, reactive-banana, stm, time }:
+    ({ mkDerivation, base, doctest, reactive-banana, stm, time
+     , transformers
+     }:
      mkDerivation {
        pname = "reactive-banana-automation";
-       version = "0.3.0";
-       sha256 = "1f752kmfmgdx9mhvzljm37vrn18jn7wgz0m4byl3v4npcv502cyr";
-       libraryHaskellDepends = [ base reactive-banana stm time ];
+       version = "0.4.0";
+       sha256 = "1zc24p1jqild85k049ixbfcdhxdy66l4m5ddr1g3bkxq8apilnrr";
+       libraryHaskellDepends = [
+         base reactive-banana stm time transformers
+       ];
        testHaskellDepends = [ base doctest ];
        description = "home (etc) automation using reactive-banana";
        license = stdenv.lib.licenses.agpl3;
@@ -174536,8 +174784,8 @@ self: {
      }:
      mkDerivation {
        pname = "recursion-schemes-ext";
-       version = "1.0.0.3";
-       sha256 = "00yj7h46pmy76iqsx1n0mlg04gzdrhyq10xm1xcl28y13jcjx9lc";
+       version = "1.0.0.4";
+       sha256 = "0n25cz8w48p8fxjnv83raxrvn7v892z8ip3jklgxj1vgh4rms3xx";
        libraryHaskellDepends = [
          base composition-prelude lens recursion-schemes
        ];
@@ -189738,8 +189986,8 @@ self: {
      }:
      mkDerivation {
        pname = "simplest-sqlite";
-       version = "0.0.0.14";
-       sha256 = "063x0s7klp510v9gz2qffpwnrsrfh5kady5n0j0cl1x65kis0d2m";
+       version = "0.1.0.0";
+       sha256 = "0vjx01bls2z99hmynqhxm4j2cq17334wz3pz0gm5saxslkldw2sz";
        libraryHaskellDepends = [
          base bytestring exception-hierarchy template-haskell text
        ];
@@ -202244,6 +202492,8 @@ self: {
        pname = "taffybar";
        version = "2.0.0";
        sha256 = "1s3nqvsivi4wgi6hi7b3f83r75sl5qp0hsqr0cdwd7s8fqai3wia";
+       revision = "1";
+       editedCabalFile = "1sqgzjv0nhp5nmzn4qh80ghq38p5q7c8nvm1v1wh1dx2j7lkjnzc";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -217726,12 +217976,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity_0_5_0_0" = callPackage
+  "validity_0_6_0_0" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "validity";
-       version = "0.5.0.0";
-       sha256 = "0hpdj3ckp2r8dklpjdrrbfd02maskxw2vrjnqnxsgi8s3j8avqsv";
+       version = "0.6.0.0";
+       sha256 = "1ba7dvxz2x3ng4k221xawp0bz4gk4lz5gklklgypavp1fdrhf27q";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -219228,8 +219478,8 @@ self: {
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.16";
-       sha256 = "123dqm0rardrvvvrj8sjjs9z8yysk9qzwvrs3skqzxrq5pffyarp";
+       version = "0.0.0.17";
+       sha256 = "0wj0y6dyyy11flkywv96m95nq0qlmj4wykfwj4xw8fwjjmsmg91f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -219825,6 +220075,8 @@ self: {
        pname = "vpq";
        version = "0.1.0.0";
        sha256 = "1qa3l71ch96slan8s2zx9wc4ljsl4jgl83m7h0rfb9nd9cawflf7";
+       revision = "1";
+       editedCabalFile = "16wnqvfblg8gimixc9pjdii4anbqjlkn12xrb6aw3sqk26pq7khb";
        libraryHaskellDepends = [ base primitive util vector ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Priority queue based on vector";
@@ -220048,8 +220300,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "vulkan-api";
-       version = "1.1.2.0";
-       sha256 = "0l52494zi9r3fq3nx21r8pkbb7zkynz1gbrn58k8pramx7nhksb1";
+       version = "1.1.2.1";
+       sha256 = "0iwzjr2w6ifsj6lah8viahsxcqxiqy0dk1v6lnzi77nb05sjpr6d";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/achirkin/vulkan#readme";
        description = "Low-level low-overhead vulkan api bindings";
-- 
GitLab


From 77fbd14d8552c311c6bd8e54c94fe41e5edd7c79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 May 2018 20:01:49 +0200
Subject: [PATCH 0395/1085] haskell-gi: apply upstream patch to fix the doctest
 suite

---
 pkgs/development/haskell-modules/configuration-common.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 45560de984f..c18c69f9a44 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -422,8 +422,11 @@ self: super: {
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
 
-  # https://github.com/haskell-gi/haskell-gi/pull/163
-  haskell-gi = dontCheck super.haskell-gi;
+  # Version 0.21.2 calls its doctest suite with incorrect paths.
+  haskell-gi = appendPatch super.haskell-gi (pkgs.fetchpatch {
+    url = https://github.com/haskell-gi/haskell-gi/pull/163/commits/b876c4f351893370d4ae597aab6ecc0422e7f665.patch;
+    sha256 = "03vzpvnr3vnz2zgsr504iyf0n9aw6mkz8rkj6zhazfixl3dzfkyd";
+  });
 
   # https://github.com/basvandijk/threads/issues/10
   threads = dontCheck super.threads;
-- 
GitLab


From a9577da115fbd5a04e9650e22d4b378acb1ebca6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 May 2018 20:02:35 +0200
Subject: [PATCH 0396/1085] haskell-brick: update override for ghc-8.4.x to the
 latest version

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 4ed59fb6662..70624d1ed6a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -441,7 +441,7 @@ self: super: {
   });
 
   # Older versions don't compile.
-  brick = self.brick_0_36_3;
+  brick = self.brick_0_37;
   dhall = self.dhall_1_13_0;
   dhall_1_13_0 = doJailbreak super.dhall_1_13_0;  # support ansi-terminal 0.8.x
   HaTeX = self.HaTeX_3_19_0_0;
-- 
GitLab


From 32d8a7d249880c25079eb580caf3c94d58f35c23 Mon Sep 17 00:00:00 2001
From: Valentin Heidelberger <github@valentinsblog.com>
Date: Wed, 9 May 2018 20:50:06 +0200
Subject: [PATCH 0397/1085] keepassxc: 2.3.2 -> 2.3.3

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

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 373320dfe15..6b37f9b9145 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -26,13 +26,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassxc-${version}";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "13gf7rsan6fjkdr46xkr08d150nh194fkbzb4cazwd7rf05agw1y";
+    sha256 = "08cj1nxbjy2m80h3irnra2qha7fc5ahhzcgkyk9jv4zyys9xv998";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
-- 
GitLab


From e745d087c6700c81486e87484012cb201f55f81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 9 May 2018 16:44:28 -0300
Subject: [PATCH 0398/1085] plano-theme: 3.24-3 -> 3.28-1

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

diff --git a/pkgs/misc/themes/plano/default.nix b/pkgs/misc/themes/plano/default.nix
index 64d4e807e42..2d10ff7c607 100644
--- a/pkgs/misc/themes/plano/default.nix
+++ b/pkgs/misc/themes/plano/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "plano-theme-${version}";
-  version = "3.24-3";
+  version = "3.28-1";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "plano-theme";
     rev = "v${version}";
-    sha256 = "079gj3kgsim01r7yb9dcxvrci3my1y0zkn86igdlspxcnjzmxkq0";
+    sha256 = "1862nx7c8786vfa0qdg4aqa13whsk3j5n93v9m91wpccv19n0ryn";
   };
 
   buildInputs = [ gdk_pixbuf gtk_engines ];
-- 
GitLab


From 7b0b4cd3977fe261f34e928bb375a5760b27d93a Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Wed, 9 May 2018 10:58:33 -0400
Subject: [PATCH 0399/1085] perlPackages.NetZooKeeper: init at 0.41

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3278311f25c..3dc0ed43a5a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11758,6 +11758,22 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  NetZooKeeper = buildPerlPackage rec {
+    name = "Net-ZooKeeper-0.41";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MA/MAF/${name}.tar.gz";
+      sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9";
+    };
+    buildInputs = [ pkgs.zookeeper_mt ];
+    NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include";
+    NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt";
+    meta = {
+      maintainers = [ maintainers.limeytexan ];
+      homepage = https://github.com/mark-5/p5-net-zookeeper;
+      license = stdenv.lib.licenses.asl20;
+    };
+  };
+
   PackageConstants = buildPerlPackage {
     name = "Package-Constants-0.06";
     src = fetchurl {
-- 
GitLab


From 9410c39b9a8a2f598eb2cc407d9f314c09597818 Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Wed, 9 May 2018 08:48:28 -0400
Subject: [PATCH 0400/1085] perlPackages.LinuxACL: init at 0.05

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3dc0ed43a5a..933169f9eb7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -450,6 +450,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  LinuxACL = buildPerlPackage rec {
+    name = "Linux-ACL-0.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/N/NA/NAZAROV/${name}.tar.gz";
+      sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371";
+    };
+    buildInputs = [ pkgs.acl ];
+    NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl";
+    meta = {
+      maintainers = [ maintainers.limeytexan ];
+      description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   ListCompare = buildPerlPackage rec {
     name = "List-Compare-0.53";
     src = fetchurl {
-- 
GitLab


From df37647ab2d7069288b6535a9fd6deb2f630d866 Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Wed, 9 May 2018 13:15:22 -0400
Subject: [PATCH 0401/1085] Fix alphabetization of perl modules

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 933169f9eb7..22733443ed1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -450,35 +450,6 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  LinuxACL = buildPerlPackage rec {
-    name = "Linux-ACL-0.05";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/N/NA/NAZAROV/${name}.tar.gz";
-      sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371";
-    };
-    buildInputs = [ pkgs.acl ];
-    NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl";
-    meta = {
-      maintainers = [ maintainers.limeytexan ];
-      description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
-
-  ListCompare = buildPerlPackage rec {
-    name = "List-Compare-0.53";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz";
-      sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550";
-    };
-    buildInputs = [ IOCaptureOutput ];
-    meta = {
-      homepage = http://thenceforward.net/perl/modules/List-Compare/;
-      description = "Compare elements of two or more lists";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
-
   ArchiveCpio = buildPerlPackage rec {
     name = "Archive-Cpio-0.10";
     src = fetchurl {
@@ -8539,6 +8510,21 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
   };
 
+  LinuxACL = buildPerlPackage rec {
+    name = "Linux-ACL-0.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/N/NA/NAZAROV/${name}.tar.gz";
+      sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371";
+    };
+    buildInputs = [ pkgs.acl ];
+    NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl";
+    meta = {
+      maintainers = [ maintainers.limeytexan ];
+      description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   LinuxDistribution = buildPerlModule {
     name = "Linux-Distribution-0.23";
     src = fetchurl {
@@ -8586,6 +8572,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ListCompare = buildPerlPackage rec {
+    name = "List-Compare-0.53";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz";
+      sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550";
+    };
+    buildInputs = [ IOCaptureOutput ];
+    meta = {
+      homepage = http://thenceforward.net/perl/modules/List-Compare/;
+      description = "Compare elements of two or more lists";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   ListMoreUtils = buildPerlPackage rec {
     name = "List-MoreUtils-0.428";
     src = fetchurl {
-- 
GitLab


From 6266387bfade09b17bdb4dea86f2f67f04cfb21d Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 9 May 2018 16:23:04 -0400
Subject: [PATCH 0402/1085] libminc: 2017-09-14 -> 2018-01-17

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

diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix
index 704c73284ae..ddab3439f02 100644
--- a/pkgs/development/libraries/libminc/default.nix
+++ b/pkgs/development/libraries/libminc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libminc";
-  name  = "${pname}-2017-09-14";
+  name  = "${pname}-2018-01-17";
 
   owner = "BIC-MNI";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     inherit owner;
     repo   = pname;
-    rev    = "e11c6df9321b4061bf87a7d43171ec55e9e3908f";
-    sha256 = "0lmd0js3jgni2mw1zfvd4qg6byxiv3ndgv2z3nm7975i83zw48xk";
+    rev    = "a9cbe1353eae9791b7d5b03af16e0f86922ce40b";
+    sha256 = "0mn4n3ihzcr1jw2g1vy6c8p4lkc88jwljk04argmj7k4djrgpxpa";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 7fb1a79b8fe9f028a05457a5af84eb3b60b9115f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 9 May 2018 22:38:16 +0200
Subject: [PATCH 0403/1085] androidStudioPackages.{dev,canary}: 3.2.0.12 ->
 3.2.0.13

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 630f5dd3447..328370c2501 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk";
   };
   latestVersion = {
-    version = "3.2.0.12"; # "Android Studio 3.2 Canary 13"
-    build = "181.4749738";
-    sha256Hash = "0mwsbmxzrs7yavgkckpmfvpz46v7fpa0nxvf8zqa9flmsv8p8l10";
+    version = "3.2.0.13"; # "Android Studio 3.2 Canary 14"
+    build = "181.4763614";
+    sha256Hash = "1rx3bip5a7v349whg26kxvj05qlvm7zwacfqnfzfmvvhzbh7xnyh";
   };
 in rec {
   # Old alias
-- 
GitLab


From 8a98cf97e92cecba4feda766f4b7ac36cd82f8ea Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 6 May 2018 15:44:24 -0500
Subject: [PATCH 0404/1085] lib.makeSearchPath: allow null in search path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes things match ‘buildInputs’ where inputs are allowed to be
null.
---
 lib/strings.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index e6df7d99cb2..61babf0b1aa 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -82,7 +82,7 @@ rec {
        => "//bin"
   */
   makeSearchPath = subDir: packages:
-    concatStringsSep ":" (map (path: path + "/" + subDir) packages);
+    concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) packages));
 
   /* Construct a Unix-style search path, using given package output.
      If no output is found, fallback to `.out` and then to the default.
-- 
GitLab


From 527abe59cf051350ad153a8756753d0ae93b94d4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 9 May 2018 15:46:48 -0500
Subject: [PATCH 0405/1085] generic-stack-builder: attempt to add propagation

Fixes #40039

This adds a shellHook to handle propagated dependencies like that seen
in #40039 where gpgme needed libgpg-error.
---
 .../haskell-modules/generic-stack-builder.nix     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 6e43df9aba6..5c2fced3f2e 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -20,10 +20,17 @@ in stdenv.mkDerivation (args // {
 
   STACK_PLATFORM_VARIANT="nix";
   STACK_IN_NIX_SHELL=1;
-  STACK_IN_NIX_EXTRA_ARGS =
-    concatMap (pkg: ["--extra-lib-dirs=${getLib pkg}/lib"
-                     "--extra-include-dirs=${getDev pkg}/include"]) buildInputs ++
-    extraArgs;
+  STACK_IN_NIX_EXTRA_ARGS = extraArgs;
+  shellHook = ''
+    for pkg in ''${pkgsHostHost[@]} ''${pkgsHostBuild[@]} ''${pkgsHostTarget[@]}
+    do
+      [ -d "$pkg/lib" ] && \
+        export STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$pkg/lib"
+      [ -d "$pkg/include" ] && \
+        export STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$pkg/include"
+    done
+  '';
+
 
   # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042.
   LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs);
-- 
GitLab


From 1e50e178ae2268ab0fd655a80d9d0c0db0aa62a5 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 9 May 2018 13:50:01 -0700
Subject: [PATCH 0406/1085] simpleitk: init at 1.1.0 (note this only builds the
 C++ libs, not the Python/Lua/... bindings) (#27451)

* conglomerate: init at 2017-09-10

* simpleitk: init at 1.1.0 (note this only builds the C++ libs, not the Python/Lua/... bindings)
---
 .../libraries/simpleitk/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/simpleitk/default.nix

diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
new file mode 100644
index 00000000000..4802683079d
--- /dev/null
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, git, swig, lua, itk }:
+
+stdenv.mkDerivation rec {
+  pname    = "simpleitk";
+  version = "1.0.0";
+  name  = "${pname}-${version}";
+
+  src = fetchurl {
+    url    = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz";
+    sha256 = "0554j0zp314zhs8isfg31fi6gvsl7xq3xjyyxkx1b1mjkn5qx673";
+  };
+
+  nativeBuildInputs = [ cmake git swig ];
+  buildInputs = [ lua itk ];
+
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ];
+
+  checkPhase = "ctest";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://www.simpleitk.org;
+    description = "Simplified interface to ITK";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d52cc8c5de6..555ed2a24ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11519,6 +11519,8 @@ with pkgs;
 
   simp_le = callPackage ../tools/admin/simp_le { };
 
+  simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; };
+
   sfml = callPackage ../development/libraries/sfml { };
   csfml = callPackage ../development/libraries/csfml { };
 
-- 
GitLab


From 53d6997e5d51e50f6864a1c8dc55bfef914130af Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 9 May 2018 22:59:54 +0200
Subject: [PATCH 0407/1085] haskell: fix build of base-compat-batteries

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index acbcb1320e6..ca3d4efed34 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -505,6 +505,6 @@ self: super: builtins.intersectAttrs super {
 
   # cabal2nix generates a dependency on base-compat, which is the wrong version
   base-compat-batteries = super.base-compat-batteries.override {
-    base-compat = pkgs.haskellPackages.base-compat_0_10_1;
+    base-compat = super.base-compat_0_10_1;
   };
 }
-- 
GitLab


From c218cd38d39aa9e7e8487afed7995446772a7ea6 Mon Sep 17 00:00:00 2001
From: Anders Riutta <git@andersriutta.com>
Date: Wed, 9 May 2018 14:12:55 -0700
Subject: [PATCH 0408/1085] pgmanage: update to current name (minor).

---
 pkgs/applications/misc/pgmanage/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index 7da71df7814..d08b183d9d0 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -24,9 +24,10 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A fast replacement for PGAdmin";
     longDescription = ''
-      At the heart of Postage is a modern, fast, event-based C-binary, built in
-      the style of NGINX and Node.js. This heart makes Postage as fast as any
-      PostgreSQL interface can hope to be.
+      At the heart of pgManage is a modern, fast, event-based C-binary, built in
+      the style of NGINX and Node.js. This heart makes pgManage as fast as any
+      PostgreSQL interface can hope to be. (Note: pgManage replaces Postage,
+      which is no longer maintained.)
     '';
     homepage = https://github.com/pgManage/pgManage;
     license = licenses.postgresql;
-- 
GitLab


From c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 9 May 2018 16:13:38 -0500
Subject: [PATCH 0409/1085] treewide: remove lib.meta.enableIfAvailable

---
 lib/meta.nix                                  |  2 --
 pkgs/os-specific/linux/systemd/default.nix    | 12 +++++++-----
 pkgs/tools/package-management/nix/default.nix |  5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/meta.nix b/lib/meta.nix
index 8516cc1cd6f..199030c103a 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -86,6 +86,4 @@ rec {
         then { system = elem; }
         else { parsed = elem; };
     in lib.matchAttrs pattern platform;
-
-  enableIfAvailable = p: if p.meta.available or true then [ p ] else [];
 }
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 58a1c7ca714..c1f139d42a6 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
 , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
 , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
-, audit, lz4, bzip2, kexectools, libmicrohttpd
+, audit, lz4, bzip2, libmicrohttpd
 , linuxHeaders ? stdenv.cc.libc.linuxHeaders
-, libseccomp, iptables, gnu-efi
+, iptables, gnu-efi
 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
 , ninja, meson, python3Packages, glibcLocales
 , patchelf
@@ -11,6 +11,8 @@
 , hostPlatform
 , buildPackages
 , withSelinux ? false, libselinux
+, withLibseccomp ? libseccomp.meta.available, libseccomp
+, withKexectools ? kexectools.meta.available, kexectools
 }:
 
 let
@@ -42,13 +44,13 @@ in stdenv.mkDerivation rec {
     [ linuxHeaders libcap kmod xz pam acl
       /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
       libmicrohttpd ] ++
-      stdenv.lib.meta.enableIfAvailable kexectools ++
-      stdenv.lib.meta.enableIfAvailable libseccomp ++
+      stdenv.lib.optional withKexectools kexectools ++
+      stdenv.lib.optional withLibseccomp libseccomp ++
     [ libffi audit lz4 bzip2 libapparmor
       iptables gnu-efi
       # This is actually native, but we already pull it from buildPackages
       pythonLxmlEnv
-    ] ++ stdenv.lib.optionals withSelinux [ libselinux ];
+    ] ++ stdenv.lib.optional withSelinux libselinux;
 
   #dontAddPrefix = true;
 
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 1d15bd11b7f..8f503d12935 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
 , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost
 , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
-, libseccomp, busybox-sandbox-shell
+, busybox-sandbox-shell
 , hostPlatform, buildPlatform
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
+, withLibseccomp ? libseccomp.meta.available, libseccomp
 }:
 
 let
@@ -30,7 +31,7 @@ let
     buildInputs = [ curl openssl sqlite xz bzip2 ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
       ++ lib.optionals is20 [ brotli ] # Since 1.12
-      ++ lib.meta.enableIfAvailable libseccomp
+      ++ lib.optional withLibseccomp libseccomp
       ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
           (aws-sdk-cpp.override {
             apis = ["s3"];
-- 
GitLab


From 038bf4f68b866ef59ab9a61372c05ee7cfcf9ec3 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 9 May 2018 23:20:20 +0200
Subject: [PATCH 0410/1085] tdesktopPackages.preview: 1.2.17 -> 1.2.19

---
 .../networking/instant-messengers/telegram/tdesktop/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index c47ce04f1f7..0e2c232e6d2 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,5 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
+    version = "1.2.19";
+    sha256Hash = "0val6lfcg3ghcksflm3jclqly0x8plpn3an8v9bix0s5yll1ka4h";
   });
 }
-- 
GitLab


From 3fa0ba917742c0790ff5418de0db65d94ee8b82e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 6 May 2018 15:10:46 -0400
Subject: [PATCH 0411/1085] lib/systems: Parse more arm cpu types

---
 lib/systems/parse.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 8a6c951d5e5..ffedd98c98d 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -69,9 +69,15 @@ rec {
   cpuTypes = with significantBytes; setTypes types.openCpuType {
     arm      = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv6m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv6l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv7a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv7r   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv7m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv7l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv8a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv8r   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv8m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; };
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
-- 
GitLab


From 2b9db24768a0a4cc9c1c69d9c6f48046948439cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 9 May 2018 20:03:48 -0300
Subject: [PATCH 0412/1085] zuki-themes: 3.26-1 -> 3.28-1

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

diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix
index dbdc4632dc7..35c8e58b0ae 100644
--- a/pkgs/misc/themes/zuki/default.nix
+++ b/pkgs/misc/themes/zuki/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "zuki-themes-${version}";
-  version = "3.26-1";
+  version = "3.28-1";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "zuki-themes";
     rev = "v${version}";
-    sha256 = "17p75h1i3hbpshhhliliq0mm88amvfnxq8659vabqd17ccgzwzns";
+    sha256 = "1if39k8vgk4cpshl625vdf8lz6jgicgybd5nilycj66sf1k5jgb9";
   };
 
   buildInputs = [ gdk_pixbuf gtk_engines ];
-- 
GitLab


From 1682353805e37b29b2dc0f06efdbe8a33a07363c Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 9 May 2018 18:12:13 -0500
Subject: [PATCH 0413/1085] generic-stack-builder: also support nix-build

We need to add the STACK_IN_NIX_EXTRA_ARGS hook in configurePhase also to ensure we get the right args when calling ```nix-build``` (as opposed to nix-shell).
---
 .../haskell-modules/generic-stack-builder.nix | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 5c2fced3f2e..9ea9dae02db 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -11,6 +11,18 @@ with stdenv.lib;
 }@args:
 
 let stackCmd = "stack --internal-re-exec-version=${stack.version}";
+
+    # Add all dependencies in buildInputs including propagated ones to
+    # STACK_IN_NIX_EXTRA_ARGS.
+    addStackArgsHook = ''
+for pkg in ''${pkgsHostHost[@]} ''${pkgsHostBuild[@]} ''${pkgsHostTarget[@]}
+do
+  [ -d "$pkg/lib" ] && \
+    export STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$pkg/lib"
+  [ -d "$pkg/include" ] && \
+    export STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$pkg/include"
+done
+    '';
 in stdenv.mkDerivation (args // {
 
   buildInputs =
@@ -21,15 +33,7 @@ in stdenv.mkDerivation (args // {
   STACK_PLATFORM_VARIANT="nix";
   STACK_IN_NIX_SHELL=1;
   STACK_IN_NIX_EXTRA_ARGS = extraArgs;
-  shellHook = ''
-    for pkg in ''${pkgsHostHost[@]} ''${pkgsHostBuild[@]} ''${pkgsHostTarget[@]}
-    do
-      [ -d "$pkg/lib" ] && \
-        export STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$pkg/lib"
-      [ -d "$pkg/include" ] && \
-        export STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$pkg/include"
-    done
-  '';
+  shellHook = addStackArgsHook;
 
 
   # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042.
@@ -46,6 +50,7 @@ in stdenv.mkDerivation (args // {
 
   configurePhase = args.configurePhase or ''
     export STACK_ROOT=$NIX_BUILD_TOP/.stack
+    ${addStackArgsHook}
   '';
 
   buildPhase = args.buildPhase or "${stackCmd} build";
-- 
GitLab


From 58ab75c63917f9c09df1063d549344b892ab569a Mon Sep 17 00:00:00 2001
From: Yannik Sander <ysndr@users.noreply.github.com>
Date: Thu, 10 May 2018 01:34:57 +0200
Subject: [PATCH 0414/1085] atom: fix git integration (#40163)

---
 pkgs/applications/editors/atom/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index ca223803f04..f646fab8629 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
 
     rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
     ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
+    rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/libexec/git-core/git
+    ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/libexec/git-core/git
 
     find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
 
@@ -45,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "A hackable text editor for the 21st Century";
     homepage = https://atom.io/;
     license = licenses.mit;
-    maintainers = [ maintainers.offline maintainers.nequissimus ];
+    maintainers = [ maintainers.offline maintainers.nequissimus maintainers.ysndr ];
     platforms = [ "x86_64-linux" ];
   };
 }
-- 
GitLab


From 948503440135e4b111b19d205b7d13ed76c2f1e3 Mon Sep 17 00:00:00 2001
From: Thorsten Weber <cpt.chaos83@googlemail.com>
Date: Thu, 10 May 2018 01:46:51 +0200
Subject: [PATCH 0415/1085] slic3r-prusa3d: 1.39.1 -> 1.39.2

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

diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix
index 1ee2bfab94c..371bf26fe6c 100644
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ b/pkgs/applications/misc/slic3r/prusa3d.nix
@@ -33,7 +33,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "slic3r-prusa-edition-${version}";
-  version = "1.39.1";
+  version = "1.39.2";
 
   enableParallelBuilding = true;
 
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "Slic3r";
-    sha256 = "0frkjgzmiy788ijkcqz3baxcrncqmk9s2vcd99hb8p2q13cg51ff";
+    sha256 = "0vbqkmd2yqi469ijqm4wyzjmq9w1kwiy8av1kchm4429z5hpmxcd";
     rev = "version_${version}";
   };
 
-- 
GitLab


From 18f4abb0ad4a76cc88b6f9c150a62fa68093294a Mon Sep 17 00:00:00 2001
From: Ruben Maher <ruben@maher.fyi>
Date: Wed, 9 May 2018 17:13:25 +0930
Subject: [PATCH 0416/1085] cocoapods: 1.3.1 -> 1.5.0

---
 .../development/mobile/cocoapods/Gemfile.lock | 42 +++++++-------
 pkgs/development/mobile/cocoapods/gemset.nix  | 58 +++++++++++--------
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock
index 0ab15f1efd2..7ca6e40406a 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile.lock
@@ -1,38 +1,39 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.6)
+    CFPropertyList (3.0.0)
     activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    atomos (0.1.2)
     claide (1.0.2)
-    cocoapods (1.3.1)
+    cocoapods (1.5.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.3.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.3, < 2.0)
+      cocoapods-core (= 1.5.0)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.2.0, < 2.0)
+      cocoapods-trunk (>= 1.3.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.7)
+      molinillo (~> 0.6.5)
       nap (~> 1.0)
       ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.1, < 2.0)
-    cocoapods-core (1.3.1)
+      xcodeproj (>= 1.5.7, < 2.0)
+    cocoapods-core (1.5.0)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.3)
+    cocoapods-deintegrate (1.0.2)
+    cocoapods-downloader (1.2.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -46,23 +47,24 @@ GEM
     escape (0.0.4)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.3)
-    i18n (0.9.1)
+    gh_inspector (1.1.3)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.10.3)
-    molinillo (0.5.7)
-    nanaimo (0.2.3)
+    minitest (5.11.3)
+    molinillo (0.6.5)
+    nanaimo (0.2.5)
     nap (1.1.0)
     netrc (0.11.0)
     ruby-macho (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.5.3)
-      CFPropertyList (~> 2.3.3)
+    xcodeproj (1.5.7)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.2)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
+      nanaimo (~> 0.2.4)
 
 PLATFORMS
   ruby
diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix
index ff7b14e6dd8..cd4156d141c 100644
--- a/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/pkgs/development/mobile/cocoapods/gemset.nix
@@ -8,13 +8,21 @@
     };
     version = "4.2.10";
   };
+  atomos = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10z69hjv30r2w5q5wmlf0cq4jv3w744jrac8ylln8sf45ckqj7wk";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
   CFPropertyList = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hadm41xr1fq3qp74jd9l5q8l0j9083rgklgzsilllwaav7qrrid";
+      sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z";
       type = "gem";
     };
-    version = "2.3.6";
+    version = "3.0.0";
   };
   claide = {
     source = {
@@ -28,35 +36,35 @@
     dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "050b7795jc6802wcpcgi702qkgy8vjidgq6c6mbx2alrq7l0n8q7";
+      sha256 = "0pg2rkw6rlqq0y2vpajw4946hmvcnrg6lhr1i5p7j7kj8y5az167";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.5.0";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "fuzzy_match" "nap"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pr42lpqs6q51gnnfxmgmbx7sw0dwyawylssj588izj8av18rhpy";
+      sha256 = "0mqxgd22rj49pfasvinsn7z1bzm899m8cfw38yr38nspri10acad";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.5.0";
   };
   cocoapods-deintegrate = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x4hxlip6zkrs1vcmw7sh45ayn5pxvsg782iifnmgjwn2pyskj7l";
+      sha256 = "10b49glw3jd0r1vj36zb0vz2idwgziq8qgzf7yjkrsm41xm098zz";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.0.2";
   };
   cocoapods-downloader = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1664qg1wml70slcfklpnyq5ixp145f6iyn3c6pcqkqc64i1bsg87";
+      sha256 = "1azzwyxvcqk5g394ica80x7pj7bh9zysk2q7x1jh8zbwrp6c0x8c";
       type = "gem";
     };
-    version = "1.1.3";
+    version = "1.2.0";
   };
   cocoapods-plugins = {
     dependencies = ["nap"];
@@ -143,43 +151,43 @@
   gh_inspector = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lxvp8xpjd2cazzcp90phy567spp4v41bnk9awgx8absndv70k1x";
+      sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.1.3";
   };
   i18n = {
     dependencies = ["concurrent-ruby"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s";
+      sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
       type = "gem";
     };
-    version = "0.9.1";
+    version = "0.9.5";
   };
   minitest = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05521clw19lrksqgvg2kmm025pvdhdaniix52vmbychrn2jm7kz2";
+      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
       type = "gem";
     };
-    version = "5.10.3";
+    version = "5.11.3";
   };
   molinillo = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19h1nks0x2ljwyijs2rd1f9sh05j8xqvjaqk1rslp5nyy6h4a758";
+      sha256 = "19zlshd1ra15x0a4jzss6ilz2xsnq293p43kxsljiy7xxq7bipx7";
       type = "gem";
     };
-    version = "0.5.7";
+    version = "0.6.5";
   };
   nanaimo = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z6rbji02x75vm5jw4hbpp75khp4z5yfgbaz1h9l8aa00hqf0fxd";
+      sha256 = "03x5f7hk0s21hlkj309w0qipjxz34kyd3c5yj25zq3s2yyn57idi";
       type = "gem";
     };
-    version = "0.2.3";
+    version = "0.2.5";
   };
   nap = {
     source = {
@@ -217,18 +225,18 @@
     dependencies = ["thread_safe"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp";
+      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
       type = "gem";
     };
-    version = "1.2.4";
+    version = "1.2.5";
   };
   xcodeproj = {
-    dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"];
+    dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7";
+      sha256 = "16743g16mrh47f1lxkbw28xn9mmlf1r0zicin4malalsxxkc7ykz";
       type = "gem";
     };
-    version = "1.5.3";
+    version = "1.5.7";
   };
 }
\ No newline at end of file
-- 
GitLab


From e42a7a5c0bdeb4c40921d319ae6a14f7e304e4df Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 9 May 2018 23:33:31 -0400
Subject: [PATCH 0417/1085] lib/systems: Add uClibc just like MUSL

---
 lib/systems/default.nix | 1 +
 lib/systems/inspect.nix | 1 +
 lib/systems/parse.nix   | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index bd408e00bb1..9b930824609 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -29,6 +29,7 @@ rec {
         /**/ if final.isDarwin              then "libSystem"
         else if final.isMinGW               then "msvcrt"
         else if final.isMusl                then "musl"
+        else if final.isUClibc              then "uclibc"
         else if final.isAndroid             then "bionic"
         else if final.isLinux /* default */ then "glibc"
         # TODO(@Ericson2314) think more about other operating systems
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 91ae2cd2557..6738ae3d441 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -36,6 +36,7 @@ rec {
 
     isAndroid      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
     isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
+    isUClibc       = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];
 
     isKexecable    = map (family: { kernel = kernels.linux; cpu.family = family; })
                        [ "x86" "arm" "aarch64" "mips" ];
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index ffedd98c98d..7ba06f129db 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -193,6 +193,9 @@ rec {
     musleabi = {};
     musleabihf = {};
     musl = {};
+    uclibceabihf = {};
+    uclibceabi = {};
+    uclibc = {};
 
     unknown = {};
   };
-- 
GitLab


From f063a860d69c5fbf3695a262da6a551ddd92a5f2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 9 May 2018 22:40:27 -0400
Subject: [PATCH 0418/1085] xbursttools: Cleanup slightly

---
 lib/systems/examples.nix                 | 14 ++++++++++++++
 pkgs/tools/misc/xburst-tools/default.nix |  4 ++--
 pkgs/top-level/all-packages.nix          | 18 ++----------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 848737700b0..f3abfe2c621 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -57,6 +57,20 @@ rec {
     platform = platforms.pogoplug4;
   };
 
+  ben-nanonote = rec {
+    config = "mipsel-unknown-linux-uclibc";
+    arch = "mips";
+    float = "soft";
+    platform = {
+      name = "ben_nanonote";
+      kernelMajor = "2.6";
+      kernelArch = "mips";
+      gcc = {
+        arch = "mips32";
+      };
+    };
+  };
+
   fuloongminipc = rec {
     config = "mipsel-unknown-linux-gnu";
     arch = "mips";
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
index c64ae609bcb..21aabc4e89c 100644
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ b/pkgs/tools/misc/xburst-tools/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig
-, gccCross ? null, crossPrefix
+, gccCross ? null
 }:
 
 let
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   '';
 
   configureFlags = if gccCross != null then
-    "--enable-firmware CROSS_COMPILE=${crossPrefix}-"
+    "--enable-firmware CROSS_COMPILE=${gccCross.targetPrefix}"
     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 d38f8d20188..627bac20e93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5512,28 +5512,14 @@ with pkgs;
 
   x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { };
 
-  xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools rec {
+  xbursttools = callPackage ../tools/misc/xburst-tools {
     # It needs a cross compiler for mipsel to build the firmware it will
     # load into the Ben Nanonote
-    crossPrefix = "mipsel-unknown-linux-gnu";
     gccCross =
       let
         pkgsCross = nixpkgsFun {
           # Ben Nanonote system
-          crossSystem = {
-            config = crossPrefix;
-            arch = "mips";
-            float = "soft";
-            libc = "uclibc";
-            platform = {
-              name = "ben_nanonote";
-              kernelMajor = "2.6";
-              kernelArch = "mips";
-            };
-            gcc = {
-              arch = "mips32";
-            };
-          };
+          crossSystem = lib.systems.examples.ben-nanonote;
         };
       in
         pkgsCross.buildPackages.gccCrossStageStatic;
-- 
GitLab


From 9dadb9e3cb20003d2510d1911a44f93a60cdf87a Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 9 May 2018 03:40:34 -0400
Subject: [PATCH 0419/1085] Fix hsc2hs cross compiler build

---
 pkgs/development/compilers/ghc/8.4.2.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index b588592a71c..94555482d28 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -3,7 +3,7 @@
 
 # build-tools
 , bootPkgs, alex, happy
-, autoconf, automake, coreutils, fetchurl, perl, python3
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3
 
 , libffi, libiconv ? null, ncurses
 
@@ -81,6 +81,13 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "doc" ];
 
+  patches = [(fetchpatch {
+    url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
+    sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
+    extraPrefix = "utils/hsc2hs/";
+    stripLen = 1;
+  })];
+
   postPatch = "patchShebangs .";
 
   # GHC is a bit confused on its cross terminology.
-- 
GitLab


From 17b2ef2461ccaae59aef957babcdfc7a57d71bb3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 11:54:33 +0800
Subject: [PATCH 0420/1085] hugo: 0.36.1 -> 0.40.3

---
 pkgs/applications/misc/hugo/default.nix |   4 +-
 pkgs/applications/misc/hugo/deps.nix    | 122 ++++++++++++------------
 2 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index f984cb712c7..e4e45dd570b 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.36.1";
+  version = "0.40.3";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "gohugoio";
     repo   = "hugo";
     rev    = "v${version}";
-    sha256 = "179lzkd6f81rssgcwlngx2mhr9nvbj0rsh6yjbf1fsrpxfzr2q9z";
+    sha256 = "08d4y6x19cd4qy9pf80zrqarcyarbzxph0yp8mfb1sp2bvq42308";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index cf55ef4b64b..a99eb563dc2 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/PuerkitoBio/purell";
-      rev = "1c4bec281e4bbc75b4f4a1bd923bdf1bd989a969";
-      sha256 = "05aif0xf3i6j6r0ivas8ywagkz92iynsa0xnkbrif4w1chzalx0f";
+      rev = "975f53781597ed779763b7b65566e74c4004d8de";
+      sha256 = "1j5l793zxrjv09z3cdgs05qn45sbhbm9njsw5cfv168x8z88pd3l";
     };
   }
   {
@@ -32,8 +32,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/alecthomas/chroma";
-      rev = "df4ec264daccb2ecb17bde9134830100701199c5";
-      sha256 = "1snw7byfkfvvw0579jc0yxk79j1v1rb0jdcvivfsalh064zmjdvd";
+      rev = "222a1f0fc811afd47471d4a4e32f3aa09b6f9cdf";
+      sha256 = "090yb9f9gld4l0r6x8y2a6a3ghiqbyh19fgmjcjfq8qlv0vj5n4s";
+    };
+  }
+  {
+    goPackagePath = "github.com/bep/debounce";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bep/debounce";
+      rev = "844797fa1dd9ba969d71b62797ff19d1e49d4eac";
+      sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy";
     };
   }
   {
@@ -41,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/bep/gitmap";
-      rev = "de8030ebafb76c6e84d50ee6d143382637c00598";
-      sha256 = "0adkv2ghi0zd104akksa9wjzj7s849wpa1rij03mycgxp4si9ami";
+      rev = "012701e8669671499fc43e9792335a1dcbfe2afb";
+      sha256 = "10ixv4zwmrpxvpchws78yzsjvw1zplljw3iqvwpina2mkwwp71ql";
     };
   }
   {
@@ -77,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/disintegration/imaging";
-      rev = "1884593a19ddc6f2ea050403430d02c1d0fc1283";
-      sha256 = "13wlkidihz7gc36hd1vy7i81d0v1rbnw97118z3slq1kv1j56zll";
+      rev = "bbcee2f5c9d5e94ca42c8b50ec847fec64a6c134";
+      sha256 = "0dzwqy1xcm0d481z1fa2r60frdlf5fzjligpiqh5g8lhqskk2lx8";
     };
   }
   {
@@ -113,8 +122,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gobuffalo/envy";
-      rev = "50fabbbaf1e65fc9b739f37a00590c396485d84d";
-      sha256 = "0js2hggb1gybk28pk3hcsb1m6rswfdzvvr194z4my4za09ly5jax";
+      rev = "ef60bfc50c8f92d1ee64674d8ce7a48f1f67625e";
+      sha256 = "15qrmw3l2achpd3hz8fkkz7yzpbvldm1pf1vsr250q24nsh6x7iz";
     };
   }
   {
@@ -122,8 +131,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gobwas/glob";
-      rev = "19c076cdf202b3d1c0489bdfa2f2f289f634474b";
-      sha256 = "0176psz3m0pks0ka6pb62g7ccq5izzj0i7c0j20lb7dp3kawphxs";
+      rev = "f00a7392b43971b2fdb562418faab1f18da2067a";
+      sha256 = "1b7jnb7rx99na25lkm9m9jr583mv7y0lwp57w58sv7ir9iiilx29";
     };
   }
   {
@@ -131,8 +140,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/websocket";
-      rev = "f37d1588608ec036fa9b0b7b8afbde47dc06aea9";
-      sha256 = "1y0z7k4yi8aaw6yjm8s92hvbkyc51b5azpiywminjj1a84czvzvq";
+      rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785";
+      sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy";
     };
   }
   {
@@ -158,8 +167,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/hcl";
-      rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
-      sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
+      rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
+      sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
     };
   }
   {
@@ -176,8 +185,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/joho/godotenv";
-      rev = "6bb08516677f8c8274c557fc801bee9ab564ab2c";
-      sha256 = "0jqczq5x5zwgs29vrmq87335c99gi5jrvxkwcpidz98yqg95db4f";
+      rev = "1709ab122c988931ad53508747b3c061400c2984";
+      sha256 = "1pym5lydb28ggxrz80q9s26bj2bd80ax1igm1zfhyhx9i3060kif";
     };
   }
   {
@@ -203,8 +212,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/markbates/inflect";
-      rev = "80fa1ea41b0dc859816314ab0b85f07a6bc57923";
-      sha256 = "0fmpfcz8g0qsb6h94yqpcms2bdb68qac706b54x0k1crfzl1d1mj";
+      rev = "fbc6b23ce49e2578f572d2e72bb72fa03c7145de";
+      sha256 = "10rf7kfqnic8x4z8c29whb76w9v847y63wh5b2kfx6rqhrjfilis";
     };
   }
   {
@@ -212,8 +221,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-runewidth";
-      rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d";
-      sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg";
+      rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
     };
   }
   {
@@ -225,15 +234,6 @@
       sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk";
     };
   }
-  {
-    goPackagePath = "github.com/mitchellh/go-homedir";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-homedir";
-      rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
-      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
-    };
-  }
   {
     goPackagePath = "github.com/mitchellh/mapstructure";
     fetch = {
@@ -248,8 +248,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/muesli/smartcrop";
-      rev = "c2a0373a193bac1daf8b6691e2ece069c5d7ac7f";
-      sha256 = "1jv68g9wddm2a1kf838anjnr4w17k7sqzz01h4z2lfashw3nanar";
+      rev = "f6ebaa786a12a0fdb2d7c6dee72808e68c296464";
+      sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp";
     };
   }
   {
@@ -257,8 +257,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nicksnyder/go-i18n";
-      rev = "ec04da47793482067e2e376d810e1622277368e4";
-      sha256 = "1c7ip5jidvssr8d4dbx9nchf99m13wblgaz630f7wm73y99dc3lr";
+      rev = "8c6996ea1058153460146b16c341a4ae611f7cf7";
+      sha256 = "1k8ai8mdi5cqbcxihzx727z3gg46lpkw0s1byb3lrdnmp31l7p9r";
     };
   }
   {
@@ -266,8 +266,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/olekukonko/tablewriter";
-      rev = "b8a9be070da40449e501c3c4730a889e42d87a9e";
-      sha256 = "1z9frlk9avqhzjv6zz2rg7mvdhzcr9acdgagblijwwkx01f02hw7";
+      rev = "d4647c9c7a84d847478d890b816b7d8b62b0b279";
+      sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l";
     };
   }
   {
@@ -275,8 +275,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8";
-      sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh";
+      rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
+      sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
     };
   }
   {
@@ -284,8 +284,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/russross/blackfriday";
-      rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5";
-      sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
+      rev = "11635eb403ff09dbc3a6b5a007ab5ab09151c229";
+      sha256 = "14j8ibm6h9rydiwfp9b5c7rwhnx04yqyxv1a7p7rmfwyg4zd714n";
     };
   }
   {
@@ -302,8 +302,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/afero";
-      rev = "bbf41cb36dffe15dff5bf7e18c447801e7ffe163";
-      sha256 = "19jgsm6y1yp99h0fr77rhamdsn34r8545if7y9q377l3phrz2s0l";
+      rev = "63644898a8da0bc22138abf860edaf5277b6102e";
+      sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
     };
   }
   {
@@ -320,8 +320,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "be77323fc05148ef091e83b3866c0d47c8e74a8b";
-      sha256 = "0kl0psbdg8cyznwvq13sva6r4ggmhwzfxdjmkl2vqhy83xq3a6yn";
+      rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
     };
   }
   {
@@ -356,8 +356,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/pflag";
-      rev = "ee5fd03fd6acfd43e44aea0b4135958546ed8e73";
-      sha256 = "1fgb1ph3vrqcpdvypp3c1fwj15r587l9yvv5wqcq08shln5rbsnk";
+      rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
+      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
     };
   }
   {
@@ -365,8 +365,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/viper";
-      rev = "aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5";
-      sha256 = "089balmspfs2x68wr4riwh7qvhf0b061wqqqfw8j4p9pxvwrxsdc";
+      rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4";
+      sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v";
     };
   }
   {
@@ -383,8 +383,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/image";
-      rev = "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7";
-      sha256 = "017xpcshrj1r2w20xvpcx0rklpfmbz6h16msv12l3x0w6vy0800s";
+      rev = "f315e440302883054d0c2bd85486878cb4f8572c";
+      sha256 = "010pc6qjppqd9c7rramiwz7myvip9vhridfxy7wc2qj1kr92b4dc";
     };
   }
   {
@@ -392,8 +392,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb";
-      sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf";
+      rev = "f73e4c9ed3b7ebdd5f699a16a880c2b1994e50dd";
+      sha256 = "1mvnpln6vm0y1i5bb0ycswds49hyapg3jz643lmlw6d183jdcg0q";
     };
   }
   {
@@ -401,8 +401,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sync";
-      rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5";
-      sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836";
+      rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
     };
   }
   {
@@ -410,8 +410,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd";
-      sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg";
+      rev = "64746a42f36bf0832f86b76004f1699dbeb33e4f";
+      sha256 = "1hbk7cnbywiwxdzbx7lqw6iym9dpwvdyacg06gchxpfw7nfa9r27";
     };
   }
   {
@@ -419,8 +419,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "9e2b64d659da1afe07ce1c9c1dfefc09d188f21e";
-      sha256 = "00ichxdybvs76gj805j828qxg7x4h4v64pq1s56ydaw07ja6lmry";
+      rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f";
+      sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr";
     };
   }
   {
@@ -428,8 +428,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4";
-      sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0";
+      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
     };
   }
 ]
-- 
GitLab


From d65fe65616f28b60102fd9d05e593676e5a75555 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 9 May 2018 20:49:12 -0400
Subject: [PATCH 0421/1085] uclibc: Fix eval

---
 pkgs/os-specific/linux/uclibc/default.nix | 38 ++++++++++++-----------
 pkgs/top-level/all-packages.nix           |  9 +++---
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 180aabc94cc..426834d4225 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchzip, linuxHeaders, libiconvReal, cross ? null, gccCross ? null,
-extraConfig ? ""}:
-
-assert stdenv.isLinux;
-assert cross != null -> gccCross != null;
+{ stdenv, buildPackages
+, fetchzip, linuxHeaders, libiconvReal
+, buildPlatform, hostPlatform
+, extraConfig ? ""
+}:
 
 let
   configParser = ''
@@ -28,9 +28,6 @@ let
     }
   '';
 
-  archMakeFlag = if cross != null then "ARCH=${cross.arch}" else "";
-  crossMakeFlag = if cross != null then "CROSS=${cross.config}-" else "";
-
   # UCLIBC_SUSV4_LEGACY defines 'tmpnam', needed for gcc libstdc++ builds.
   nixConfig = ''
     RUNTIME_PREFIX "/"
@@ -43,7 +40,7 @@ let
     UCLIBC_SUSV4_LEGACY y
     UCLIBC_HAS_THREADS_NATIVE y
     KERNEL_HEADERS "${linuxHeaders}/include"
-  '' + stdenv.lib.optionalString (stdenv.isAarch32 && cross == null) ''
+  '' + stdenv.lib.optionalString (stdenv.isAarch32 && buildPlatform != hostPlatform) ''
     CONFIG_ARM_EABI y
     ARCH_WANTS_BIG_ENDIAN n
     ARCH_BIG_ENDIAN n
@@ -58,7 +55,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = name + stdenv.lib.optionalString (cross != null) ("-" + cross.config);
+  inherit name;
 
   src = fetchzip {
     name = name + "-source";
@@ -68,13 +65,12 @@ stdenv.mkDerivation {
 
   # 'ftw' needed to build acl, a coreutils dependency
   configurePhase = ''
-    make defconfig ${archMakeFlag}
+    make defconfig
     ${configParser}
     cat << EOF | parseconfig
     ${nixConfig}
     ${extraConfig}
-    ${if cross != null then stdenv.lib.attrByPath [ "uclibc" "extraConfig" ] "" cross else ""}
-    $extraCrossConfig
+    ${hostPlatform.platform.uclibc.extraConfig or ""}
     EOF
     ( set +o pipefail; yes "" | make oldconfig )
   '';
@@ -82,11 +78,16 @@ stdenv.mkDerivation {
   hardeningDisable = [ "stackprotector" ];
 
   # Cross stripping hurts.
-  dontStrip = cross != null;
+  dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
-  makeFlags = [ crossMakeFlag "VERBOSE=1" ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  buildInputs = stdenv.lib.optional (gccCross != null) gccCross;
+  makeFlags = [
+    "ARCH=${hostPlatform.parsed.cpu.name}"
+    "VERBOSE=1"
+  ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "CROSS=${stdenv.cc.targetPrefix}"
+  ];
 
   # `make libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrwlock.h`:
   # error: bits/sysnum.h: No such file or directory
@@ -94,7 +95,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out
-    make PREFIX=$out VERBOSE=1 install ${crossMakeFlag}
+    make PREFIX=$out VERBOSE=1 install
     (cd $out/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .)
     # libpthread.so may not exist, so I do || true
     sed -i s@/lib/@$out/lib/@g $out/lib/libc.so $out/lib/libpthread.so || true
@@ -110,6 +111,7 @@ stdenv.mkDerivation {
     description = "A small implementation of the C library";
     maintainers = with maintainers; [ rasendubi ];
     license = licenses.lgpl2;
-    platforms = subtractLists ["aarch64-linux"] platforms.linux;
+    platforms = platforms.linux;
+    broken = hostPlatform.isAarch64;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 627bac20e93..c27168530e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8903,7 +8903,7 @@ with pkgs;
     # hack fixes the hack, *sigh*.
     /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross
     else if name == "bionic" then targetPackages.bionic
-    else if name == "uclibc" then uclibcCross
+    else if name == "uclibc" then targetPackages.uclibcCross
     else if name == "musl" then targetPackages.muslCross or muslCross
     else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
     else if name == "libSystem" then darwin.xcode
@@ -13819,10 +13819,9 @@ with pkgs;
 
   uclibc = callPackage ../os-specific/linux/uclibc { };
 
-  uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
-    gccCross = gccCrossStageStatic;
-    cross = assert targetPlatform != buildPlatform; targetPlatform;
-  });
+  uclibcCross = callPackage ../os-specific/linux/uclibc {
+    stdenv = crossLibcStdenv;
+  };
 
   udev = systemd;
   libudev = udev;
-- 
GitLab


From a31984ecdaf7b011163c3c71679eb285d951d735 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 9 May 2018 23:20:29 -0400
Subject: [PATCH 0422/1085] uclibc: Bump to uclibc-ng 1.0.30

---
 pkgs/os-specific/linux/uclibc/default.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 426834d4225..3da12c41dc1 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPackages
-, fetchzip, linuxHeaders, libiconvReal
+, fetchurl, linuxHeaders, libiconvReal
 , buildPlatform, hostPlatform
 , extraConfig ? ""
 }:
@@ -49,18 +49,17 @@ let
     UCLIBC_HAS_FPU n
   '';
 
-  name = "uclibc-0.9.34-pre-20150131";
-  rev = "343f6b8f1f754e397632b0552e4afe586c8b392b";
-
+  version = "1.0.30";
 in
 
 stdenv.mkDerivation {
-  inherit name;
+  name = "uclibc-ng-${version}";
+  inherit version;
 
-  src = fetchzip {
-    name = name + "-source";
-    url = "http://git.uclibc.org/uClibc/snapshot/uClibc-${rev}.tar.bz2";
-    sha256 = "1kgylzpid7da5i7wz7slh5q9rnq1m8bv5h9ilm76g0xwc2iwlhbw";
+  src = fetchurl {
+    url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.bz2";
+    # from "${url}.sha256";
+    sha256 = "3e0f057f24882823d697126015aa4d7d48fa2542be3939985cb3c26dcbcab5a8";
   };
 
   # 'ftw' needed to build acl, a coreutils dependency
@@ -107,11 +106,10 @@ stdenv.mkDerivation {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://www.uclibc.org/;
+    homepage = "https://uclibc-ng.org";
     description = "A small implementation of the C library";
     maintainers = with maintainers; [ rasendubi ];
     license = licenses.lgpl2;
     platforms = platforms.linux;
-    broken = hostPlatform.isAarch64;
   };
 }
-- 
GitLab


From 3390592cfc5d5406f7316a31661e6b0eeb2d352b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 10 May 2018 07:16:18 +0200
Subject: [PATCH 0423/1085] python.pkgs.traitlets: fix build and don't include
 .pytest_cache

Fixes build and prevents including `.pytest_cache` file (#40259).
---
 pkgs/development/python-modules/traitlets/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix
index c34bb09b794..8cc1332b473 100644
--- a/pkgs/development/python-modules/traitlets/default.nix
+++ b/pkgs/development/python-modules/traitlets/default.nix
@@ -7,6 +7,8 @@
 , ipython_genutils
 , decorator
 , enum34
+, pythonOlder
+, six
 }:
 
 buildPythonPackage rec {
@@ -20,12 +22,14 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ glibcLocales pytest mock ];
-  propagatedBuildInputs = [ ipython_genutils decorator enum34 ];
+  propagatedBuildInputs = [ ipython_genutils decorator six ] ++ lib.optional (pythonOlder "3.4") enum34;
 
   checkPhase = ''
-    LC_ALL="en_US.UTF-8" py.test $out
+    LC_ALL="en_US.UTF-8" py.test
   '';
 
+#   doCheck = false;
+
   meta = {
     description = "Traitlets Python config system";
     homepage = http://ipython.org/;
-- 
GitLab


From 6e62f01912afe4cd81e993945d731c1cccd9b281 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 13:25:31 +0800
Subject: [PATCH 0424/1085] slang: 2.3.1a -> 2.3.2

---
 pkgs/development/libraries/slang/default.nix | 23 +++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index 70e9d6181d9..bcce457e78e 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "slang-2.3.1a";
+  name = "slang-2.3.2";
   src = fetchurl {
     url = "http://www.jedsoft.org/releases/slang/${name}.tar.bz2";
-    sha256 = "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l";
+    sha256 = "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw";
   };
 
   outputs = [ "out" "dev" "man" "doc" ];
@@ -16,10 +16,23 @@ stdenv.mkDerivation rec {
     sed -i -e "s|/bin/ln|ln|" src/Makefile.in
     sed -i -e "s|-ltermcap|-lncurses|" ./configure
   '';
-  configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}";
-  buildInputs = [ pcre libpng zlib readline ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ];
+
+  configureFlags = [
+    "--with-png=${libpng.dev}"
+    "--with-z=${zlib.dev}"
+    "--with-pcre=${pcre.dev}"
+    "--with-readline=${readline.dev}"
+  ];
+
+  buildInputs = [
+    pcre libpng zlib readline
+  ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ];
+
   propagatedBuildInputs = [ ncurses ];
 
+  # slang 2.3.2 does not support parallel building
+  enableParallelBuilding = false;
+
   postInstall = ''
     find "$out"/lib/ -name '*.so' -exec chmod +x "{}" \;
     sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc
@@ -29,7 +42,7 @@ stdenv.mkDerivation rec {
     description = "A multi-platform programmer's library designed to allow a developer to create robust software";
     homepage = http://www.jedsoft.org/slang/;
     license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ fuuzetsu ];
     platforms = platforms.unix;
-    maintainers = [ maintainers.fuuzetsu ];
   };
 }
-- 
GitLab


From 0c810eeae1294ed2d6454c8d114f64a58671e3b8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 13:25:48 +0800
Subject: [PATCH 0425/1085] mc: parallel build

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

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index f9983cc0a7f..bc097e2a085 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -11,8 +11,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ perl glib slang zip unzip file gettext libX11 libICE
-    libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
+
+  buildInputs = [
+    perl glib slang zip unzip file gettext libX11 libICE libssh2 openssl
+  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
+
+  enableParallelBuilding = true;
 
   configureFlags = [ "--enable-vfs-smb" ];
 
-- 
GitLab


From a02be2bd85b37ed8b257e969d9439357844baa24 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 00:57:52 -0400
Subject: [PATCH 0426/1085] treewide: Get rid of `*Platform.arch`

Use `parsed.cpu.name` or `platform.gcc.arch` instead.
---
 lib/systems/examples.nix                           | 12 +-----------
 pkgs/applications/video/omxplayer/default.nix      |  2 +-
 pkgs/development/libraries/ffmpeg-full/default.nix |  2 +-
 pkgs/development/libraries/ffmpeg/generic.nix      |  2 +-
 pkgs/development/libraries/fontconfig/2.10.nix     |  4 +++-
 pkgs/development/libraries/fontconfig/default.nix  |  4 +++-
 pkgs/development/libraries/libav/default.nix       |  2 +-
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index f3abfe2c621..80e320406bf 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -11,22 +11,19 @@ rec {
 
   sheevaplug = rec {
     config = "armv5tel-unknown-linux-gnueabi";
-    arch = "armv5tel";
     float = "soft";
     platform = platforms.sheevaplug;
   };
 
   raspberryPi = rec {
     config = "armv6l-unknown-linux-gnueabihf";
-    arch = "armv6l";
     float = "hard";
     fpu = "vfp";
     platform = platforms.raspberrypi;
   };
 
   armv7l-hf-multiplatform = rec {
-    config = "arm-unknown-linux-gnueabihf";
-    arch = "armv7-a";
+    config = "armv7a-unknown-linux-gnueabihf";
     float = "hard";
     fpu = "vfpv3-d16";
     platform = platforms.armv7l-hf-multiplatform;
@@ -34,13 +31,11 @@ rec {
 
   aarch64-multiplatform = rec {
     config = "aarch64-unknown-linux-gnu";
-    arch = "aarch64";
     platform = platforms.aarch64-multiplatform;
   };
 
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
-    arch = "aarch64";
     platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
@@ -51,7 +46,6 @@ rec {
   };
 
   pogoplug4 = rec {
-    arch = "armv5tel";
     config = "armv5tel-unknown-linux-gnueabi";
     float = "soft";
     platform = platforms.pogoplug4;
@@ -59,7 +53,6 @@ rec {
 
   ben-nanonote = rec {
     config = "mipsel-unknown-linux-uclibc";
-    arch = "mips";
     float = "soft";
     platform = {
       name = "ben_nanonote";
@@ -73,7 +66,6 @@ rec {
 
   fuloongminipc = rec {
     config = "mipsel-unknown-linux-gnu";
-    arch = "mips";
     float = "hard";
     platform = platforms.fuloong2f_n32;
   };
@@ -122,7 +114,6 @@ rec {
   # 32 bit mingw-w64
   mingw32 = {
     config = "i686-pc-mingw32";
-    arch = "x86"; # Irrelevant
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
     platform = {};
   };
@@ -131,7 +122,6 @@ rec {
   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/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix
index 825bfe7955a..520451df400 100644
--- a/pkgs/applications/video/omxplayer/default.nix
+++ b/pkgs/applications/video/omxplayer/default.nix
@@ -52,7 +52,7 @@ let
         "--cross-prefix=${stdenv.cc.targetPrefix}"
         "--enable-cross-compile"
         "--target_os=linux"
-        "--arch=${hostPlatform.arch}"
+        "--arch=${hostPlatform.parsed.cpu.name}"
         ];
     };
 
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 67e364715f0..f991418ffda 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -442,7 +442,7 @@ stdenv.mkDerivation rec {
       "--cross-prefix=${stdenv.cc.targetPrefix}"
       "--enable-cross-compile"
       "--target_os=${hostPlatform.parsed.kernel.name}"
-      "--arch=${hostPlatform.arch}"
+      "--arch=${hostPlatform.parsed.cpu.name}"
     ];
   };
 
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 4a05eab87bd..530639d757d 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -176,7 +176,7 @@ stdenv.mkDerivation rec {
       "--cross-prefix=${stdenv.cc.targetPrefix}"
       "--enable-cross-compile"
       "--target_os=${hostPlatform.parsed.kernel.name}"
-      "--arch=${hostPlatform.arch}"
+      "--arch=${hostPlatform.parsed.cpu.name}"
     ];
   };
 
diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix
index 3f3c04b15a3..5fb0ea4429e 100644
--- a/pkgs/development/libraries/fontconfig/2.10.nix
+++ b/pkgs/development/libraries/fontconfig/2.10.nix
@@ -24,7 +24,9 @@ stdenv.mkDerivation rec {
   ];
 
   # We should find a better way to access the arch reliably.
-  crossArch = hostPlatform.arch or null;
+  crossArch = if stdenv.hostPlatform != stdenv.buildPlatform
+    then hostPlatform.parsed.cpu.name
+    else null;
 
   preConfigure = ''
     if test -n "$crossConfig"; then
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 9c4116c8f0b..ce41f1ac7eb 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -56,7 +56,9 @@ stdenv.mkDerivation rec {
   ];
 
   # We should find a better way to access the arch reliably.
-  crossArch = hostPlatform.arch or null;
+  crossArch = if stdenv.hostPlatform != stdenv.buildPlatform
+    then hostPlatform.parsed.cpu.name
+    else null;
 
   preConfigure = ''
     if test -n "$crossConfig"; then
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index a069894f6c8..1b52d18fd6b 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -113,7 +113,7 @@ let
         "--cross-prefix=${stdenv.cc.targetPrefix}"
         "--enable-cross-compile"
         "--target_os=linux"
-        "--arch=${hostPlatform.arch}"
+        "--arch=${hostPlatform.parsed.cpu.name}"
         ];
     };
 
-- 
GitLab


From fb9f5e4a0322da74201145a3ecbc816525972ab3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 10 May 2018 08:10:19 +0200
Subject: [PATCH 0427/1085] nixos/testing: Fix output of systemd messages

Regression introduced by d4468bedb52bf03ff125d721634f83604bddd589.

No systemd messages are shown anymore during VM test runs, which is not
very helpful if you want to find out about failures.

There is a bit of a conflict between testing and the change that
introduced the regression. While the mentioned commit makes sure that
the primary console is tty0 for virtualisation.graphics = false, our VM
tests need to have the serial console as primary console.

So in order to support both, I added a new virtualisation.qemu.consoles
option, which allows to specify those options using the module system.

The default of this option is to use the changes that were introduced
and in test-instrumentation.nix we use only the serial console the same
way as before.

For test-instrumentation.nix I didn't add a baudrate to the serial
console because I can't find a reason on top of my head why it should
need it. There also wasn't a reason stated when that was introduced in
7499e4a5b917227696b7292ae1bd728d6b1978b0.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @flokli, @dezgeg, @edolstra
---
 .../modules/testing/test-instrumentation.nix  |  3 +++
 nixos/modules/virtualisation/qemu-vm.nix      | 24 +++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 41dec2af9ed..98da55ed68a 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -58,6 +58,9 @@ in
     systemd.services."serial-getty@${qemuSerialDevice}".enable = false;
     systemd.services."serial-getty@hvc0".enable = false;
 
+    # Only use a serial console, no TTY.
+    virtualisation.qemu.consoles = [ qemuSerialDevice ];
+
     boot.initrd.preDeviceCommands =
       ''
         echo 600 > /proc/sys/kernel/hung_task_timeout_secs
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index d271144af48..0abf7b11703 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -25,10 +25,7 @@ let
 
   qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic";
 
-  # enable both serial console and tty0. select preferred console (last one) based on cfg.graphics
-  kernelConsoles = let
-    consoles = [ "console=${qemuSerialDevice},115200n8" "console=tty0" ];
-    in lib.concatStringsSep " " (if cfg.graphics then consoles else reverseList consoles);
+  consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles;
 
   # XXX: This is very ugly and in the future we really should use attribute
   # sets to build ALL of the QEMU flags instead of this mixed mess of Nix
@@ -111,7 +108,7 @@ let
             ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
-            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsoles} $QEMU_KERNEL_PARAMS" \
+            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS" \
           ''} \
           $extraDisks \
           ${qemuGraphics} \
@@ -336,6 +333,23 @@ in
           description = "Options passed to QEMU.";
         };
 
+      consoles = mkOption {
+        type = types.listOf types.str;
+        default = let
+          consoles = [ "${qemuSerialDevice},115200n8" "tty0" ];
+        in if cfg.graphics then consoles else reverseList consoles;
+        example = [ "console=tty1" ];
+        description = ''
+          The output console devices to pass to the kernel command line via the
+          <literal>console</literal> parameter, the primary console is the last
+          item of this list.
+
+          By default it enables both serial console and
+          <literal>tty0</literal>. The preferred console (last one) is based on
+          the value of <option>virtualisation.graphics</option>.
+        '';
+      };
+
       networkingOptions =
         mkOption {
           default = [
-- 
GitLab


From 67a8c66f68d9703cd2bf0a706c683de6c362f0d8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 10 May 2018 08:29:29 +0200
Subject: [PATCH 0428/1085] nixos/dovecot: Fix usage of dhparams option

The pull request that added dhparams (#39507) was made at the time where
the dhparams module overhaul (#39526) wasn't done yet, so it's still
using the old mechanics of the module.

As stated in the release notes:

  Module implementers should not set a specific bit size in order to let
  users configure it by themselves if they want to have a different bit
  size than the default (2048).

  An example usage of this would be:

    { config, ... }:

    {
      security.dhparams.params.myservice = {};
      environment.etc."myservice.conf".text = ''
        dhparams = ${config.security.dhparams.params.myservice.path}
      '';
    }

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @qknight, @abbradar, @hrdinka, @leenaars
---
 nixos/modules/services/mail/dovecot.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 96e60f9c88e..50477fdd25b 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -25,7 +25,7 @@ let
       ssl_cert = <${cfg.sslServerCert}
       ssl_key = <${cfg.sslServerKey}
       ${optionalString (!(isNull cfg.sslCACert)) ("ssl_ca = <" + cfg.sslCACert)}
-      ssl_dh = <${config.security.dhparams.path}/dovecot2.pem
+      ssl_dh = <${config.security.dhparams.params.dovecot2.path}
       disable_plaintext_auth = yes
     '')
 
@@ -302,9 +302,7 @@ in
 
     security.dhparams = mkIf (! isNull cfg.sslServerCert) {
       enable = true;
-      params = {
-        dovecot2 = 2048;
-      };
+      params.dovecot2 = {};
     };
    services.dovecot2.protocols =
      optional cfg.enableImap "imap"
-- 
GitLab


From f154aa32fc1d94eb6f564b120b284f4ae13e38e3 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 10 May 2018 11:14:04 +0300
Subject: [PATCH 0429/1085] handbrake: updated notes

---
 pkgs/applications/video/handbrake/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index d13995f6e9b..9f1dfb2d6b0 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -1,13 +1,9 @@
-# Handbrake normally uses its own copies of the libraries it uses, for better
-# control over library patches.
+# Upstream distributes HandBrake with bundle of according versions of libraries and patches to them.
 #
-# This derivation patches HB so it doesn't do that. The relevant patches
-# are added to the Nix packages and proposed upstream instead. In several cases
-# upstream already incorporated these patches.
-# This has the benefits of providing improvements to other packages,
-# making licenses more clear and reducing compile time/install size.
+# Derivation patches HandBrake to use our closure.
 #
-# Only tested on Linux
+
+# TODO: Release 1.2.0 would switch LibAV to FFmpeg.
 
 { stdenv, lib, fetchurl,
   python2, pkgconfig, yasm, harfbuzz, zlib,
@@ -34,7 +30,7 @@ stdenv.mkDerivation rec {
   };
 
   patched_libav_12 = libav_12.overrideAttrs (super: {
-    # 2018-04-26: HandBrake compilation (1.1.0) requires a patch of LibAV (12.3) from HandBrake team. This patch not went LibAV upstream.
+    # NOTE: 2018-04-26: HandBrake compilation (1.1.0) requires a patch of LibAV (12.3) from HandBrake team. This patch not went LibAV upstream.
     patches = (super.patches or []) ++ [(
       fetchurl {
         url = ''https://raw.githubusercontent.com/HandBrake/HandBrake/9e1f245708a157231c427c0ef9b91729d59a30e1/contrib/ffmpeg/A21-mp4-sdtp.patch'';
@@ -107,7 +103,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2;
     maintainers = with maintainers; [ Anton-Latukha wmertens ];
-    # Not tested on anything else
     platforms = platforms.linux;
   };
 }
-- 
GitLab


From 8c5557dc70ff083d574588188e6b5b6dbb67216a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 05:33:50 -0700
Subject: [PATCH 0430/1085] calibre: 3.22.1 -> 3.23.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-customize-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-customize-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-customize-wrapped_ help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-customize -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-customize --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-customize help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-debug-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-debug-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-debug-wrapped_ help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-debug -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-debug --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-debug help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-server-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-server-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-server -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-server --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-smtp-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-smtp-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-smtp -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-smtp --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.ebook-meta-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.ebook-meta-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/ebook-meta -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/ebook-meta --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.ebook-polish-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.ebook-polish-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/ebook-polish -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/ebook-polish --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.ebook-viewer-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.ebook-viewer-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/ebook-viewer -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/ebook-viewer --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.fetch-ebook-metadata-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.fetch-ebook-metadata-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/fetch-ebook-metadata -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/fetch-ebook-metadata --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrf2lrs-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrf2lrs-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrf2lrs -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrf2lrs --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrfviewer-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrfviewer-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrfviewer-wrapped_ help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrfviewer -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrfviewer --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrfviewer help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrs2lrf-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrs2lrf-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrs2lrf -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrs2lrf --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.markdown-calibre-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.markdown-calibre-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/markdown-calibre -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/markdown-calibre --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.web2disk-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.web2disk-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.web2disk-wrapped_ help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/web2disk -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/web2disk --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/web2disk help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-customize-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-customize-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-customize-wrapped-wrapped help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-customize-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-customize-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-customize-wrapped help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-debug-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-debug-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-debug-wrapped-wrapped help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-debug-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-debug-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-debug-wrapped help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-smtp-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-smtp-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-smtp-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-smtp-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..markdown-calibre-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..markdown-calibre-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.markdown-calibre-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.markdown-calibre-wrapped --help’ got 0 exit code
- found 3.23.0 with grep in /nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0
- directory tree listing: https://gist.github.com/8d953bc43339923b5dbd925cef68e5aa
---
 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 479aa26a19e..3c1f426fb1b 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.22.1";
+  version = "3.23.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1nd8pbcfpfw9b26511mhvsvjyfmgnfpdmzwhi7wpkx36wpa4sask";
+    sha256 = "0ds3i3dhkgpwa3c1lcq4zjmiaza8k9and0lbqqw4i6jrnpk691f9";
   };
 
   patches = [
-- 
GitLab


From 19ac1d7fd62b500326c2a1bad15b9e2fd7cb082c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 06:19:32 -0700
Subject: [PATCH 0431/1085] alembic: 1.7.7 -> 1.7.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin/bin/abcls -h’ got 0 exit code
- ran ‘/nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin/bin/abcls --help’ got 0 exit code
- ran ‘/nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin/bin/abcls help’ got 0 exit code
- ran ‘/nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin/bin/abctree -h’ got 0 exit code
- ran ‘/nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin/bin/abctree --help’ got 0 exit code
- ran ‘/nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin/bin/abcconvert --help’ got 0 exit code
- found 1.7.8 with grep in /nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin
- directory tree listing: https://gist.github.com/0d7ea213b28bd60d9e8cfe5bfbaa4363
---
 pkgs/development/libraries/alembic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 2276264e03f..015c48d0141 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec
 {
   name = "alembic-${version}";
-  version = "1.7.7";
+  version = "1.7.8";
 
   src = fetchFromGitHub {
     owner = "alembic";
     repo = "alembic";
     rev = "${version}";
-    sha256 = "16cgzn8cz3qbfpfh53bhn4ibwp5ddam3vxgz8zaglbj7z1a3pxfv";
+    sha256 = "1xmndhcliz25cgdzb7ybkvb05w4klmngpk76fzghamwyi79zfs2c";
   };
 
   outputs = [ "bin" "dev" "out" "lib" ];
-- 
GitLab


From 104c019ade9fd15200de6a8270f3f459ee87af33 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 10 May 2018 11:18:18 +0300
Subject: [PATCH 0432/1085] a52dec: rm old HandBrake patches

Patches no longer used in HandBrake upstream
---
 .../a52dec/A00-a52-state-t-public.patch       | 152 ------
 .../libraries/a52dec/A01-thread-safe.patch    | 462 ------------------
 .../libraries/a52dec/A02-imdct-shutup.patch   |  11 -
 .../libraries/a52dec/A03-automake.patch       |  12 -
 pkgs/development/libraries/a52dec/default.nix |  10 +-
 5 files changed, 1 insertion(+), 646 deletions(-)
 delete mode 100644 pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch
 delete mode 100644 pkgs/development/libraries/a52dec/A01-thread-safe.patch
 delete mode 100644 pkgs/development/libraries/a52dec/A02-imdct-shutup.patch
 delete mode 100644 pkgs/development/libraries/a52dec/A03-automake.patch

diff --git a/pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch b/pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch
deleted file mode 100644
index 5e0af3577d6..00000000000
--- a/pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff -Naur a52dec.old/include/a52.h a52dec.new/include/a52.h
---- a52dec.old/include/a52.h	2002-01-28 06:37:54.000000000 +0100
-+++ a52dec.new/include/a52.h	2012-07-16 14:13:35.000000000 +0200
-@@ -30,7 +30,71 @@
- typedef double sample_t;
- #endif
- 
--typedef struct a52_state_s a52_state_t;
-+typedef struct {
-+    uint8_t bai;              /* fine SNR offset, fast gain */
-+    uint8_t deltbae;          /* delta bit allocation exists */
-+    int8_t deltba[50];        /* per-band delta bit allocation */
-+} ba_t;
-+
-+typedef struct {
-+    uint8_t exp[256];         /* decoded channel exponents */
-+    int8_t bap[256];          /* derived channel bit allocation */
-+} expbap_t;
-+
-+typedef struct {
-+    uint8_t fscod;            /* sample rate */
-+    uint8_t halfrate;         /* halfrate factor */
-+    uint8_t acmod;            /* coded channels */
-+    uint8_t lfeon;            /* coded lfe channel */
-+    sample_t clev;            /* centre channel mix level */
-+    sample_t slev;            /* surround channels mix level */
-+
-+    int output;               /* type of output */
-+    sample_t level;           /* output level */
-+    sample_t bias;            /* output bias */
-+
-+    int dynrnge;              /* apply dynamic range */
-+    sample_t dynrng;          /* dynamic range */
-+    void * dynrngdata;        /* dynamic range callback funtion and data */
-+    sample_t (* dynrngcall) (sample_t range, void * dynrngdata);
-+
-+    uint8_t chincpl;          /* channel coupled */
-+    uint8_t phsflginu;        /* phase flags in use (stereo only) */
-+    uint8_t cplstrtmant;      /* coupling channel start mantissa */
-+    uint8_t cplendmant;       /* coupling channel end mantissa */
-+    uint32_t cplbndstrc;      /* coupling band structure */
-+    sample_t cplco[5][18];    /* coupling coordinates */
-+
-+    /* derived information */
-+    uint8_t cplstrtbnd;       /* coupling start band (for bit allocation) */
-+    uint8_t ncplbnd;          /* number of coupling bands */
-+
-+    uint8_t rematflg;         /* stereo rematrixing */
-+
-+    uint8_t endmant[5];       /* channel end mantissa */
-+
-+    uint16_t bai;             /* bit allocation information */
-+
-+    uint32_t * buffer_start;
-+    uint16_t lfsr_state;      /* dither state */
-+    uint32_t bits_left;
-+    uint32_t current_word;
-+
-+    uint8_t csnroffst;        /* coarse SNR offset */
-+    ba_t cplba;               /* coupling bit allocation parameters */
-+    ba_t ba[5];               /* channel bit allocation parameters */
-+    ba_t lfeba;               /* lfe bit allocation parameters */
-+
-+    uint8_t cplfleak;         /* coupling fast leak init */
-+    uint8_t cplsleak;         /* coupling slow leak init */
-+
-+    expbap_t cpl_expbap;
-+    expbap_t fbw_expbap[5];
-+    expbap_t lfe_expbap;
-+
-+    sample_t * samples;
-+    int downmixed;
-+} a52_state_t;
- 
- #define A52_CHANNEL 0
- #define A52_MONO 1
-diff -Naur a52dec.old/liba52/a52_internal.h a52dec.new/liba52/a52_internal.h
---- a52dec.old/liba52/a52_internal.h	2002-07-28 03:52:06.000000000 +0200
-+++ a52dec.new/liba52/a52_internal.h	2012-07-16 14:11:47.000000000 +0200
-@@ -21,72 +21,6 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
--typedef struct {
--    uint8_t bai;		/* fine SNR offset, fast gain */
--    uint8_t deltbae;		/* delta bit allocation exists */
--    int8_t deltba[50];		/* per-band delta bit allocation */
--} ba_t;
--
--typedef struct {
--    uint8_t exp[256];		/* decoded channel exponents */
--    int8_t bap[256];		/* derived channel bit allocation */
--} expbap_t;
--
--struct a52_state_s {
--    uint8_t fscod;		/* sample rate */
--    uint8_t halfrate;		/* halfrate factor */
--    uint8_t acmod;		/* coded channels */
--    uint8_t lfeon;		/* coded lfe channel */
--    sample_t clev;		/* centre channel mix level */
--    sample_t slev;		/* surround channels mix level */
--
--    int output;			/* type of output */
--    sample_t level;		/* output level */
--    sample_t bias;		/* output bias */
--
--    int dynrnge;		/* apply dynamic range */
--    sample_t dynrng;		/* dynamic range */
--    void * dynrngdata;		/* dynamic range callback funtion and data */
--    sample_t (* dynrngcall) (sample_t range, void * dynrngdata);
--
--    uint8_t chincpl;		/* channel coupled */
--    uint8_t phsflginu;		/* phase flags in use (stereo only) */
--    uint8_t cplstrtmant;	/* coupling channel start mantissa */
--    uint8_t cplendmant;		/* coupling channel end mantissa */
--    uint32_t cplbndstrc;	/* coupling band structure */
--    sample_t cplco[5][18];	/* coupling coordinates */
--
--    /* derived information */
--    uint8_t cplstrtbnd;		/* coupling start band (for bit allocation) */
--    uint8_t ncplbnd;		/* number of coupling bands */
--
--    uint8_t rematflg;		/* stereo rematrixing */
--
--    uint8_t endmant[5];		/* channel end mantissa */
--
--    uint16_t bai;		/* bit allocation information */
--
--    uint32_t * buffer_start;
--    uint16_t lfsr_state;	/* dither state */
--    uint32_t bits_left;
--    uint32_t current_word;
--
--    uint8_t csnroffst;		/* coarse SNR offset */
--    ba_t cplba;			/* coupling bit allocation parameters */
--    ba_t ba[5];			/* channel bit allocation parameters */
--    ba_t lfeba;			/* lfe bit allocation parameters */
--
--    uint8_t cplfleak;		/* coupling fast leak init */
--    uint8_t cplsleak;		/* coupling slow leak init */
--
--    expbap_t cpl_expbap;
--    expbap_t fbw_expbap[5];
--    expbap_t lfe_expbap;
--
--    sample_t * samples;
--    int downmixed;
--};
--
- #define LEVEL_PLUS6DB 2.0
- #define LEVEL_PLUS3DB 1.4142135623730951
- #define LEVEL_3DB 0.7071067811865476
diff --git a/pkgs/development/libraries/a52dec/A01-thread-safe.patch b/pkgs/development/libraries/a52dec/A01-thread-safe.patch
deleted file mode 100644
index 4ca2d1a0873..00000000000
--- a/pkgs/development/libraries/a52dec/A01-thread-safe.patch
+++ /dev/null
@@ -1,462 +0,0 @@
-diff -Naur a52dec.old/include/a52.h a52dec.new/include/a52.h
---- a52dec.old/include/a52.h	2012-07-16 14:24:14.000000000 +0200
-+++ a52dec.new/include/a52.h	2012-07-16 14:31:37.000000000 +0200
-@@ -42,6 +42,11 @@
- } expbap_t;
- 
- typedef struct {
-+    sample_t real;
-+    sample_t imag;
-+} complex_t;
-+
-+typedef struct {
-     uint8_t fscod;            /* sample rate */
-     uint8_t halfrate;         /* halfrate factor */
-     uint8_t acmod;            /* coded channels */
-@@ -94,6 +99,20 @@
- 
-     sample_t * samples;
-     int downmixed;
-+
-+    /* Root values for IFFT */
-+    sample_t * roots16;           // size 3
-+    sample_t * roots32;           // size 7
-+    sample_t * roots64;           // size 15
-+    sample_t * roots128;          // size 31
-+
-+    /* Twiddle factors for IMDCT */
-+    complex_t * pre1;             // size 128
-+    complex_t * post1;            // size 64
-+    complex_t * pre2;             // size 64
-+    complex_t * post2;            // size 32
-+
-+    sample_t * a52_imdct_window;  // size 256
- } a52_state_t;
- 
- #define A52_CHANNEL 0
-diff -Naur a52dec.old/liba52/a52_internal.h a52dec.new/liba52/a52_internal.h
---- a52dec.old/liba52/a52_internal.h	2012-07-16 14:24:14.000000000 +0200
-+++ a52dec.new/liba52/a52_internal.h	2012-07-16 14:28:33.000000000 +0200
-@@ -49,6 +49,6 @@
- 		  sample_t clev, sample_t slev);
- void a52_upmix (sample_t * samples, int acmod, int output);
- 
--void a52_imdct_init (uint32_t mm_accel);
--void a52_imdct_256 (sample_t * data, sample_t * delay, sample_t bias);
--void a52_imdct_512 (sample_t * data, sample_t * delay, sample_t bias);
-+void a52_imdct_init (a52_state_t * state, uint32_t mm_accel);
-+void a52_imdct_256 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias);
-+void a52_imdct_512 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias);
-diff -Naur a52dec.old/liba52/imdct.c a52dec.new/liba52/imdct.c
---- a52dec.old/liba52/imdct.c	2012-07-16 14:24:14.000000000 +0200
-+++ a52dec.new/liba52/imdct.c	2012-07-16 14:33:00.000000000 +0200
-@@ -40,11 +40,6 @@
- #include "a52_internal.h"
- #include "mm_accel.h"
- 
--typedef struct complex_s {
--    sample_t real;
--    sample_t imag;
--} complex_t;
--
- static uint8_t fftorder[] = {
-       0,128, 64,192, 32,160,224, 96, 16,144, 80,208,240,112, 48,176,
-       8,136, 72,200, 40,168,232,104,248,120, 56,184, 24,152,216, 88,
-@@ -56,22 +51,8 @@
-       6,134, 70,198, 38,166,230,102,246,118, 54,182, 22,150,214, 86
- };
- 
--/* Root values for IFFT */
--static sample_t roots16[3];
--static sample_t roots32[7];
--static sample_t roots64[15];
--static sample_t roots128[31];
--
--/* Twiddle factors for IMDCT */
--static complex_t pre1[128];
--static complex_t post1[64];
--static complex_t pre2[64];
--static complex_t post2[32];
--
--static sample_t a52_imdct_window[256];
--
--static void (* ifft128) (complex_t * buf);
--static void (* ifft64) (complex_t * buf);
-+static void (* ifft128) (a52_state_t * state, complex_t * buf);
-+static void (* ifft64) (a52_state_t * state, complex_t * buf);
- 
- static inline void ifft2 (complex_t * buf)
- {
-@@ -167,7 +148,7 @@
-     a1.imag += tmp4;				\
- } while (0)
- 
--static inline void ifft8 (complex_t * buf)
-+static inline void ifft8 (a52_state_t * state, complex_t * buf)
- {
-     double tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8;
- 
-@@ -175,7 +156,7 @@
-     ifft2 (buf + 4);
-     ifft2 (buf + 6);
-     BUTTERFLY_ZERO (buf[0], buf[2], buf[4], buf[6]);
--    BUTTERFLY_HALF (buf[1], buf[3], buf[5], buf[7], roots16[1]);
-+    BUTTERFLY_HALF (buf[1], buf[3], buf[5], buf[7], state->roots16[1]);
- }
- 
- static void ifft_pass (complex_t * buf, sample_t * weight, int n)
-@@ -205,66 +186,66 @@
-     } while (--i);
- }
- 
--static void ifft16 (complex_t * buf)
-+static void ifft16 (a52_state_t * state, complex_t * buf)
- {
--    ifft8 (buf);
-+    ifft8 (state, buf);
-     ifft4 (buf + 8);
-     ifft4 (buf + 12);
--    ifft_pass (buf, roots16 - 4, 4);
-+    ifft_pass (buf, state->roots16 - 4, 4);
- }
- 
--static void ifft32 (complex_t * buf)
-+static void ifft32 (a52_state_t * state, complex_t * buf)
- {
--    ifft16 (buf);
--    ifft8 (buf + 16);
--    ifft8 (buf + 24);
--    ifft_pass (buf, roots32 - 8, 8);
-+    ifft16 (state, buf);
-+    ifft8 (state, buf + 16);
-+    ifft8 (state, buf + 24);
-+    ifft_pass (buf, state->roots32 - 8, 8);
- }
- 
--static void ifft64_c (complex_t * buf)
-+static void ifft64_c (a52_state_t * state, complex_t * buf)
- {
--    ifft32 (buf);
--    ifft16 (buf + 32);
--    ifft16 (buf + 48);
--    ifft_pass (buf, roots64 - 16, 16);
-+    ifft32 (state, buf);
-+    ifft16 (state, buf + 32);
-+    ifft16 (state, buf + 48);
-+    ifft_pass (buf, state->roots64 - 16, 16);
- }
- 
--static void ifft128_c (complex_t * buf)
-+static void ifft128_c (a52_state_t * state, complex_t * buf)
- {
--    ifft32 (buf);
--    ifft16 (buf + 32);
--    ifft16 (buf + 48);
--    ifft_pass (buf, roots64 - 16, 16);
-+    ifft32 (state, buf);
-+    ifft16 (state, buf + 32);
-+    ifft16 (state, buf + 48);
-+    ifft_pass (buf, state->roots64 - 16, 16);
- 
--    ifft32 (buf + 64);
--    ifft32 (buf + 96);
--    ifft_pass (buf, roots128 - 32, 32);
-+    ifft32 (state, buf + 64);
-+    ifft32 (state, buf + 96);
-+    ifft_pass (buf, state->roots128 - 32, 32);
- }
- 
--void a52_imdct_512 (sample_t * data, sample_t * delay, sample_t bias)
-+void a52_imdct_512 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias)
- {
-     int i, k;
-     sample_t t_r, t_i, a_r, a_i, b_r, b_i, w_1, w_2;
--    const sample_t * window = a52_imdct_window;
-+    const sample_t * window = state->a52_imdct_window;
-     complex_t buf[128];
- 	
-     for (i = 0; i < 128; i++) {
- 	k = fftorder[i];
--	t_r = pre1[i].real;
--	t_i = pre1[i].imag;
-+	t_r = state->pre1[i].real;
-+	t_i = state->pre1[i].imag;
- 
- 	buf[i].real = t_i * data[255-k] + t_r * data[k];
- 	buf[i].imag = t_r * data[255-k] - t_i * data[k];
-     }
- 
--    ifft128 (buf);
-+    ifft128 (state, buf);
- 
-     /* Post IFFT complex multiply plus IFFT complex conjugate*/
-     /* Window and convert to real valued signal */
-     for (i = 0; i < 64; i++) {
- 	/* y[n] = z[n] * (xcos1[n] + j * xsin1[n]) ; */
--	t_r = post1[i].real;
--	t_i = post1[i].imag;
-+	t_r = state->post1[i].real;
-+	t_i = state->post1[i].imag;
- 
- 	a_r = t_r * buf[i].real     + t_i * buf[i].imag;
- 	a_i = t_i * buf[i].real     - t_r * buf[i].imag;
-@@ -285,18 +266,18 @@
-     }
- }
- 
--void a52_imdct_256(sample_t * data, sample_t * delay, sample_t bias)
-+void a52_imdct_256(a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias)
- {
-     int i, k;
-     sample_t t_r, t_i, a_r, a_i, b_r, b_i, c_r, c_i, d_r, d_i, w_1, w_2;
--    const sample_t * window = a52_imdct_window;
-+    const sample_t * window = state->a52_imdct_window;
-     complex_t buf1[64], buf2[64];
- 
-     /* Pre IFFT complex multiply plus IFFT cmplx conjugate */
-     for (i = 0; i < 64; i++) {
- 	k = fftorder[i];
--	t_r = pre2[i].real;
--	t_i = pre2[i].imag;
-+	t_r = state->pre2[i].real;
-+	t_i = state->pre2[i].imag;
- 
- 	buf1[i].real = t_i * data[254-k] + t_r * data[k];
- 	buf1[i].imag = t_r * data[254-k] - t_i * data[k];
-@@ -305,15 +286,15 @@
- 	buf2[i].imag = t_r * data[255-k] - t_i * data[k+1];
-     }
- 
--    ifft64 (buf1);
--    ifft64 (buf2);
-+    ifft64 (state, buf1);
-+    ifft64 (state, buf2);
- 
-     /* Post IFFT complex multiply */
-     /* Window and convert to real valued signal */
-     for (i = 0; i < 32; i++) {
- 	/* y1[n] = z1[n] * (xcos2[n] + j * xs in2[n]) ; */ 
--	t_r = post2[i].real;
--	t_i = post2[i].imag;
-+	t_r = state->post2[i].real;
-+	t_i = state->post2[i].imag;
- 
- 	a_r = t_r * buf1[i].real    + t_i * buf1[i].imag;
- 	a_i = t_i * buf1[i].real    - t_r * buf1[i].imag;
-@@ -362,7 +343,7 @@
-     return bessel;
- }
- 
--void a52_imdct_init (uint32_t mm_accel)
-+void a52_imdct_init (a52_state_t * state, uint32_t mm_accel)
- {
-     int i, k;
-     double sum;
-@@ -371,50 +352,50 @@
-     sum = 0;
-     for (i = 0; i < 256; i++) {
- 	sum += besselI0 (i * (256 - i) * (5 * M_PI / 256) * (5 * M_PI / 256));
--	a52_imdct_window[i] = sum;
-+	state->a52_imdct_window[i] = sum;
-     }
-     sum++;
-     for (i = 0; i < 256; i++)
--	a52_imdct_window[i] = sqrt (a52_imdct_window[i] / sum);
-+	state->a52_imdct_window[i] = sqrt (state->a52_imdct_window[i] / sum);
- 
-     for (i = 0; i < 3; i++)
--	roots16[i] = cos ((M_PI / 8) * (i + 1));
-+	state->roots16[i] = cos ((M_PI / 8) * (i + 1));
- 
-     for (i = 0; i < 7; i++)
--	roots32[i] = cos ((M_PI / 16) * (i + 1));
-+	state->roots32[i] = cos ((M_PI / 16) * (i + 1));
- 
-     for (i = 0; i < 15; i++)
--	roots64[i] = cos ((M_PI / 32) * (i + 1));
-+	state->roots64[i] = cos ((M_PI / 32) * (i + 1));
- 
-     for (i = 0; i < 31; i++)
--	roots128[i] = cos ((M_PI / 64) * (i + 1));
-+	state->roots128[i] = cos ((M_PI / 64) * (i + 1));
- 
-     for (i = 0; i < 64; i++) {
- 	k = fftorder[i] / 2 + 64;
--	pre1[i].real = cos ((M_PI / 256) * (k - 0.25));
--	pre1[i].imag = sin ((M_PI / 256) * (k - 0.25));
-+	state->pre1[i].real = cos ((M_PI / 256) * (k - 0.25));
-+	state->pre1[i].imag = sin ((M_PI / 256) * (k - 0.25));
-     }
- 
-     for (i = 64; i < 128; i++) {
- 	k = fftorder[i] / 2 + 64;
--	pre1[i].real = -cos ((M_PI / 256) * (k - 0.25));
--	pre1[i].imag = -sin ((M_PI / 256) * (k - 0.25));
-+	state->pre1[i].real = -cos ((M_PI / 256) * (k - 0.25));
-+	state->pre1[i].imag = -sin ((M_PI / 256) * (k - 0.25));
-     }
- 
-     for (i = 0; i < 64; i++) {
--	post1[i].real = cos ((M_PI / 256) * (i + 0.5));
--	post1[i].imag = sin ((M_PI / 256) * (i + 0.5));
-+	state->post1[i].real = cos ((M_PI / 256) * (i + 0.5));
-+	state->post1[i].imag = sin ((M_PI / 256) * (i + 0.5));
-     }
- 
-     for (i = 0; i < 64; i++) {
- 	k = fftorder[i] / 4;
--	pre2[i].real = cos ((M_PI / 128) * (k - 0.25));
--	pre2[i].imag = sin ((M_PI / 128) * (k - 0.25));
-+	state->pre2[i].real = cos ((M_PI / 128) * (k - 0.25));
-+	state->pre2[i].imag = sin ((M_PI / 128) * (k - 0.25));
-     }
- 
-     for (i = 0; i < 32; i++) {
--	post2[i].real = cos ((M_PI / 128) * (i + 0.5));
--	post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
-+	state->post2[i].real = cos ((M_PI / 128) * (i + 0.5));
-+	state->post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
-     }
- 
- #ifdef LIBA52_DJBFFT
-diff -Naur a52dec.old/liba52/parse.c a52dec.new/liba52/parse.c
---- a52dec.old/liba52/parse.c	2012-07-16 14:24:14.000000000 +0200
-+++ a52dec.new/liba52/parse.c	2012-07-16 14:33:00.000000000 +0200
-@@ -56,16 +56,53 @@
-     a52_state_t * state;
-     int i;
- 
--    state = malloc (sizeof (a52_state_t));
-+    state = calloc (1, sizeof (a52_state_t));
-     if (state == NULL)
- 	return NULL;
- 
-     state->samples = memalign (16, 256 * 12 * sizeof (sample_t));
-     if (state->samples == NULL) {
--	free (state);
--	return NULL;
-+        goto fail;
-     }
- 
-+    /* Root values for IFFT */
-+    state->roots16 = memalign (16, 3 * sizeof (sample_t));
-+    if (state->roots16 == NULL)
-+        goto fail;
-+
-+    state->roots32 = memalign (16, 7 * sizeof (sample_t));
-+    if (state->roots32 == NULL)
-+        goto fail;
-+
-+    state->roots64 = memalign (16, 15 * sizeof (sample_t));
-+    if (state->roots64 == NULL)
-+        goto fail;
-+
-+    state->roots128 = memalign (16, 31 * sizeof (sample_t));
-+    if (state->roots128 == NULL)
-+        goto fail;
-+
-+    /* Twiddle factors for IMDCT */
-+    state->pre1 = memalign (16, 128 * sizeof (complex_t));
-+    if (state->pre1 == NULL)
-+        goto fail;
-+
-+    state->post1 = memalign (16, 64 * sizeof (complex_t));
-+    if (state->post1 == NULL)
-+        goto fail;
-+
-+    state->pre2 = memalign (16, 64 * sizeof (complex_t));
-+    if (state->pre2 == NULL)
-+        goto fail;
-+
-+    state->post2 = memalign (16, 32 * sizeof (complex_t));
-+    if (state->post2 == NULL)
-+        goto fail;
-+
-+    state->a52_imdct_window = memalign (16, 256 * sizeof (sample_t));
-+    if (state->a52_imdct_window == NULL)
-+        goto fail;
-+
-     for (i = 0; i < 256 * 12; i++)
- 	state->samples[i] = 0;
- 
-@@ -73,9 +110,27 @@
- 
-     state->lfsr_state = 1;
- 
--    a52_imdct_init (mm_accel);
-+    a52_imdct_init (state, mm_accel);
- 
-     return state;
-+
-+fail:
-+    if ( state )
-+    {
-+        free (state->a52_imdct_window);
-+        free (state->post2);
-+        free (state->pre2);
-+        free (state->post1);
-+        free (state->pre1);
-+        free (state->roots128);
-+        free (state->roots64);
-+        free (state->roots32);
-+        free (state->roots16);
-+        free (state->samples);
-+        free (state);
-+    }
-+    return NULL;
-+
- }
- 
- sample_t * a52_samples (a52_state_t * state)
-@@ -825,7 +880,7 @@
- 		       state->dynrng, 0, 7);
- 	    for (i = 7; i < 256; i++)
- 		(samples-256)[i] = 0;
--	    a52_imdct_512 (samples - 256, samples + 1536 - 256, state->bias);
-+	    a52_imdct_512 (state, samples - 256, samples + 1536 - 256, state->bias);
- 	} else {
- 	    /* just skip the LFE coefficients */
- 	    coeff_get (state, samples + 1280, &state->lfe_expbap, &quantizer,
-@@ -854,10 +909,10 @@
- 
- 	    if (coeff[i]) {
- 		if (blksw[i])
--		    a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i,
-+		    a52_imdct_256 (state, samples + 256 * i, samples + 1536 + 256 * i,
- 				   bias);
- 		else 
--		    a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i,
-+		    a52_imdct_512 (state, samples + 256 * i, samples + 1536 + 256 * i,
- 				   bias);
- 	    } else {
- 		int j;
-@@ -883,11 +938,11 @@
- 
- 	if (blksw[0])
- 	    for (i = 0; i < nfchans; i++)
--		a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i,
-+		a52_imdct_256 (state, samples + 256 * i, samples + 1536 + 256 * i,
- 			       state->bias);
- 	else 
- 	    for (i = 0; i < nfchans; i++)
--		a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i,
-+		a52_imdct_512 (state, samples + 256 * i, samples + 1536 + 256 * i,
- 			       state->bias);
-     }
- 
-@@ -896,6 +951,15 @@
- 
- void a52_free (a52_state_t * state)
- {
-+    free (state->a52_imdct_window);
-+    free (state->post2);
-+    free (state->pre2);
-+    free (state->post1);
-+    free (state->pre1);
-+    free (state->roots128);
-+    free (state->roots64);
-+    free (state->roots32);
-+    free (state->roots16);
-     free (state->samples);
-     free (state);
- }
diff --git a/pkgs/development/libraries/a52dec/A02-imdct-shutup.patch b/pkgs/development/libraries/a52dec/A02-imdct-shutup.patch
deleted file mode 100644
index a22e5979e66..00000000000
--- a/pkgs/development/libraries/a52dec/A02-imdct-shutup.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a52dec_original/liba52/imdct.c a52dec_patched/liba52/imdct.c
---- a52dec.old/liba52/imdct.c	2002-07-28 03:52:07.000000000 +0200
-+++ a52dec.new/liba52/imdct.c	2011-07-15 20:29:09.000000000 +0200
-@@ -425,7 +425,6 @@
-     } else
- #endif
-     {
--	fprintf (stderr, "No accelerated IMDCT transform found\n");
- 	ifft128 = ifft128_c;
- 	ifft64 = ifft64_c;
-     }
diff --git a/pkgs/development/libraries/a52dec/A03-automake.patch b/pkgs/development/libraries/a52dec/A03-automake.patch
deleted file mode 100644
index 142091dc695..00000000000
--- a/pkgs/development/libraries/a52dec/A03-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a52dec.orig/configure.in a52dec/configure.in
---- a52dec.orig/configure.in	2002-07-27 23:50:20.000000000 -0400
-+++ a52dec/configure.in	2013-01-28 21:06:27.000000000 -0500
-@@ -6,7 +6,7 @@
- AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
-     doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile])
- AM_INIT_AUTOMAKE([a52dec],[0.7.4])
--AM_CONFIG_HEADER(include/config.h)
-+AC_CONFIG_HEADER(include/config.h)
- AM_MAINTAINER_MODE
- AC_CANONICAL_HOST
- 
diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
index d8a56a3d28e..0bfe3a88e9f 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -2,20 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "a52dec-0.7.4p4";
-  
+
   src = fetchurl {
     url = "${meta.homepage}/files/a52dec-0.7.4.tar.gz";
     sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2";
   };
 
-  # From Handbrake
-  patches = [
-    ./A00-a52-state-t-public.patch
-    ./A01-thread-safe.patch
-    ./A02-imdct-shutup.patch
-    ./A03-automake.patch
-  ];
-
   meta = {
     description = "ATSC A/52 stream decoder";
     homepage = http://liba52.sourceforge.net/;
-- 
GitLab


From 3d879e0fcf3a96a1bbf3f04a19eedfd365132165 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 10 May 2018 11:20:28 +0300
Subject: [PATCH 0433/1085] libdvdnav: rm old HandBrake pathes

Patches no longer used in HandBrake upstream
---
 .../development/libraries/libdvdnav/4.2.1.nix |   5 +-
 .../libraries/libdvdnav/A08-dvdnav-dup.patch  | 137 ------------------
 .../libdvdnav/P00-mingw-no-examples.patch     |  21 ---
 3 files changed, 1 insertion(+), 162 deletions(-)
 delete mode 100644 pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch
 delete mode 100644 pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch

diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix
index 0d3f8349413..18e2689002e 100644
--- a/pkgs/development/libraries/libdvdnav/4.2.1.nix
+++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "libdvdnav-4.2.1";
-  
+
   src = fetchurl {
     url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz;
     sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372";
@@ -17,9 +17,6 @@ stdenv.mkDerivation {
     mkdir -p $out
   '';
 
-  # From Handbrake
-  patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ];
-
   meta = {
     homepage = http://dvdnav.mplayerhq.hu/;
     description = "A library that implements DVD navigation features such as DVD menus";
diff --git a/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch b/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch
deleted file mode 100644
index c0991b43555..00000000000
--- a/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Index: src/dvdnav.c
-===================================================================
---- libdvdnav.orig/src/dvdnav.c	(revision 1168)
-+++ libdvdnav/src/dvdnav.c	(working copy)
-@@ -71,6 +71,67 @@
-   return DVDNAV_STATUS_OK;
- }
- 
-+dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src) {
-+  dvdnav_t *this;
-+
-+  (*dest) = NULL;
-+  this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
-+  if(!this)
-+    return DVDNAV_STATUS_ERR;
-+
-+  memcpy(this, src, sizeof(dvdnav_t));
-+  this->file = NULL;
-+
-+  pthread_mutex_init(&this->vm_lock, NULL);
-+
-+  this->vm = vm_new_copy(src->vm);
-+  if(!this->vm) {
-+    printerr("Error initialising the DVD VM.");
-+    pthread_mutex_destroy(&this->vm_lock);
-+    free(this);
-+    return DVDNAV_STATUS_ERR;
-+  }
-+
-+  /* Start the read-ahead cache. */
-+  this->cache = dvdnav_read_cache_new(this);
-+
-+  (*dest) = this;
-+  return DVDNAV_STATUS_OK;
-+}
-+
-+dvdnav_status_t dvdnav_free_dup(dvdnav_t *this) {
-+
-+#ifdef LOG_DEBUG
-+  fprintf(MSG_OUT, "libdvdnav: free_dup:called\n");
-+#endif
-+
-+  if (this->file) {
-+    pthread_mutex_lock(&this->vm_lock);
-+    DVDCloseFile(this->file);
-+#ifdef LOG_DEBUG
-+    fprintf(MSG_OUT, "libdvdnav: close:file closing\n");
-+#endif
-+    this->file = NULL;
-+    pthread_mutex_unlock(&this->vm_lock);
-+  }
-+
-+  /* Free the VM */
-+  if(this->vm)
-+    vm_free_copy(this->vm);
-+
-+  pthread_mutex_destroy(&this->vm_lock);
-+
-+  /* We leave the final freeing of the entire structure to the cache,
-+   * because we don't know, if there are still buffers out in the wild,
-+   * that must return first. */
-+  if(this->cache)
-+    dvdnav_read_cache_free(this->cache);
-+  else
-+    free(this);
-+
-+  return DVDNAV_STATUS_OK;
-+}
-+
- dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) {
-   dvdnav_t *this;
-   struct timeval time;
-Index: src/dvdnav/dvdnav.h
-===================================================================
---- libdvdnav.orig/src/dvdnav/dvdnav.h	(revision 1168)
-+++ libdvdnav/src/dvdnav.h	(working copy)
-@@ -89,6 +89,9 @@
-  */
- dvdnav_status_t dvdnav_open(dvdnav_t **dest, const char *path);
- 
-+dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src);
-+dvdnav_status_t dvdnav_free_dup(dvdnav_t *this);
-+
- /*
-  * Closes a dvdnav_t previously opened with dvdnav_open(), freeing any
-  * memory associated with it.
-Index: src/vm/vm.c
-===================================================================
---- libdvdnav.orig/src/vm/vm.c	(revision 1168)
-+++ libdvdnav/src/vm/vm.c	(working copy)
-@@ -96,6 +98,7 @@
- 
- static pgcit_t* get_MENU_PGCIT(vm_t *vm, ifo_handle_t *h, uint16_t lang);
- static pgcit_t* get_PGCIT(vm_t *vm);
-+static void vm_close(vm_t *vm);
- 
- 
- /* Helper functions */
-@@ -262,7 +265,7 @@
- }
- 
- void vm_free_vm(vm_t *vm) {
--  vm_stop(vm);
-+  vm_close(vm);
-   free(vm);
- }
- 
-@@ -289,12 +292,20 @@
- 
- int vm_start(vm_t *vm) {
-   /* Set pgc to FP (First Play) pgc */
-+  if (vm->stopped) {
-+    vm_reset(vm, NULL);
-+    vm->stopped = 0;
-+  }
-   set_FP_PGC(vm);
-   process_command(vm, play_PGC(vm));
-   return !vm->stopped;
- }
- 
- void vm_stop(vm_t *vm) {
-+  vm->stopped = 1;
-+}
-+
-+static void vm_close(vm_t *vm) {
-   if(vm->vmgi) {
-     ifoClose(vm->vmgi);
-     vm->vmgi=NULL;
-@@ -346,7 +357,7 @@
- 
-   if (vm->dvd && dvdroot) {
-     /* a new dvd device has been requested */
--    vm_stop(vm);
-+    vm_close(vm);
-   }
-   if (!vm->dvd) {
-     vm->dvd = DVDOpen(dvdroot);
diff --git a/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch b/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch
deleted file mode 100644
index 0e061861735..00000000000
--- a/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur libdvdnav.orig/Makefile.am libdvdnav/Makefile.am
---- libdvdnav.orig/Makefile.am	2008-10-03 16:11:46.000000000 -0400
-+++ libdvdnav/Makefile.am	2009-04-24 02:53:15.000000000 -0400
-@@ -1,7 +1,7 @@
- include $(top_srcdir)/misc/Makefile.common
- 
- 
--SUBDIRS = src examples doc misc m4
-+SUBDIRS = src doc misc m4
- 
- EXTRA_DIST = autogen.sh \
- 	     AUTHORS \
-diff -Naur libdvdnav.orig/configure.ac libdvdnav/configure.ac
---- libdvdnav.orig/configure.ac	2009-01-08 17:57:11.000000000 -0500
-+++ libdvdnav/configure.ac	2009-04-24 02:52:34.000000000 -0400
-@@ -252,5 +252,4 @@
- misc/relchk.sh
- m4/Makefile
- doc/Makefile
--examples/Makefile
- ])
-- 
GitLab


From e619a49e2e66f061922d9377af1abd899e1c7b23 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 10 May 2018 11:23:26 +0300
Subject: [PATCH 0434/1085] libmkv: rm old HandBrake patches

Patches no longer used in HandBrake upstream
---
 .../libraries/libmkv/A01-hbmv-pgs.patch       | 12 --------
 .../libmkv/A02-audio-out-sampling-freq.patch  | 28 -------------------
 .../libmkv/P00-mingw-large-file.patch         | 24 ----------------
 pkgs/development/libraries/libmkv/default.nix | 15 +++-------
 4 files changed, 4 insertions(+), 75 deletions(-)
 delete mode 100644 pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch
 delete mode 100644 pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch
 delete mode 100644 pkgs/development/libraries/libmkv/P00-mingw-large-file.patch

diff --git a/pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch b/pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch
deleted file mode 100644
index 9f863cac412..00000000000
--- a/pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/libmkv.h b/include/libmkv.h
-index 146a91f..f03d608 100644
---- a/include/libmkv.h
-+++ b/include/libmkv.h
-@@ -94,6 +94,7 @@ extern "C" {
- #define MK_SUBTITLE_USF    "S_TEXT/USF"
- #define MK_SUBTITLE_VOBSUB "S_VOBSUB"
- #define MK_SUBTITLE_BMP    "S_IMAGE/BMP"
-+#define MK_SUBTITLE_PGS    "S_HDMV/PGS"
- 
- /* Official Tags */
- #define MK_TAG_TITLE		"TITLE"
diff --git a/pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch b/pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch
deleted file mode 100644
index ea31957c1d2..00000000000
--- a/pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/include/libmkv.h b/include/libmkv.h
-index 146a91f..f03d608 100644
---- a/include/libmkv.h
-+++ b/include/libmkv.h
-@@ -203,6 +204,7 @@ struct mk_TrackConfig_s {
- 		} video;
- 		struct {
- 			float samplingFreq;	/* Sampling Frequency in Hz */
-+			float outputSamplingFreq;	/* Playback Sampling Frequency in Hz (e.g. for AAC w/SBR) */
- 			unsigned channels;	/* Number of channels for this track */
- 			unsigned bitDepth;	/* Bits per sample (PCM) */
- 		} audio;
-diff --git a/src/tracks.c b/src/tracks.c
-index f9c7e48..a2a60ca 100644
---- a/src/tracks.c
-+++ b/src/tracks.c
-@@ -174,6 +174,11 @@ mk_Track *mk_createTrack(mk_Writer *w, mk_TrackConfig *tc)
- 			/* SamplingFrequency */
- 			if (mk_writeFloat(v, MATROSKA_ID_AUDIOSAMPLINGFREQ, tc->extra.audio.samplingFreq) < 0)
- 				return NULL;
-+			if (tc->extra.audio.outputSamplingFreq) {
-+				/* Output SamplingFrequency */
-+				if (mk_writeFloat(v, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, tc->extra.audio.outputSamplingFreq) < 0)
-+					return NULL;
-+			}
- 			/* Channels */
- 			if (mk_writeUInt(v, MATROSKA_ID_AUDIOCHANNELS, tc->extra.audio.channels) < 0)
- 				return NULL;
diff --git a/pkgs/development/libraries/libmkv/P00-mingw-large-file.patch b/pkgs/development/libraries/libmkv/P00-mingw-large-file.patch
deleted file mode 100644
index 6a83eacca83..00000000000
--- a/pkgs/development/libraries/libmkv/P00-mingw-large-file.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libmkv.orig/src/matroska.c	2009-01-12 23:14:26.000000000 -0800
-+++ libmkv/src/matroska.c	2009-03-25 15:22:30.000000000 -0700
-@@ -27,6 +27,11 @@
- 
- #include <sys/time.h>
- 
-+#if defined( __MINGW32__ )
-+#undef fseeko
-+#define fseeko fseeko64
-+#endif
-+
- #define RESERVED_SEEKHEAD 0x100
- /* 256 bytes should be enough room for our Seek entries. */
- #define RESERVED_CHAPTERS 0x800
-@@ -34,7 +39,7 @@
- 
- int mk_seekFile(mk_Writer *w, uint64_t pos)
- {
--	if (fseek(w->fp, pos, SEEK_SET))
-+	if (fseeko(w->fp, pos, SEEK_SET))
- 		return -1;
- 
- 	w->f_pos = pos;
-
diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix
index ab451fcd5fd..48e710c208f 100644
--- a/pkgs/development/libraries/libmkv/default.nix
+++ b/pkgs/development/libraries/libmkv/default.nix
@@ -1,26 +1,19 @@
 { stdenv, fetchgit, libtool, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "libmkv-0.6.5.1p2";
-  
+  name = "libmkv-${version}";
+  version = "0.6.5.1";
+
   src = fetchgit {
     url = https://github.com/saintdev/libmkv.git;
-    rev = "refs/tags/0.6.5.1";
+    rev = "refs/tags/${version}";
     sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl";
   };
 
   nativeBuildInputs = [ libtool autoconf automake ];
 
-  # TODO fix library version
   preConfigure = "sh bootstrap.sh";
 
-  # From Handbrake
-  patches = [
-    ./A01-hbmv-pgs.patch
-    ./A02-audio-out-sampling-freq.patch
-    ./P00-mingw-large-file.patch
-  ];
-
   meta = {
     homepage = https://github.com/saintdev/libmkv;
     license = stdenv.lib.licenses.gpl2;
-- 
GitLab


From fd3466d8d89494ba3406829a78394762be2511a9 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 10 May 2018 11:25:40 +0300
Subject: [PATCH 0435/1085] mp4v2: rm old HandBrake patch

Patch no longer used by HandBrake upstream
---
 .../mp4v2/A02-meaningful-4gb-warning.patch         | 14 --------------
 pkgs/development/libraries/mp4v2/default.nix       |  4 ----
 2 files changed, 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch

diff --git a/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch b/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch
deleted file mode 100644
index 987298bd5b0..00000000000
--- a/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur mp4v2-trunk-r355/src/mp4atom.cpp mp4v2-trunk-r355/src/mp4atom.cpp
---- mp4v2-trunk-r355/src/mp4atom.cpp	2012-02-21 19:40:03.000000000 +0100
-+++ mp4v2-trunk-r355/src/mp4atom.cpp	2012-02-21 19:36:38.000000000 +0100
-@@ -543,6 +543,10 @@
-         m_pFile->SetPosition(m_start + 8);
-         m_pFile->WriteUInt64(m_size);
-     } else {
-+        if (!(m_size <= (uint64_t)0xFFFFFFFF)) {
-+            // Let the user know what the following assert is all about
-+            fprintf(stderr, "MP4ERROR: File size exceeded 4 GB; output unplayable. Enable \"Large file size\" to fix it.\n");
-+        }
-         ASSERT(m_size <= (uint64_t)0xFFFFFFFF);
-         m_pFile->SetPosition(m_start);
-         m_pFile->WriteUInt32(m_size);
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix
index a5542ebb659..e55d9989bff 100644
--- a/pkgs/development/libraries/mp4v2/default.nix
+++ b/pkgs/development/libraries/mp4v2/default.nix
@@ -9,10 +9,6 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # From Handbrake
-    # mp4v2 doesn't seem to be actively maintained any more :-/
-    ./A02-meaningful-4gb-warning.patch
-
     (fetchurl {
       name = "gcc-7.patch";
       url = "https://src.fedoraproject.org/cgit/rpms/libmp4v2.git/plain/"
-- 
GitLab


From 8c45acac4e1f083ea9732cf8e8550f11f4460494 Mon Sep 17 00:00:00 2001
From: Demyan Rogozhin <demyan.rogozhin@gmail.com>
Date: Thu, 10 May 2018 10:37:13 +0200
Subject: [PATCH 0436/1085] particl-core: 0.16.0.4 -> 0.16.0.5

---
 pkgs/applications/altcoins/particl/particl-core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
index 2524408429c..f47b04c1dae 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -19,11 +19,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "particl-core-${version}";
-  version     = "0.16.0.4";
+  version     = "0.16.0.5";
 
   src = fetchurl {
     url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz";
-    sha256 = "1yy8pw13rn821jpi1zvzwi3ipxi1bgfxv8g6jz49qlbjzjmjcr68";
+    sha256 = "070crn6nnzrbcaj30w0qbybpm9kfd2ghnvmxp29gckgknw6n0vam";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-- 
GitLab


From 9c8353aa9b8035e87fc1810b04c7a54f8e341566 Mon Sep 17 00:00:00 2001
From: Andre Ramos <andre.stylianos@gmail.com>
Date: Thu, 10 May 2018 11:13:36 +0200
Subject: [PATCH 0437/1085] joker: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index 929827ce112..4c32c0684d0 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "joker-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
 
   goPackagePath = "github.com/candid82/joker";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "candid82";
     repo = "joker";
-    sha256 = "10flfjnb9mz3dir3882agcs1lyr5qdpd9qfyvphrh08zr3jnb3hz";
+    sha256 = "1ayp7arygd3l4a1zbkhvix84fpqnnncbdxhimymr3c75ymwmmdr8";
   };
 
   preBuild = "go generate ./...";
-- 
GitLab


From 9938bb6c8259a6772e937b0f01318bc816f67ebe Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 10 May 2018 12:21:45 +0200
Subject: [PATCH 0438/1085] opencv3: fix $out/lib/pkgconfig/opencv.pc

---
 pkgs/development/libraries/opencv/3.x.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index efb9a7cdbe4..1d3a9629fd0 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -254,6 +254,21 @@ stdenv.mkDerivation rec {
     make doxygen
   '';
 
+  # By default $out/lib/pkgconfig/opencv.pc looks something like this:
+  #
+  #   prefix=/nix/store/10pzq1a8fkh8q4sysj8n6mv0w0nl0miq-opencv-3.4.1
+  #   exec_prefix=${prefix}
+  #   libdir=${exec_prefix}//nix/store/10pzq1a8fkh8q4sysj8n6mv0w0nl0miq-opencv-3.4.1/lib
+  #   ...
+  #   Libs: -L${exec_prefix}//nix/store/10pzq1a8fkh8q4sysj8n6mv0w0nl0miq-opencv-3.4.1/lib ...
+  #
+  # Note that ${exec_prefix} is set to $out but that $out is also appended to
+  # ${exec_prefix}. This causes linker errors in downstream packages so we strip
+  # of $out after the ${exec_prefix} prefix:
+  postInstall = ''
+    sed -i "s|\''${exec_prefix}/$out|\''${exec_prefix}|" "$out/lib/pkgconfig/opencv.pc"
+  '';
+
   hardeningDisable = [ "bindnow" "relro" ];
 
   passthru = lib.optionalAttrs enablePython { pythonPath = []; };
-- 
GitLab


From db0286b5f6cf85cd8c812a60da7258f8d42ca08c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 10 May 2018 12:58:23 +0200
Subject: [PATCH 0439/1085] monetdb: Build with readline for better
 interactivity

Readline is e.g. required for autocomplete, history, and advanced line
editing support in mclient.
---
 pkgs/servers/sql/monetdb/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 5f7e879819e..6067d498386 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, bison, openssl }:
+{ stdenv, fetchurl, pkgconfig
+, bison, openssl, readline
+}:
 
 let
   version = "11.29.3";
@@ -12,7 +14,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ bison openssl ];
+  buildInputs = [ bison openssl readline ];
 
   meta = with stdenv.lib; {
     description = "An open source database system";
-- 
GitLab


From da58afdd68e87ad2cca0d510c3530accf31a98f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 10 May 2018 13:11:26 +0200
Subject: [PATCH 0440/1085] nixos/tests/home-assistant: print log before
 failing

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

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 4ebccb7ab86..3d920dccc16 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -65,12 +65,12 @@ in {
     $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${apiPassword}' -m let_there_be_light");
     $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'");
 
-    # Check that no errors were logged
-    $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR");
-
     # Print log to ease debugging
     my $log = $hass->succeed("cat ${configDir}/home-assistant.log");
     print "\n### home-assistant.log ###\n";
     print "$log\n";
+
+    # Check that no errors were logged
+    $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR");
   '';
 })
-- 
GitLab


From 2f9fd6ff591ff6d1ef43492b4524ee5894c20c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 10 May 2018 12:16:39 +0100
Subject: [PATCH 0441/1085] plank: add autoreconfHook

---
 pkgs/applications/misc/plank/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
index 3e69f4a97c1..46e26666b40 100644
--- a/pkgs/applications/misc/plank/default.nix
+++ b/pkgs/applications/misc/plank/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
 , libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
 , bamf, gdk_pixbuf, libdbusmenu-gtk3, file
-, wrapGAppsHook, gobjectIntrospection }:
+, wrapGAppsHook, autoreconfHook, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   pname = "plank";
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     libxml2 # xmllint
     wrapGAppsHook
     gobjectIntrospection
+    autoreconfHook
   ];
 
   buildInputs = [ vala atk cairo glib gnome3.gnome-menus
-- 
GitLab


From 1bb5a80ab9d92fe8c9a7bc108a9f883669294b03 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 10 May 2018 07:57:11 -0400
Subject: [PATCH 0442/1085] linux: 4.9.98 -> 4.9.99

---
 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 b09a58c6eb7..c6a94b194b6 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.98";
+  version = "4.9.99";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1vqh33wdiqf3j4xfakxndhb8x6yr5ppwv9asx7kldjfvb8sr1k8j";
+    sha256 = "1pqk88h8wyqz2ijp0pav1b35m2hs9d9is1kcir649jlbj66fphrx";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 6c8aff71c15103ffcd6f60e3933e2be64762b48d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 10 May 2018 07:57:41 -0400
Subject: [PATCH 0443/1085] linux: 4.14.39 -> 4.9.40

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index f798a3a85e5..f1e0bf82cec 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.39";
+  version = "4.14.40";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1gdpq4w6srz2fpyi8bqpgz0p5wm3mrk7ir967c6f2285mdvcb7r6";
+    sha256 = "03nh71nqgifkamkb0gn12jny5h3lbn5kmpdy0ff886wyrl34sw6l";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From d21ec84b051337c4ae0613f7eefd0e584573b670 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 10 May 2018 07:58:04 -0400
Subject: [PATCH 0444/1085] linux: 4.16.7 -> 4.16.8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index acafd0bd89f..40d7d5d865f 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.7";
+  version = "4.16.8";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0f81mxc5b3zf5m29bwc3afv07k60661zl18098cjjqv6qpvbwynq";
+    sha256 = "1z4q7khag48wildvq4hf4vwaipkfbh9yywm2m9zfj43vk1ysvyp4";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From bcaff3c3e0a49b854cfd959796ec6e4daa899dc3 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 10 May 2018 17:04:04 +0300
Subject: [PATCH 0445/1085] tty: init at 1.30

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

diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix
new file mode 100644
index 00000000000..475d444c600
--- /dev/null
+++ b/pkgs/tools/misc/tio/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchzip, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "tio-${version}";
+  version = "1.30";
+
+  src = fetchzip {
+    url = "https://github.com/tio/tio/archive/v${version}.tar.gz";
+    sha256 = "1cyjy1jg2s32h1jkb99qb79sxkxh92niiyig0vysr14m4xnw01mr";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    description = "Serial console TTY";
+    homepage = https://tio.github.io/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ yegortimoshenko ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b628e94db1e..2c56ad44db5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5203,6 +5203,8 @@ with pkgs;
 
   tiny8086 = callPackage ../applications/virtualization/8086tiny { };
 
+  tio = callPackage ../tools/misc/tio { };
+
   tldr = callPackage ../tools/misc/tldr { };
 
   tldr-hs = haskellPackages.tldr;
-- 
GitLab


From d4e71a2321f04b590d58eb2292934214c20a4bca Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Thu, 10 May 2018 06:47:31 -0400
Subject: [PATCH 0446/1085] perlPackages.Paranoid: init at 2.05

---
 .../perl-modules/Paranoid-blessed-path.patch  | 23 +++++++++++++++++++
 pkgs/top-level/perl-packages.nix              | 19 +++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/perl-modules/Paranoid-blessed-path.patch

diff --git a/pkgs/development/perl-modules/Paranoid-blessed-path.patch b/pkgs/development/perl-modules/Paranoid-blessed-path.patch
new file mode 100644
index 00000000000..5e800250110
--- /dev/null
+++ b/pkgs/development/perl-modules/Paranoid-blessed-path.patch
@@ -0,0 +1,23 @@
+diff -ru Paranoid-2.05/lib/Paranoid.pm /tmp/Paranoid-2.05/lib/Paranoid.pm
+--- Paranoid-2.05/lib/Paranoid.pm	2017-02-06 05:48:57.000000000 -0500
++++ /tmp/Paranoid-2.05/lib/Paranoid.pm	2018-05-10 06:40:35.286313299 -0400
+@@ -61,7 +61,7 @@
+ 
+     my $path = shift;
+ 
+-    $path = '/bin:/usr/bin' unless defined $path;
++    $path = '__BLESSED_PATH__' unless defined $path;
+ 
+     delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+     $ENV{PATH} = $path;
+Binary files Paranoid-2.05/lib/.Paranoid.pm.swp and /tmp/Paranoid-2.05/lib/.Paranoid.pm.swp differ
+diff -ru Paranoid-2.05/t/01_init_core.t /tmp/Paranoid-2.05/t/01_init_core.t
+--- Paranoid-2.05/t/01_init_core.t	2016-07-12 04:49:33.000000000 -0400
++++ /tmp/Paranoid-2.05/t/01_init_core.t	2018-05-10 06:43:41.323183381 -0400
+@@ -35,5 +35,5 @@
+ ok( psecureEnv('/bin:/sbin'), 'psecureEnv 1' );
+ is( $ENV{PATH}, '/bin:/sbin', 'Validated PATH' );
+ ok( psecureEnv(), 'psecureEnv 2' );
+-is( $ENV{PATH}, '/bin:/usr/bin', 'Validated PATH' );
++is( $ENV{PATH}, '__BLESSED_PATH__', 'Validated PATH' );
+ 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 22733443ed1..5237f2a2c8e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11954,6 +11954,25 @@ let self = _self // overrides; _self = with self; {
      };
   };
 
+  Paranoid = buildPerlPackage rec {
+    name = "Paranoid-2.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/${name}.tar.gz";
+      sha256 = "583dfa0279733531f360795ad1cf4aa652d537b2b0bbd3c6925d0c8d75cbb3df";
+    };
+    patches = [ ../development/perl-modules/Paranoid-blessed-path.patch ];
+    preConfigure = ''
+      # Capture the path used when compiling this module as the "blessed"
+      # system path, analogous to the module's own use of '/bin:/sbin'.
+      sed -i "s#__BLESSED_PATH__#$PATH#" lib/Paranoid.pm t/01_init_core.t
+    '';
+    meta = {
+      description = "General function library for safer, more secure programming";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.limeytexan ];
+    };
+  };
+
   PARDist = buildPerlPackage {
     name = "PAR-Dist-0.49";
     src = fetchurl {
-- 
GitLab


From 988c56ee115a74ff1878fe8713f68c57c43d4e23 Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Thu, 10 May 2018 08:55:53 -0400
Subject: [PATCH 0447/1085] perlPackages.Paranoid: employ more restrictive
 blessed path

Decided it would be better to employ an even more restrictive default
"blessed" path by only including the coreutils package bin directory.
---
 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 5237f2a2c8e..46006366f19 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11964,7 +11964,7 @@ let self = _self // overrides; _self = with self; {
     preConfigure = ''
       # Capture the path used when compiling this module as the "blessed"
       # system path, analogous to the module's own use of '/bin:/sbin'.
-      sed -i "s#__BLESSED_PATH__#$PATH#" lib/Paranoid.pm t/01_init_core.t
+      sed -i "s#__BLESSED_PATH__#${pkgs.coreutils}/bin#" lib/Paranoid.pm t/01_init_core.t
     '';
     meta = {
       description = "General function library for safer, more secure programming";
-- 
GitLab


From 56bd3b7db8e2958121b963f9d87f5d1851724710 Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Thu, 10 May 2018 07:01:57 -0400
Subject: [PATCH 0448/1085] perlPackages.ClassEHierarchy: init at 2.00

---
 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 46006366f19..9a23eff2e7f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2064,6 +2064,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ClassEHierarchy = buildPerlPackage rec {
+    name = "Class-EHierarchy-2.00";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/${name}.tar.gz";
+      sha256 = "8498baaf7539eaa3422c6fe1055a0fc9a0c02e94dad0c63405373528e622bacb";
+    };
+    meta = {
+      description = "Base class for hierarchally ordered objects";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.limeytexan ];
+    };
+  };
+
   ClassFactory = buildPerlPackage {
     name = "Class-Factory-1.06";
     src = fetchurl {
-- 
GitLab


From 468841cea41a9ba33c4c262518e6f0796b99a440 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 22:27:56 +0800
Subject: [PATCH 0449/1085] owl-lisp: 0.1.14 -> 0.1.15

---
 pkgs/development/compilers/owl-lisp/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix
index 4e2f8b2af5b..ee076acd8b1 100644
--- a/pkgs/development/compilers/owl-lisp/default.nix
+++ b/pkgs/development/compilers/owl-lisp/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchFromGitHub, coreutils }:
+{ stdenv, fetchFromGitHub, coreutils, which }:
 
 stdenv.mkDerivation rec {
   name    = "owl-lisp-${version}";
-  version = "0.1.14";
+  version = "0.1.15";
 
   src = fetchFromGitHub {
     owner  = "aoh";
     repo   = "owl-lisp";
     rev    = "v${version}";
-    sha256 = "1rr0icprna3zs834q1pj4xy21cql3pcfknfkqipq01rhnl2893sz";
+    sha256 = "0pczmra2x6icyz6b6g66pp5ij83cq4wszg0ssw8qm7a5314kxkq4";
   };
 
+  nativeBuildInputs = [ which ];
+
   prePatch = ''
     substituteInPlace Makefile --replace /usr $out
 
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  # tests are already run as part of the compilation process
+  # tests are run as part of the compilation process
   doCheck = false;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 956d174c8da0195dd99805c6962165cff6c1f871 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 10 May 2018 17:44:40 +0300
Subject: [PATCH 0450/1085] ffmpeg_4: init

---
 pkgs/development/libraries/ffmpeg/4.nix       | 12 ++++++++++++
 pkgs/development/libraries/ffmpeg/generic.nix |  2 +-
 pkgs/top-level/all-packages.nix               |  4 ++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/ffmpeg/4.nix

diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
new file mode 100644
index 00000000000..a6e67052cd0
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, fetchpatch
+# Darwin frameworks
+, Cocoa, CoreMedia
+, ...
+}@args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}";
+  branch = "4.0";
+  sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii";
+  darwinFrameworks = [ Cocoa CoreMedia ];
+})
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 4a05eab87bd..b27db14528c 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
       "--enable-ffmpeg"
       "--disable-ffplay"
       (ifMinVer "0.6" "--enable-ffprobe")
-      "--disable-ffserver"
+      (if reqMin "4" then null else "--disable-ffserver")
     # Libraries
       (ifMinVer "0.6" "--enable-avcodec")
       (ifMinVer "0.6" "--enable-avdevice")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4d1ed8d89a..7856fe4b387 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8818,6 +8818,10 @@ with pkgs;
   ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
   };
+  ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
+  };
+
   # Aliases
   ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;
-- 
GitLab


From d691c8170ae2a8ef73c40f6187e7181015f8cdca Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 10 May 2018 17:45:05 +0300
Subject: [PATCH 0451/1085] mpv: 0.27.2 -> 0.28.2

---
 pkgs/applications/video/mpv/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 421e0dbb8a3..d990bad665c 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper
-, docutils, perl, pkgconfig, python3, which, ffmpeg
+, docutils, perl, pkgconfig, python3, which, ffmpeg_4
 , freefont_ttf, freetype, libass, libpthreadstubs
 , lua, luasocket, libuchardet, libiconv ? null, darwin
 
@@ -83,22 +83,15 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.27.2";
+  version = "0.28.2";
 
   src = fetchFromGitHub {
     owner = "mpv-player";
     repo  = "mpv";
     rev    = "v${version}";
-    sha256 = "1ivyyqajkxq5c1zxp0dm7pljvianhgvwl3dbghgpzyrch59k5wnr";
+    sha256 = "0bldxhqjz7z9fgvx4k40l49awpay17fscp8ypswb459yicy8npmg";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch";
-      sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb";
-    })
-  ];
-
   postPatch = ''
     patchShebangs ./TOOLS/
   '';
@@ -131,7 +124,7 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    ffmpeg freetype libass libpthreadstubs
+    ffmpeg_4 freetype libass libpthreadstubs
     lua luasocket libuchardet
   ] ++ optional alsaSupport        alsaLib
     ++ optional xvSupport          libXv
-- 
GitLab


From 06e394bbb451d7cd35dd3576216a8f2fb5cfdbf4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 14:09:15 +0800
Subject: [PATCH 0452/1085] ansible: update point releases and unify build

1) We had lots of copy paste - instead use a generic builder for the various reasons.

2) Default version changed to latest (2.5 instead of 2.4)

3) Point release updates to all
---
 pkgs/tools/admin/ansible/2.1.nix     | 55 -------------------
 pkgs/tools/admin/ansible/2.2.nix     | 57 -------------------
 pkgs/tools/admin/ansible/2.3.nix     | 40 --------------
 pkgs/tools/admin/ansible/2.4.nix     | 40 --------------
 pkgs/tools/admin/ansible/2.5.nix     | 40 --------------
 pkgs/tools/admin/ansible/default.nix | 82 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      | 15 ++---
 7 files changed, 90 insertions(+), 239 deletions(-)
 delete mode 100644 pkgs/tools/admin/ansible/2.1.nix
 delete mode 100644 pkgs/tools/admin/ansible/2.2.nix
 delete mode 100644 pkgs/tools/admin/ansible/2.3.nix
 delete mode 100644 pkgs/tools/admin/ansible/2.4.nix
 delete mode 100644 pkgs/tools/admin/ansible/2.5.nix
 create mode 100644 pkgs/tools/admin/ansible/default.nix

diff --git a/pkgs/tools/admin/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix
deleted file mode 100644
index b8b335bd618..00000000000
--- a/pkgs/tools/admin/ansible/2.1.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv
-, fetchurl
-, fetchFromGitHub
-, pythonPackages
-, windowsSupport ? false
-}:
-
-with pythonPackages;
-
-let
-  jinja = jinja2.overridePythonAttrs (old: rec {
-    version = "2.8.1";
-    name = "${old.pname}-${version}";
-    src = fetchFromGitHub {
-      owner = "pallets";
-      repo = "jinja";
-      rev = version;
-      sha256 = "0m6g6fx6flxb6hrkw757mbx1gxyrmj50w27m2afdsvmvz0zpdi2a";
-    };
-  });
-in buildPythonPackage rec {
-  pname = "ansible";
-  version = "2.1.4.0";
-  name = "${pname}-${version}";
-
-
-  src = fetchurl {
-    url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "05nc68900qrzqp88970j2lmyvclgrjki66xavcpzyzamaqrh7wg9";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = false;
-
-  propagatedBuildInputs = [
-    pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dnspython
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.ansible.com;
-    description = "A simple automation tool";
-    license = with licenses; [ gpl3] ;
-    maintainers = with maintainers; [
-      jgeerds
-      joamaki
-    ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/tools/admin/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix
deleted file mode 100644
index ccca64b86b6..00000000000
--- a/pkgs/tools/admin/ansible/2.2.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv
-, fetchurl
-, fetchFromGitHub
-, pythonPackages
-, windowsSupport ? false
-}:
-
-with pythonPackages;
-
-let
-  # Shouldn't be needed anymore in next version
-  # https://github.com/NixOS/nixpkgs/pull/22345#commitcomment-20718521
-  jinja = jinja2.overridePythonAttrs (old: rec {
-    version = "2.8.1";
-    name = "${old.pname}-${version}";
-    src = fetchFromGitHub {
-      owner = "pallets";
-      repo = "jinja";
-      rev = version;
-      sha256 = "0m6g6fx6flxb6hrkw757mbx1gxyrmj50w27m2afdsvmvz0zpdi2a";
-    };
-  });
-in buildPythonPackage rec {
-  pname = "ansible";
-  version = "2.2.1.0";
-  name = "${pname}-${version}";
-
-
-  src = fetchurl {
-    url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "0gz9i30pdmkchi936ijy873k8di6fmf3v5rv551hxyf0hjkjx8b3";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = false;
-
-  propagatedBuildInputs = [
-    pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dnspython
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.ansible.com;
-    description = "A simple automation tool";
-    license = with licenses; [ gpl3] ;
-    maintainers = with maintainers; [
-      jgeerds
-      joamaki
-    ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/tools/admin/ansible/2.3.nix b/pkgs/tools/admin/ansible/2.3.nix
deleted file mode 100644
index b827bdcc9c3..00000000000
--- a/pkgs/tools/admin/ansible/2.3.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, fetchurl
-, pythonPackages
-, windowsSupport ? false
-}:
-
-pythonPackages.buildPythonPackage rec {
-  pname = "ansible";
-  version = "2.3.2.0";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "1sv8666vw6fi93jlgkwd4lxkfn75yqczfvk129zlh8ll4wjv8qq5";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = false;
-
-  propagatedBuildInputs = with pythonPackages; [
-    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.ansible.com;
-    description = "A simple automation tool";
-    license = with licenses; [ gpl3 ] ;
-    maintainers = with maintainers; [
-      jgeerds
-      joamaki
-    ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/tools/admin/ansible/2.4.nix b/pkgs/tools/admin/ansible/2.4.nix
deleted file mode 100644
index 4f90e80202e..00000000000
--- a/pkgs/tools/admin/ansible/2.4.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, fetchurl
-, pythonPackages
-, windowsSupport ? false
-}:
-
-pythonPackages.buildPythonPackage rec {
-  pname = "ansible";
-  version = "2.4.2.0";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "0n3n9py4s3aykiii31xq8g4wmd6693jvby0424pjrg0bna01apri";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = false;
-
-  propagatedBuildInputs = with pythonPackages; [
-    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.ansible.com;
-    description = "A simple automation tool";
-    license = with licenses; [ gpl3 ];
-    maintainers = with maintainers; [
-      jgeerds
-      joamaki
-    ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/tools/admin/ansible/2.5.nix b/pkgs/tools/admin/ansible/2.5.nix
deleted file mode 100644
index 32d83861cd8..00000000000
--- a/pkgs/tools/admin/ansible/2.5.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, fetchurl
-, pythonPackages
-, windowsSupport ? false
-}:
-
-pythonPackages.buildPythonPackage rec {
-  pname = "ansible";
-  version = "2.5.1";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "06h0cmz0cgj1xszzn6rsypfc8lkazgh5g1yxyss1yx242d0wkw2i";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = false;
-
-  propagatedBuildInputs = with pythonPackages; [
-    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.ansible.com;
-    description = "A simple automation tool";
-    license = with licenses; [ gpl3 ];
-    maintainers = with maintainers; [
-      jgeerds
-      joamaki
-    ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
new file mode 100644
index 00000000000..4d9eff899b9
--- /dev/null
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, fetchurl, fetchFromGitHub, python2
+, windowsSupport ? false
+}:
+
+let
+  oldJinja = python2.override {
+    packageOverrides = self: super: {
+      jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec {
+        version = "2.8.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
+        };
+        doCheck = false;
+      });
+    };
+  };
+
+  generic = { version, sha256, py ? python2 }: py.pkgs.buildPythonPackage rec {
+    pname = "ansible";
+    inherit version;
+
+    src = fetchurl {
+      url = "http://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
+      inherit sha256;
+    };
+
+    prePatch = ''
+      sed -i "s,/usr/,$out," lib/ansible/constants.py
+    '';
+
+    doCheck = false;
+    dontStrip = true;
+    dontPatchELF = true;
+    dontPatchShebangs = false;
+
+    propagatedBuildInputs = with py.pkgs; [
+      pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
+    ] ++ stdenv.lib.optional windowsSupport pywinrm;
+
+    meta = with stdenv.lib; {
+      homepage = http://www.ansible.com;
+      description = "A simple automation tool";
+      license = with licenses; [ gpl3 ] ;
+      maintainers = with maintainers; [ jgeerds joamaki ];
+      platforms = with platforms; linux ++ darwin;
+    };
+  };
+
+in rec {
+  # We will carry all the supported versions
+
+  ansible_2_1 = generic {
+    version = "2.1.6.0";
+    sha256  = "0fhsmarjl9h401pm0gmcy68q80fiq544cxzcxyjzbnxr2a2cimz5";
+    py      = oldJinja;
+  };
+
+  ansible_2_2 = generic {
+    version = "2.2.3.0";
+    sha256  = "141aa76qy9hsc3h02yipyxg39maqq2r2c4nx53lm48kiy0fan66y";
+    py      = oldJinja;
+  };
+
+  ansible_2_3 = generic {
+    version = "2.3.3.0";
+    sha256  = "1yhaqgbx4zlwvi3cklnsqarjhhq28hgbvx603h07cjm1digp2ans";
+  };
+
+  ansible_2_4 = generic {
+    version = "2.4.4.0";
+    sha256  = "0n1k6h0h6av74nw8vq98fmh6q4pq6brpwmx45282vh3bkdmpa0ib";
+  };
+
+  ansible_2_5 = generic {
+    version = "2.5.2";
+    sha256  = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59";
+  };
+
+  ansible2 = ansible_2_5;
+  ansible  = ansible2;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 567167fc460..36532e55f93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7518,13 +7518,14 @@ with pkgs;
 
   augeas = callPackage ../tools/system/augeas { };
 
-  ansible_2_1 = callPackage ../tools/admin/ansible/2.1.nix {};
-  ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {};
-  ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {};
-  ansible_2_4 = callPackage ../tools/admin/ansible/2.4.nix {};
-  ansible_2_5 = callPackage ../tools/admin/ansible/2.5.nix {};
-  ansible  = ansible_2_4;
-  ansible2 = ansible_2_4;
+  inherit (callPackages ../tools/admin/ansible {})
+    ansible_2_1
+    ansible_2_2
+    ansible_2_3
+    ansible_2_4
+    ansible_2_5
+    ansible2
+    ansible;
 
   ansible-lint = callPackage ../development/tools/ansible-lint {};
 
-- 
GitLab


From efbeca76fe7845d7f2d9c2be7a611f1475bf64a2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 23:10:02 +0800
Subject: [PATCH 0453/1085] ansible: drop 2.1, 2.2 and 2.3 as they are EOL

---
 pkgs/tools/admin/ansible/default.nix | 17 -----------------
 pkgs/top-level/all-packages.nix      |  3 ---
 2 files changed, 20 deletions(-)

diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 4d9eff899b9..11ab58bc62f 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -50,23 +50,6 @@ let
 in rec {
   # We will carry all the supported versions
 
-  ansible_2_1 = generic {
-    version = "2.1.6.0";
-    sha256  = "0fhsmarjl9h401pm0gmcy68q80fiq544cxzcxyjzbnxr2a2cimz5";
-    py      = oldJinja;
-  };
-
-  ansible_2_2 = generic {
-    version = "2.2.3.0";
-    sha256  = "141aa76qy9hsc3h02yipyxg39maqq2r2c4nx53lm48kiy0fan66y";
-    py      = oldJinja;
-  };
-
-  ansible_2_3 = generic {
-    version = "2.3.3.0";
-    sha256  = "1yhaqgbx4zlwvi3cklnsqarjhhq28hgbvx603h07cjm1digp2ans";
-  };
-
   ansible_2_4 = generic {
     version = "2.4.4.0";
     sha256  = "0n1k6h0h6av74nw8vq98fmh6q4pq6brpwmx45282vh3bkdmpa0ib";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36532e55f93..3f3ef87b65d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7519,9 +7519,6 @@ with pkgs;
   augeas = callPackage ../tools/system/augeas { };
 
   inherit (callPackages ../tools/admin/ansible {})
-    ansible_2_1
-    ansible_2_2
-    ansible_2_3
     ansible_2_4
     ansible_2_5
     ansible2
-- 
GitLab


From 9cb1d82be6b10398c70b925e56baf8578d6b906a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 11:33:26 -0400
Subject: [PATCH 0454/1085] zeromqpp: Init at 4.2.0

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

diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix
new file mode 100644
index 00000000000..f7e849f6a33
--- /dev/null
+++ b/pkgs/development/libraries/zmqpp/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }:
+
+stdenv.mkDerivation rec {
+  name = "zmqpp-${version}";
+  version = "4.2.0";
+
+  src = fetchFromGitHub {
+    owner = "zeromq";
+    repo = "zmqpp";
+    rev = version;
+    sha256 = "08v34q3sd8g1b95k73n7jwryb0xzwca8ib9dz8ngczqf26j8k72i";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  propagatedBuildInputs = [ zeromq ];
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent";
+    license = licenses.lgpl3;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ chris-martin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71ef037ab9d..79dc32dd790 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12059,6 +12059,8 @@ with pkgs;
     czmq = czmq3;
   };
 
+  zmqpp = callPackage ../development/libraries/zmqpp { };
+
   zig = callPackage ../development/compilers/zig {
     llvmPackages = llvmPackages_6;
   };
-- 
GitLab


From ae429f8e5527263240b21e7641b84a7e7d6898d7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 02:10:09 -0400
Subject: [PATCH 0455/1085] yacas: 1.2.2 -> 1.6.1

They switched to cmake and talk about mingw cross, so I can kill
crossAttrs too.
---
 .../science/math/yacas/default.nix            | 59 +++++++++----------
 .../science/math/yacas/gcc43.patch            | 17 ------
 2 files changed, 27 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/applications/science/math/yacas/gcc43.patch

diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix
index 0f6dc35fe0c..c02ef73df11 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/applications/science/math/yacas/default.nix
@@ -1,44 +1,39 @@
-{stdenv, fetchurl, perl}: 
+{ stdenv, fetchFromGitHub, cmake, perl
+, enableGui ? false, qt5
+, enableJupyter ? false, boost, jsoncpp, openssl, zmqpp
+}:
 
 stdenv.mkDerivation rec {
-  name = "yacas-1.2.2";
+  name = "yacas-${version}";
+  version = "1.6.1";
 
-  src = fetchurl {
-    url = "http://yacas.sourceforge.net/backups/${name}.tar.gz";
-    sha256 = "1dmafm3w0lm5w211nwkfzaid1rvvmgskz7k4500pjhgdczi5sd78";
+  src = fetchFromGitHub {
+    owner = "grzegorzmazur";
+    repo = "yacas";
+    rev = "v${version}";
+    sha256 = "0awvlvf607r4hwl1vkhs6jq2s6ig46c66pmr4vspj2cdnypx99cc";
   };
 
   hardeningDisable = [ "format" ];
 
-  # Perl is only for the documentation
-  nativeBuildInputs = [ perl ];
-
-  patches = [ ./gcc43.patch ];
+  cmakeFlags = [
+    "-DENABLE_CYACAS_GUI=${if enableGui then "ON" else "OFF"}"
+    "-DENABLE_CYACAS_KERNEL=${if enableJupyter then "ON" else "OFF"}"
+  ];
 
-  crossAttrs = {
-    # Trick to get host-built programs needed for the cross-build.
-    # If yacas had proper makefiles, this would not be needed.
-    preConfigure = ''
-      ./configure
-      pushd src
-      make mkfastprimes 
-      cp mkfastprimes ../..
-      popd
-      pushd manmake
-      make manripper removeduplicates
-      cp manripper removeduplicates ../..
-      popd
-    '';
-    preBuild = ''
-      cp ../mkfastprimes ../manripper ../removeduplicates src
-    '';
-  };
+  # Perl is only for the documentation
+  nativeBuildInputs = [ cmake perl ];
+  buildInputs = [
+  ] ++ stdenv.lib.optionals enableGui (with qt5; [ qtbase qtwebkit ])
+    ++ stdenv.lib.optionals enableJupyter [ boost jsoncpp openssl zmqpp ]
+    ;
 
   meta = {
-      description = "Easy to use, general purpose Computer Algebra System";
-      homepage = http://yacas.sourceforge.net/;
-      license = stdenv.lib.licenses.gpl2Plus;
-      maintainers = with stdenv.lib.maintainers; [viric];
-      platforms = with stdenv.lib.platforms; linux;
+    description = "Easy to use, general purpose Computer Algebra System";
+    homepage = http://www.yacas.org/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+    broken = enableGui || enableJupyter;
   };
 }
diff --git a/pkgs/applications/science/math/yacas/gcc43.patch b/pkgs/applications/science/math/yacas/gcc43.patch
deleted file mode 100644
index 054f80cff92..00000000000
--- a/pkgs/applications/science/math/yacas/gcc43.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Taken from gentoo:
-http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/yacas/files/yacas-1.2.2-gcc43.patch?rev=1.1&view=markup
-Index: yacas-1.2.2-gcc43.patch
-===================================================================
---- a/manmake/manripper.cpp
-+++ b/manmake/manripper.cpp
-@@ -1,7 +1,8 @@
- 
--#include <stdio.h>
--#include <ctype.h>
-+#include <cstdio>
-+#include <cctype>
- #include <string>
-+#include <cstring>
- #include <map>
- 
- using namespace std;
-- 
GitLab


From a1f4d033ddc30a17a982f0f5a2a3497d766c63ae Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 02:20:53 -0400
Subject: [PATCH 0456/1085] fossil: Remove crossAttrs

TCC= (and BCC=) no longer needed as new Makefile defines with CC (and
CC_FOR_BUILD).
---
 .../version-management/fossil/default.nix         | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index f46a704ea9c..1373e13c414 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,5 +1,7 @@
-{stdenv, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which
-, tcllib, withJson ? true}:
+{ stdenv
+, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which
+, tcllib, withJson ? true
+}:
 
 stdenv.mkDerivation rec {
   name = "fossil-${version}";
@@ -18,11 +20,11 @@ stdenv.mkDerivation rec {
              ++ stdenv.lib.optional stdenv.isDarwin libiconv;
   nativeBuildInputs = [ tcl ];
 
-  doCheck = true;
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
 
   checkTarget = "test";
 
-  preCheck = ''
+  preCheck = stdenv.lib.optional doCheck ''
     export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}"
   '';
   configureFlags = if withJson then  "--json" else  "";
@@ -36,11 +38,6 @@ stdenv.mkDerivation rec {
     INSTALLDIR=$out/bin make install
   '';
 
-  crossAttrs = {
-    doCheck = false;
-    makeFlags = [ "TCC=$CC" ];
-  };
-
   meta = {
     description = "Simple, high-reliability, distributed software configuration management";
     longDescription = ''
-- 
GitLab


From 1174526004cf25cc9fb0701a95c853521bad778d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 02:28:21 -0400
Subject: [PATCH 0457/1085] cloog-ppl: No crossAttrs needed

---
 pkgs/development/libraries/cloog-ppl/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix
index 442b115a408..0ce0af97ec9 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/pkgs/development/libraries/cloog-ppl/default.nix
@@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
     touch NEWS ChangeLog AUTHORS
   '';
 
-  crossAttrs = {
-    configureFlags = "--with-ppl=${ppl.crossDrv}";
-  };
-
   doCheck = true;
 
   meta = {
-- 
GitLab


From 79adb993fbafeb89062e9b948e916d89311f7ca6 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 02:32:51 -0400
Subject: [PATCH 0458/1085] cscope: Remove unneeded crossAttrs

---
 pkgs/development/tools/misc/cscope/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix
index b737bb7a7da..0b1bbf5f9e4 100644
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/pkgs/development/tools/misc/cscope/default.nix
@@ -31,11 +31,6 @@ stdenv.mkDerivation rec {
     cp xcscope.el{,c} "$out/share/emacs/site-lisp"
   '';
 
-  crossAttrs = {
-    postInstall = "";
-    propagatedBuildInputs = [ ncurses.crossDrv ];
-  };
-
   meta = {
     description = "A developer's tool for browsing source code";
 
-- 
GitLab


From 515ca1a7c8ca1c57b472826ae2b5dd2965b8b4bf Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 12:16:29 -0400
Subject: [PATCH 0459/1085] guile: Remove old crossAttrs

We fixed the linker issue with propagated dependencies.
---
 pkgs/development/interpreters/guile/2.0.nix     | 9 ---------
 pkgs/development/interpreters/guile/default.nix | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 2c9aec5b695..3a11dc78c6c 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -92,15 +92,6 @@
 
   setupHook = ./setup-hook-2.0.sh;
 
-  crossAttrs.preConfigure =
-    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
-       # passed.  So it needs some help (XXX).
-       "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib";
-
-
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = http://www.gnu.org/software/guile/;
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 3d5c51dc420..748b3c5e200 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -88,15 +88,6 @@
 
   setupHook = ./setup-hook-2.2.sh;
 
-  crossAttrs.preConfigure =
-    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
-       # passed.  So it needs some help (XXX).
-       "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib";
-
-
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = http://www.gnu.org/software/guile/;
-- 
GitLab


From 219b74d71bdd8c93d099cc921cc4f192bd8753ad Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 12:31:03 -0400
Subject: [PATCH 0460/1085] SDL, SDL2: Remove crossAttrs

Cross drvs are now the default for precisely this reason.
---
 pkgs/development/libraries/SDL/default.nix  | 36 ++++++++-------------
 pkgs/development/libraries/SDL2/default.nix | 18 +++--------
 2 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 5e1c527eb8b..7e96cf84686 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -15,24 +15,6 @@ with lib;
 assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
 assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null);
 
-let
-
-  configureFlagsFun = attrs: [
-    "--disable-oss"
-    "--disable-video-x11-xme"
-    "--enable-rpath"
-  # Building without this fails on Darwin with
-  #
-  #   ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32'
-  #   SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
-  #
-  # Please try revert the change that introduced this comment when updating SDL.
-  ] ++ optional stdenv.isDarwin "--disable-x11-shared"
-    ++ optional (!x11Support) "--without-x"
-    ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib";
-
-in
-
 stdenv.mkDerivation rec {
   name    = "SDL-${version}";
   version = "1.2.15";
@@ -62,11 +44,19 @@ stdenv.mkDerivation rec {
     ++ optional (!hostPlatform.isMinGW) audiofile
     ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
 
-  configureFlags = configureFlagsFun { inherit alsaLib; };
-
-  crossAttrs = {
-    configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
-  };
+  configureFlags = [
+    "--disable-oss"
+    "--disable-video-x11-xme"
+    "--enable-rpath"
+  # Building without this fails on Darwin with
+  #
+  #   ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32'
+  #   SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
+  #
+  # Please try revert the change that introduced this comment when updating SDL.
+  ] ++ optional stdenv.isDarwin "--disable-x11-shared"
+    ++ optional (!x11Support) "--without-x"
+    ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib";
 
   patches = [
     ./find-headers.patch
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index fe19ecadd0e..d852b594f6d 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -19,15 +19,6 @@ with lib;
 assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
 assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null);
 
-let
-
-  configureFlagsFun = attrs: [
-    "--disable-oss"
-  ] ++ optional (!x11Support) "--without-x"
-    ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib";
-
-in
-
 stdenv.mkDerivation rec {
   name = "SDL2-${version}";
   version = "2.0.8";
@@ -61,11 +52,10 @@ stdenv.mkDerivation rec {
   #   pointer-constraints-unstable-v1-client-protocol.h: No such file or directory
   enableParallelBuilding = false;
 
-  configureFlags = configureFlagsFun { inherit alsaLib; };
-
-  crossAttrs = {
-    configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
-  };
+  configureFlags = [
+    "--disable-oss"
+  ] ++ optional (!x11Support) "--without-x"
+    ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib";
 
   postInstall = ''
     moveToOutput lib/libSDL2main.a "$dev"
-- 
GitLab


From 88ff3c0f5d5381351daeb38099efb303f970c810 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 12:32:09 -0400
Subject: [PATCH 0461/1085] freetype: Remove crossAttrs

These sorts of C compiler confusions aren't really a problem anymore.
Everything is on the path with the right environment variables.
---
 pkgs/development/libraries/freetype/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 4d2455d4872..23aa86af377 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -62,11 +62,4 @@ in stdenv.mkDerivation rec {
     wrapProgram "$dev/bin/freetype-config" \
       --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
   '';
-
-  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.
-    configureFlags = "--disable-static CC_BUILD=gcc";
-  };
 }
-- 
GitLab


From e84b9401c5ee56b5085ffaf49e2b60514b9794cc Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 12:34:12 -0400
Subject: [PATCH 0462/1085] libdrm: Remove crossAttrs

No hashes should be changed.
---
 pkgs/development/libraries/libdrm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index ccae6ce5014..50d9a565a6c 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--enable-install-test-programs" ]
     ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
       [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "-C";
-
-  crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
+    ++ stdenv.lib.optional stdenv.isDarwin "-C"
+    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-intel"
+    ;
 
   meta = {
     homepage = https://dri.freedesktop.org/libdrm/;
-- 
GitLab


From 7afe4f1df070f0f63fd1bc1158109dbc8fe3dfef Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 13:06:09 -0400
Subject: [PATCH 0463/1085] libpng: Remove stale crossAttrs

Random ancient stuff for Darwin cross that seems not worth it.
---
 pkgs/development/libraries/libpng/12.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 457f99ef13b..01a828f95da 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit zlib; };
 
-  crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc == "libSystem") {
-    propagatedBuildInputs = [];
-    passthru = {};
-  };
-
   configureFlags = "--enable-static";
 
   postInstall = ''mv "$out/bin" "$dev/bin"'';
-- 
GitLab


From 2b28312bc2146e6a2729cd46ae79ab666d3c6521 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 13:10:39 -0400
Subject: [PATCH 0464/1085] libssh2: Remove crossAttrs

 - --with-<lib> stuff isn't needed with new default

 - `mingw_w64` probably also isn't needed, but kept with better code
   just in case.
---
 pkgs/development/libraries/libssh2/default.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index a09a7670739..f85b709cf39 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -12,22 +12,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "devdoc" ];
 
-  buildInputs = [ openssl zlib ];
-
-  crossAttrs = {
-    # link against cross-built libraries
-    configureFlags = [
-      "--with-openssl"
-      "--with-libssl-prefix=${openssl.crossDrv}"
-      "--with-libz"
-      "--with-libz-prefix=${zlib.crossDrv}"
-    ];
-  } // 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"
-    '';
-  };
+  buildInputs = [ openssl zlib ]
+    ++ stdenv.lib.optional hostPlatform.isMinGW windows.mingw_w64;
 
   meta = {
     description = "A client-side C library implementing the SSH2 protocol";
-- 
GitLab


From 08eba842b071971dd42df24e12160a1d78f7c3b4 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@utzutzutz.net>
Date: Mon, 7 May 2018 19:28:13 +0200
Subject: [PATCH 0465/1085] graylog: 2.4.3 -> 2.4.4

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

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index b9945a3afd3..cc7addb668e 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.3";
+  version = "2.4.4";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "0kwgg9m9sqzl4y2ri69fpi7w9961psbmfdq3avjsbgbs60ly1hn6";
+    sha256 = "0wiqwwsy306hr7zn57f5hvh8wvcc2q46x0hdlabi0n9m44wk993i";
   };
 
   dontBuild = true;
-- 
GitLab


From 9817b4aa5f6a1a2ee44866bd77ef72132a0b8891 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@utzutzutz.net>
Date: Tue, 8 May 2018 15:48:18 +0200
Subject: [PATCH 0466/1085] graylog: wrap graylogctl

Wrapper ensures graylogctl script can find java
---
 pkgs/tools/misc/graylog/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index cc7addb668e..f79be961378 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper, jre_headless }:
 
 stdenv.mkDerivation rec {
   version = "2.4.4";
@@ -12,9 +12,13 @@ stdenv.mkDerivation rec {
   dontBuild = true;
   dontStrip = true;
 
+  buildInputs = [ makeWrapper ];
+  makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ];
+
   installPhase = ''
     mkdir -p $out
     cp -r {graylog.jar,lib,bin,plugin,data} $out
+    wrapProgram $out/bin/graylogctl $makeWrapperArgs
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From f8d047da50dbc7d012a8d322b4d5e5a0b639733c Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Thu, 10 May 2018 19:36:58 +0200
Subject: [PATCH 0467/1085] nixos/release-combined.nix: make tests consistent
 (#40131)

... with release-small.nix
Tests for small channel should be a subset of tests for full channel.
---
 nixos/release-combined.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index e010b532a68..deb28835968 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -58,6 +58,8 @@ in rec {
         nixos.ova.x86_64-linux or []
 
         #(all nixos.tests.containers)
+        (all nixos.tests.containers-imperative)
+        (all nixos.tests.containers-ipv4)
         nixos.tests.chromium.x86_64-linux or []
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
@@ -98,6 +100,7 @@ in rec {
         (all nixos.tests.misc)
         (all nixos.tests.mutableUsers)
         (all nixos.tests.nat.firewall)
+        (all nixos.tests.nat.firewall-conntrack)
         (all nixos.tests.nat.standalone)
         (all nixos.tests.networking.scripted.loopback)
         (all nixos.tests.networking.scripted.static)
@@ -112,6 +115,7 @@ in rec {
         (all nixos.tests.nfs4)
         (all nixos.tests.openssh)
         (all nixos.tests.php-pcre)
+        (all nixos.tests.predictable-interface-names)
         (all nixos.tests.printing)
         (all nixos.tests.proxy)
         (all nixos.tests.sddm.default)
-- 
GitLab


From 558f4b3368b83844837fccd58e9e89490911a1b3 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Thu, 10 May 2018 19:38:02 +0200
Subject: [PATCH 0468/1085] nixos/tests/plotinus: fix non-deterministic failure
 (#40239)

Test failed sometimes, likely because a window didn't get focus.
---
 nixos/tests/plotinus.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix
index 557d65f7960..9058c59c92d 100644
--- a/nixos/tests/plotinus.nix
+++ b/nixos/tests/plotinus.nix
@@ -15,11 +15,11 @@ import ./make-test.nix ({ pkgs, ... }: {
   testScript =
     ''
       $machine->waitForX;
-      $machine->execute("xterm -e 'gnome-calculator' &");
-      $machine->waitForWindow(qr/Calculator/);
-      $machine->execute("xdotool key ctrl+shift+p");
-      $machine->sleep(1); # wait for the popup
-      $machine->execute("xdotool key p r e f e r e n c e s Return");
+      $machine->succeed("gnome-calculator &");
+      $machine->waitForWindow(qr/gnome-calculator/);
+      $machine->succeed("xdotool search --sync --onlyvisible --class gnome-calculator windowfocus --sync key ctrl+shift+p");
+      $machine->sleep(5); # wait for the popup
+      $machine->succeed("xdotool key --delay 100 p r e f e r e n c e s Return");
       $machine->waitForWindow(qr/Preferences/);
       $machine->screenshot("screen");
     '';
-- 
GitLab


From 461903974e2510fe3e7a5cd82a96c3909501ae14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 10 May 2018 14:46:32 -0300
Subject: [PATCH 0469/1085] theme-jade1: init at 3.2

---
 pkgs/misc/themes/jade1/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  6 ++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/misc/themes/jade1/default.nix

diff --git a/pkgs/misc/themes/jade1/default.nix b/pkgs/misc/themes/jade1/default.nix
new file mode 100644
index 00000000000..9870b3fefeb
--- /dev/null
+++ b/pkgs/misc/themes/jade1/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "theme-jade1-${version}";
+  version = "3.2";
+
+  src = fetchFromGitHub {
+    owner = "madmaxms";
+    repo = "theme-jade-1";
+    rev = "v${version}";
+    sha256 = "0lf8cawn2s2x1b9af0cznhqzx3dsr8h18srcwjz7af3y5daxf311";
+  };
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    mkdir -p $out/share/themes
+    cp -a Jade-1 $out/share/themes
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications";
+    homepage = https://github.com/madmaxms/theme-jade-1;
+    license = with licenses; [ gpl3 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb37b8a1744..6e445747be1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19806,10 +19806,12 @@ with pkgs;
 
   numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { };
 
-  theme-obsidian2 = callPackage ../misc/themes/obsidian2 { };
-
   onestepback = callPackage ../misc/themes/onestepback { };
 
+  theme-jade1 = callPackage ../misc/themes/jade1 { };
+
+  theme-obsidian2 = callPackage ../misc/themes/obsidian2 { };
+
   theme-vertex = callPackage ../misc/themes/vertex { };
 
   rox-filer = callPackage ../desktops/rox/rox-filer {
-- 
GitLab


From 8db05ade402e2baac59078ea73fc689bc4b3b1c7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 14:11:23 -0400
Subject: [PATCH 0470/1085] gnused: Remove crossAttrs

Use a cleaner help2man trick from coreutils
---
 pkgs/tools/text/gnused/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 72d632533ff..b463a92ba74 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -14,13 +14,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl ];
   preConfigure = "patchShebangs ./build-aux/help2man";
 
-  crossAttrs = {
-    # The tarball ships with a fine prebuilt manpage, but the make rules try to rebuild it,
-    # which won't work when cross compiling as help2man needs to execute the binaries.
-    postConfigure = ''
-      sed -i Makefile -e 's|doc/sed\.1:|dummy:|'
-    '';
-  };
+  # Prevents attempts of running 'help2man' on cross-built binaries.
+  PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing";
 
   meta = {
     homepage = http://www.gnu.org/software/sed/;
-- 
GitLab


From b12850d4214e40e8514163a47fa4545c7196f717 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Thu, 10 May 2018 19:16:03 +0200
Subject: [PATCH 0471/1085] skhd: Bump 0.0.14 to 0.1.1

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

diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index 3331084d807..c51ada10d68 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "skhd-${version}";
-  version = "0.0.14";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "skhd";
     rev = "v${version}";
-    sha256 = "0kkmlka1hxsjdkx0ywkm48p9v1jhld26lfplls20n0hj97i5iwlz";
+    sha256 = "1wh7v90ydh27gbaiwn2r6ncx6yiic4mph3w9vi1282nz2q02zxss";
   };
 
   buildInputs = [ Carbon ];
-- 
GitLab


From 58b2e875c212f10129a2320f38f03988dee13bed Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 9 May 2018 18:50:51 -0400
Subject: [PATCH 0472/1085] lib/systems: Prohibit "gnu" ABI (*-gnu) with 32-bit
 ARM

It is ambiguous, and therefore banned within GCC.
---
 lib/systems/default.nix |  7 +++++++
 lib/systems/parse.nix   | 12 ++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 0e1a10c1f64..ee4c29660a5 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -50,5 +50,12 @@ rec {
     } // mapAttrs (n: v: v final.parsed) inspect.predicates
       // args;
   in assert final.useAndroidPrebuilt -> final.isAndroid;
+     assert lib.foldl
+       (pass: { assertion, message }:
+         if assertion final
+         then pass
+         else throw message)
+       true
+       (final.parsed.abi.assertions or []);
     final;
 }
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 16d657a5435..08f2fb445de 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -192,7 +192,15 @@ rec {
   abis = setTypes types.openAbi {
     android = {};
     cygnus = {};
-    gnu = {};
+    gnu = {
+      assertions = [
+        { assertion = platform: !platform.isAarch32;
+          message = ''
+            The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead.
+          '';
+        }
+      ];
+    };
     msvc = {};
     eabi = {};
     androideabi = {};
@@ -270,7 +278,7 @@ rec {
       kernel = getKernel args.kernel;
       abi =
         /**/ if args ? abi       then getAbi args.abi
-        else if isLinux   parsed then abis.gnu
+        else if isLinux   parsed then (if isAarch32 parsed then abis.gnueabi else abis.gnu)
         else if isWindows parsed then abis.gnu
         else                     abis.unknown;
     };
-- 
GitLab


From cc083fa9070cdef426457142a2b38c2708547d51 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 10 May 2018 21:41:40 +0200
Subject: [PATCH 0473/1085] pytrainer: 1.12.0 -> 1.12.1

---
 pkgs/applications/misc/pytrainer/default.nix       |  4 ++--
 pkgs/applications/misc/pytrainer/fix-test-tz.patch | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index dcbd14198f7..cdeca96568d 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@@ -14,13 +14,13 @@ in
 
 python.pkgs.buildPythonApplication rec {
   name = "pytrainer-${version}";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "pytrainer";
     repo = "pytrainer";
     rev = "v${version}";
-    sha256 = "09pfddjaqdpy3r27h21xvsvh04sb8hppinskxlahdqb3vjzkr581";
+    sha256 = "0rzf8kks96qzlknh6g3b9pjq04j7qk6rmz58scp7sck8xz9rjbwx";
   };
 
   namePrefix = "";
diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch
index 761064077a9..ca487576901 100644
--- a/pkgs/applications/misc/pytrainer/fix-test-tz.patch
+++ b/pkgs/applications/misc/pytrainer/fix-test-tz.patch
@@ -30,13 +30,16 @@ diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrain
 +        summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')]
          activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1')
          self.ddbb.session.add(activity)
-         self.ddbb.session.commit()
+         self.ddbb.session.commit(
 diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py
---- source.orig/pytrainer/test/lib/test_date.py	2018-02-27 22:15:32.079243364 +0100
-+++ source/pytrainer/test/lib/test_date.py	2018-02-27 22:16:33.936867052 +0100
-@@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase
+--- source.orig/pytrainer/test/lib/test_date.py	2018-05-10 21:15:22.196275555 +0200
++++ source/pytrainer/test/lib/test_date.py	2018-05-10 21:22:43.647870401 +0200
+@@ -47,7 +47,7 @@ class DateFunctionTest(unittest.TestCase
      def test_getDateTime(self):
          utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015')
          self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime)
 -        self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime)
 +        self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime)
+ 
+ class DateRangeTest(unittest.TestCase):
+ 
-- 
GitLab


From 938ff5401adc7ae43bd185d8fa610f1fd4f6ead1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 10 May 2018 23:03:28 +0200
Subject: [PATCH 0474/1085] signal-desktop: 1.9.0 -> 1.10.0

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

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 479b89bcecb..4fe4d6ceca2 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,13 +40,13 @@ in
   stdenv.mkDerivation rec {
     name = "signal-desktop-${version}";
 
-    version = "1.9.0";
+    version = "1.10.0";
 
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-          sha256 = "18i9chyarpcw369rqyldckkln1lxy5g9qy9f5gy5gsz9y5qngxqa";
+          sha256 = "0fjc5zf3lr5pmlc57yv3spjk2hq4b3lxngc6iw6c73ficnz4ij7i";
         }
       else
         throw "Signal for Desktop is not currently supported on ${stdenv.system}";
-- 
GitLab


From 840e5d8bda527bb0986efee9df0d45b6e59521d2 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 10 May 2018 23:30:56 +0200
Subject: [PATCH 0475/1085] nixos/tests/graphite: fix test

- adapt netcat options to libressl-nc
- wait for services to be started and accepting connections
---
 nixos/tests/graphite.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix
index a22ef224580..5a1f50bd29b 100644
--- a/nixos/tests/graphite.nix
+++ b/nixos/tests/graphite.nix
@@ -4,6 +4,7 @@ import ./make-test.nix ({ pkgs, ...} :
   nodes = {
     one =
       { config, pkgs, ... }: {
+        virtualisation.memorySize = 1024;
         time.timeZone = "UTC";
         services.graphite = {
           web.enable = true;
@@ -21,12 +22,17 @@ import ./make-test.nix ({ pkgs, ...} :
   testScript = ''
     startAll;
     $one->waitForUnit("default.target");
-    $one->requireActiveUnit("graphiteWeb.service");
-    $one->requireActiveUnit("graphiteApi.service");
-    $one->requireActiveUnit("graphitePager.service");
-    $one->requireActiveUnit("carbonCache.service");
-    $one->requireActiveUnit("seyren.service");
-    $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003");
-    $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo")
+    $one->waitForUnit("graphiteWeb.service");
+    $one->waitForUnit("graphiteApi.service");
+    $one->waitForUnit("graphitePager.service");
+    $one->waitForUnit("carbonCache.service");
+    $one->waitForUnit("seyren.service");
+    # The services above are of type "simple". systemd considers them active immediately
+    # even if they're still in preStart (which takes quite long for graphiteWeb).
+    # Wait for ports to open so we're sure the services are up and listening.
+    $one->waitForOpenPort(8080);
+    $one->waitForOpenPort(2003);
+    $one->succeed("echo \"foo 1 `date +%s`\" | nc -N localhost 2003");
+    $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2");
   '';
 })
-- 
GitLab


From c9f6a82b619675a4ee1eb4fe9eac57efb69232fe Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 17:13:52 -0400
Subject: [PATCH 0476/1085] gcc: Factor out "platform flags"

---
 pkgs/development/compilers/gcc/4.5/default.nix | 18 +-----------------
 pkgs/development/compilers/gcc/4.8/default.nix | 18 +-----------------
 pkgs/development/compilers/gcc/4.9/default.nix | 18 +-----------------
 pkgs/development/compilers/gcc/5/default.nix   | 18 +-----------------
 pkgs/development/compilers/gcc/6/default.nix   | 18 +-----------------
 pkgs/development/compilers/gcc/7/default.nix   | 18 +-----------------
 .../compilers/gcc/common/platform-flags.nix    | 12 ++++++++++++
 .../compilers/gcc/snapshot/default.nix         | 18 +-----------------
 8 files changed, 19 insertions(+), 119 deletions(-)
 create mode 100644 pkgs/development/compilers/gcc/common/platform-flags.nix

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 8cee08c0926..36b48b88021 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -64,22 +64,6 @@ let version = "4.5.4";
 
     javaAwtGtk = langJava && gtk2 != null;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings */
     crossMingw = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt");
 
@@ -312,7 +296,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
 
     # Platform-specific flags
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index c798a67de84..dea8b912b27 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -108,22 +108,6 @@ let version = "4.8.5";
 
     javaAwtGtk = langJava && x11Support;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
     crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
@@ -372,7 +356,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
 
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index c729bbeb66f..343d820fa23 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -99,22 +99,6 @@ let version = "4.9.4";
 
     javaAwtGtk = langJava && x11Support;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
     crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
@@ -380,7 +364,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
 
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index f2a091e34dc..0d9565de0a7 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -103,22 +103,6 @@ let version = "5.5.0";
 
     javaAwtGtk = langJava && x11Support;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
     crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
@@ -396,7 +380,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
 
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 3de5b4dd270..29f2bad7eac 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -97,22 +97,6 @@ let version = "6.4.0";
 
     javaAwtGtk = langJava && x11Support;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
     crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
@@ -400,7 +384,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
 
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 888e455488c..e75e22efce1 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -98,22 +98,6 @@ let version = "7.3.0";
 
     javaAwtGtk = langJava && x11Support;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
     crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
@@ -396,7 +380,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
 
diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix
new file mode 100644
index 00000000000..71997752ad1
--- /dev/null
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -0,0 +1,12 @@
+{ lib, targetPlatform }:
+
+let
+  p = targetPlatform.platform.gcc or {};
+in lib.concatLists [
+  (lib.optional (p ? arch) "--with-arch=${p.arch}")
+  (lib.optional (p ? cpu) "--with-cpu=${p.cpu}")
+  (lib.optional (p ? abi) "--with-abi=${p.abi}")
+  (lib.optional (p ? fpu) "--with-fpu=${p.fpu}")
+  (lib.optional (p ? float) "--with-float=${p.float}")
+  (lib.optional (p ? mode) "--with-mode=${p.mode}")
+]
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 3c98b7a58f7..609d418693d 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -95,22 +95,6 @@ let version = "7-20170409";
 
     javaAwtGtk = langJava && x11Support;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
     crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
@@ -368,7 +352,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
 
-- 
GitLab


From 1fe81a4bcd25dba9319bc1bb49b078872f28ffa6 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 17:31:07 -0400
Subject: [PATCH 0477/1085] lib: Clean up float/fpu options

ARM ABIs now have a float field. This is used as a fallback to lessen
our use of `platform.gcc.float`. I didn't know what the MIPs convention
is so I kept using `platform.gcc.float` in that case.
---
 lib/systems/examples.nix                      |  9 +-----
 lib/systems/parse.nix                         | 32 +++++++++++--------
 lib/systems/platforms.nix                     |  6 +---
 .../compilers/gcc/common/platform-flags.nix   |  3 +-
 pkgs/development/libraries/glibc/common.nix   |  4 ++-
 5 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 80e320406bf..32c24bab7c9 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -11,21 +11,16 @@ rec {
 
   sheevaplug = rec {
     config = "armv5tel-unknown-linux-gnueabi";
-    float = "soft";
     platform = platforms.sheevaplug;
   };
 
   raspberryPi = rec {
     config = "armv6l-unknown-linux-gnueabihf";
-    float = "hard";
-    fpu = "vfp";
     platform = platforms.raspberrypi;
   };
 
   armv7l-hf-multiplatform = rec {
     config = "armv7a-unknown-linux-gnueabihf";
-    float = "hard";
-    fpu = "vfpv3-d16";
     platform = platforms.armv7l-hf-multiplatform;
   };
 
@@ -47,26 +42,24 @@ rec {
 
   pogoplug4 = rec {
     config = "armv5tel-unknown-linux-gnueabi";
-    float = "soft";
     platform = platforms.pogoplug4;
   };
 
   ben-nanonote = rec {
     config = "mipsel-unknown-linux-uclibc";
-    float = "soft";
     platform = {
       name = "ben_nanonote";
       kernelMajor = "2.6";
       kernelArch = "mips";
       gcc = {
         arch = "mips32";
+        float = "soft";
       };
     };
   };
 
   fuloongminipc = rec {
     config = "mipsel-unknown-linux-gnu";
-    float = "hard";
     platform = platforms.fuloong2f_n32;
   };
 
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 7ba06f129db..3667766aa9f 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -182,20 +182,24 @@ rec {
   types.abi = enum (attrValues abis);
 
   abis = setTypes types.openAbi {
-    android = {};
-    cygnus = {};
-    gnu = {};
-    msvc = {};
-    eabi = {};
-    androideabi = {};
-    gnueabi = {};
-    gnueabihf = {};
-    musleabi = {};
-    musleabihf = {};
-    musl = {};
-    uclibceabihf = {};
-    uclibceabi = {};
-    uclibc = {};
+    cygnus       = {};
+    msvc         = {};
+    eabi         = {};
+
+    androideabi  = {};
+    android      = {};
+
+    gnueabi      = { float = "soft"; };
+    gnueabihf    = { float = "hard"; };
+    gnu          = {};
+
+    musleabi     = { float = "soft"; };
+    musleabihf   = { float = "hard"; };
+    musl         = {};
+
+    uclibceabihf = { float = "soft"; };
+    uclibceabi   = { float = "hard"; };
+    uclibc       = {};
 
     unknown = {};
   };
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index f39e890fbf1..d6587ac49a8 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -25,7 +25,6 @@ rec {
 
     gcc = {
       arch = "armv5te";
-      float = "soft";
     };
 
     kernelMajor = "2.6";
@@ -158,7 +157,6 @@ rec {
     kernelDTB = true; # Beyond 3.10
     gcc = {
       arch = "armv5te";
-      float = "soft";
     };
   };
 
@@ -336,7 +334,6 @@ rec {
     gcc = {
       cpu = "cortex-a9";
       fpu = "vfpv3";
-      float = "hard";
     };
   };
 
@@ -363,7 +360,6 @@ rec {
     gcc = {
       cpu = "cortex-a9";
       fpu = "neon";
-      float = "hard";
     };
   };
 
@@ -449,6 +445,7 @@ rec {
     kernelTarget = "vmlinux";
     gcc = {
       arch = "loongson2f";
+      float = "hard";
       abi = "n32";
     };
   };
@@ -498,7 +495,6 @@ rec {
       # and the above page suggests NEON is only an improvement with hand-written assembly.
       arch = "armv7-a";
       fpu = "vfpv3-d16";
-      float = "hard";
 
       # For Raspberry Pi the 2 the best would be:
       #   cpu = "cortex-a7";
diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix
index 71997752ad1..e261f54f582 100644
--- a/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -2,11 +2,12 @@
 
 let
   p = targetPlatform.platform.gcc or {};
+  float = p.float or (targetPlatform.parsed.abi.float or null);
 in lib.concatLists [
   (lib.optional (p ? arch) "--with-arch=${p.arch}")
   (lib.optional (p ? cpu) "--with-cpu=${p.cpu}")
   (lib.optional (p ? abi) "--with-abi=${p.abi}")
   (lib.optional (p ? fpu) "--with-fpu=${p.fpu}")
-  (lib.optional (p ? float) "--with-float=${p.float}")
+  (lib.optional (float != null) "--with-float=${float}")
   (lib.optional (p ? mode) "--with-mode=${p.mode}")
 ]
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 5179ce4a9a8..0e363fe4a25 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -127,7 +127,9 @@ stdenv.mkDerivation ({
     ] ++ lib.optionals withLinuxHeaders [
       "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
     ] ++ lib.optionals (cross != null) [
-      (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp")
+      (if cross.platform.gcc.float or (cross.parsed.abi.float or "hard") == "soft"
+       then "--without-fp"
+       else "--with-fp")
     ] ++ lib.optionals (cross != null) [
       "--with-__thread"
     ] ++ lib.optionals (cross == null && stdenv.isAarch32) [
-- 
GitLab


From e98814461d40c2907a46bbd7a81f8e0b7053019e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 17:42:48 -0400
Subject: [PATCH 0478/1085] glibc: Remove old-style nullable "cross" variable

Much better to just use {build,host}Platform directly.
---
 .../development/libraries/glibc/common-2.27.nix | 17 +++++++----------
 pkgs/development/libraries/glibc/common.nix     | 15 +++++----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix
index 272e18905c1..7d2cf7d14b7 100644
--- a/pkgs/development/libraries/glibc/common-2.27.nix
+++ b/pkgs/development/libraries/glibc/common-2.27.nix
@@ -23,7 +23,6 @@ let
   version = "2.27";
   patchSuffix = "";
   sha256 = "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji";
-  cross = if buildPlatform != hostPlatform then hostPlatform else null;
 in
 
 assert withLinuxHeaders -> linuxHeaders != null;
@@ -33,9 +32,6 @@ stdenv.mkDerivation ({
   inherit  installLocales;
   linuxHeaders = if withLinuxHeaders then linuxHeaders else null;
 
-  # The host/target system.
-  crossConfig = if cross != null then cross.config else null;
-
   inherit (stdenv) is64bit;
 
   enableParallelBuilding = true;
@@ -106,11 +102,12 @@ stdenv.mkDerivation ({
        else "--disable-profile")
     ] ++ lib.optionals withLinuxHeaders [
       "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
-    ] ++ lib.optionals (cross != null) [
-      (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp")
-    ] ++ lib.optionals (cross != null) [
+    ] ++ lib.optionals (hostPlatform != buildPlatform) [
+      (if hostPlatform.platform.gcc.float or (hostPlatform.parsed.abi.float or "hard") == "soft"
+       then "--without-fp"
+       else "--with-fp")
       "--with-__thread"
-    ] ++ lib.optionals (cross == null && stdenv.isAarch32) [
+    ] ++ lib.optionals (hostPlatform == buildPlatform && hostPlatform.isAarch32) [
       "--host=arm-linux-gnueabi"
       "--build=arm-linux-gnueabi"
 
@@ -162,7 +159,7 @@ stdenv.mkDerivation ({
     }
 
 
-  '' + lib.optionalString (cross != null) ''
+  '' + lib.optionalString (hostPlatform != buildPlatform) ''
     sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig"
 
     cat > config.cache << "EOF"
@@ -196,7 +193,7 @@ stdenv.mkDerivation ({
   passthru = { inherit version; };
 }
 
-// lib.optionalAttrs (cross != null) {
+// lib.optionalAttrs (hostPlatform != buildPlatform) {
   preInstall = null; # clobber the native hook
 
   dontStrip = true;
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 0e363fe4a25..a1c3a90162e 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -22,7 +22,6 @@ let
   version = "2.26";
   patchSuffix = "-131";
   sha256 = "1ggnj1hzjym7sn93rbwydcqd562q73lsb7g7kd199g6j9j9hlkp5";
-  cross = if buildPlatform != hostPlatform then hostPlatform else null;
 in
 
 assert withLinuxHeaders -> linuxHeaders != null;
@@ -32,9 +31,6 @@ stdenv.mkDerivation ({
   inherit  installLocales;
   linuxHeaders = if withLinuxHeaders then linuxHeaders else null;
 
-  # The host/target system.
-  crossConfig = if cross != null then cross.config else null;
-
   inherit (stdenv) is64bit;
 
   enableParallelBuilding = true;
@@ -126,13 +122,12 @@ stdenv.mkDerivation ({
        else "--disable-profile")
     ] ++ lib.optionals withLinuxHeaders [
       "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
-    ] ++ lib.optionals (cross != null) [
-      (if cross.platform.gcc.float or (cross.parsed.abi.float or "hard") == "soft"
+    ] ++ lib.optionals (hostPlatform != buildPlatform) [
+      (if hostPlatform.platform.gcc.float or (hostPlatform.parsed.abi.float or "hard") == "soft"
        then "--without-fp"
        else "--with-fp")
-    ] ++ lib.optionals (cross != null) [
       "--with-__thread"
-    ] ++ lib.optionals (cross == null && stdenv.isAarch32) [
+    ] ++ lib.optionals (hostPlatform == buildPlatform && hostPlatform.isAarch32) [
       "--host=arm-linux-gnueabi"
       "--build=arm-linux-gnueabi"
 
@@ -183,7 +178,7 @@ stdenv.mkDerivation ({
     }
 
 
-  '' + lib.optionalString (cross != null) ''
+  '' + lib.optionalString (hostPlatform != buildPlatform) ''
     sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig"
 
     cat > config.cache << "EOF"
@@ -215,7 +210,7 @@ stdenv.mkDerivation ({
   } // meta;
 }
 
-// lib.optionalAttrs (cross != null) {
+// lib.optionalAttrs (hostPlatform != buildPlatform) {
   preInstall = null; # clobber the native hook
 
   dontStrip = true;
-- 
GitLab


From 50efa1979d86a852bbc713f624ca9897fd22e65d Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 11 May 2018 00:47:43 +0200
Subject: [PATCH 0479/1085] nixos/release-combined.nix: fix eval of tested job

bug introduced by f8d047da50dbc7d012a8d322b4d5e5a0b639733c
---
 nixos/release-combined.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index deb28835968..989764874c4 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -115,7 +115,10 @@ in rec {
         (all nixos.tests.nfs4)
         (all nixos.tests.openssh)
         (all nixos.tests.php-pcre)
-        (all nixos.tests.predictable-interface-names)
+        (all nixos.tests.predictable-interface-names.predictable)
+        (all nixos.tests.predictable-interface-names.unpredictable)
+        (all nixos.tests.predictable-interface-names.predictableNetworkd)
+        (all nixos.tests.predictable-interface-names.unpredictableNetworkd)
         (all nixos.tests.printing)
         (all nixos.tests.proxy)
         (all nixos.tests.sddm.default)
-- 
GitLab


From 97dde3ca009caeb5283235d16d4b7ebd59972ce3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 18:08:03 -0700
Subject: [PATCH 0480/1085] python27Packages.youtube-dl: 2018.05.01 ->
 2018.05.09
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09/bin/.youtube-dl-wrapped -h’ got 0 exit code
- ran ‘/nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09/bin/.youtube-dl-wrapped --help’ got 0 exit code
- ran ‘/nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09/bin/.youtube-dl-wrapped --version’ and found version 2018.05.09
- ran ‘/nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09/bin/youtube-dl -h’ got 0 exit code
- ran ‘/nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09/bin/youtube-dl --help’ got 0 exit code
- ran ‘/nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09/bin/youtube-dl --version’ and found version 2018.05.09
- found 2018.05.09 with grep in /nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09
- directory tree listing: https://gist.github.com/e65e7afdbb0bcdbcf461cd2a77c6ad50
---
 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 d2e490373da..19173de41e5 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   pname = "youtube-dl";
-  version = "2018.05.01";
+  version = "2018.05.09";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1mpyqdyjip5a6nn8lj1kaaab4pj75js6i8qzgap8bmn0k46awb1n";
+    sha256 = "0sl4bi2jls3417rd62awbqdq1b6wskkjbfwpnyw4a61qarfxid1d";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 8408c36da9e12067544df981c0f1481865f5525e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 10 May 2018 22:26:47 -0300
Subject: [PATCH 0481/1085] enlightenment: remove bashism from patch

---
 pkgs/desktops/enlightenment/enlightenment.suid-exes.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch b/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch
index 7a89309c89f..f53f6ffa7ca 100644
--- a/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch
+++ b/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch
@@ -14,9 +14,9 @@
  for x in "$@" ; do
 -	chown root "$DESTDIR/$x"
 -	chmod a=rx,u+xs "$DESTDIR/$x"
-+	f="$DESTDIR/$x";
++	f="$DESTDIR$x";
 +	b=$(basename "$f".orig)
-+	mv -v "$f"{,.orig}
++	mv -v "$f" "$f".orig
 +	ln -sv /run/wrappers/bin/"$b" "$f"
 +	echo "    \"$b\".source = \"$f.orig\";" >> $w
  done
-- 
GitLab


From 4baafa9c16c856cf2a8a00e05f9909113e311f83 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Thu, 10 May 2018 23:38:22 +0200
Subject: [PATCH 0482/1085] backup (gem) : remove

It is not working since 18.03 and nobody than me seems to use it, because I couldn't find a package.
Also I'm not willing to continue maintaining this package.
---
 pkgs/tools/backup/backup/Gemfile      |  23 -
 pkgs/tools/backup/backup/Gemfile.lock | 276 ---------
 pkgs/tools/backup/backup/default.nix  |  19 -
 pkgs/tools/backup/backup/gemset.nix   | 778 --------------------------
 pkgs/top-level/all-packages.nix       |   2 -
 5 files changed, 1098 deletions(-)
 delete mode 100644 pkgs/tools/backup/backup/Gemfile
 delete mode 100644 pkgs/tools/backup/backup/Gemfile.lock
 delete mode 100644 pkgs/tools/backup/backup/default.nix
 delete mode 100644 pkgs/tools/backup/backup/gemset.nix

diff --git a/pkgs/tools/backup/backup/Gemfile b/pkgs/tools/backup/backup/Gemfile
deleted file mode 100644
index 2f1825b590e..00000000000
--- a/pkgs/tools/backup/backup/Gemfile
+++ /dev/null
@@ -1,23 +0,0 @@
-source "https://rubygems.org"
-
-gem 'backup'
-gem 'thor'
-gem 'open4'
-gem 'fog'
-gem 'unf' 
-gem 'dropbox-sdk', '= 1.5.1' # patched
-gem 'net-ssh'
-gem 'net-scp'
-gem 'net-sftp'
-gem 'mail', '= 2.5.4' # patched
-gem 'pagerduty'
-gem 'twitter'
-gem 'hipchat'
-gem 'flowdock'
-gem 'json'
-gem 'dogapi'
-gem 'aws-ses'
-gem 'rspec'
-gem 'fuubar'
-gem 'mocha'
-gem 'timecop'
diff --git a/pkgs/tools/backup/backup/Gemfile.lock b/pkgs/tools/backup/backup/Gemfile.lock
deleted file mode 100644
index 0725ded8add..00000000000
--- a/pkgs/tools/backup/backup/Gemfile.lock
+++ /dev/null
@@ -1,276 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (2.3.1)
-    addressable (2.3.5)
-    atomic (1.1.14)
-    aws-ses (0.5.0)
-      builder
-      mail (> 2.2.5)
-      mime-types
-      xml-simple
-    backup (4.2.2)
-      CFPropertyList (= 2.3.1)
-      addressable (= 2.3.5)
-      atomic (= 1.1.14)
-      aws-ses (= 0.5.0)
-      buftok (= 0.2.0)
-      builder (= 3.2.2)
-      descendants_tracker (= 0.0.3)
-      dogapi (= 1.11.0)
-      dropbox-sdk (= 1.5.1)
-      equalizer (= 0.0.9)
-      excon (= 0.44.4)
-      faraday (= 0.8.8)
-      fission (= 0.5.0)
-      flowdock (= 0.4.0)
-      fog (= 1.28.0)
-      fog-atmos (= 0.1.0)
-      fog-aws (= 0.1.1)
-      fog-brightbox (= 0.7.1)
-      fog-core (= 1.29.0)
-      fog-ecloud (= 0.0.2)
-      fog-json (= 1.0.0)
-      fog-profitbricks (= 0.0.2)
-      fog-radosgw (= 0.0.3)
-      fog-riakcs (= 0.1.0)
-      fog-sakuracloud (= 1.0.0)
-      fog-serverlove (= 0.1.1)
-      fog-softlayer (= 0.4.1)
-      fog-storm_on_demand (= 0.1.0)
-      fog-terremark (= 0.0.4)
-      fog-vmfusion (= 0.0.1)
-      fog-voxel (= 0.0.2)
-      fog-xml (= 0.1.1)
-      formatador (= 0.2.5)
-      hipchat (= 1.0.1)
-      http (= 0.5.0)
-      http_parser.rb (= 0.6.0)
-      httparty (= 0.12.0)
-      inflecto (= 0.0.2)
-      ipaddress (= 0.8.0)
-      json (= 1.8.2)
-      mail (= 2.5.4)
-      memoizable (= 0.4.0)
-      mime-types (= 1.25.1)
-      mini_portile (= 0.6.2)
-      multi_json (= 1.10.1)
-      multi_xml (= 0.5.5)
-      multipart-post (= 1.2.0)
-      net-scp (= 1.2.1)
-      net-sftp (= 2.1.2)
-      net-ssh (= 2.9.2)
-      nokogiri (= 1.6.6.2)
-      open4 (= 1.3.0)
-      pagerduty (= 2.0.0)
-      polyglot (= 0.3.3)
-      simple_oauth (= 0.2.0)
-      thor (= 0.18.1)
-      thread_safe (= 0.1.3)
-      treetop (= 1.4.15)
-      twitter (= 5.5.0)
-      unf (= 0.1.3)
-      unf_ext (= 0.0.6)
-      xml-simple (= 1.1.4)
-    buftok (0.2.0)
-    builder (3.2.2)
-    descendants_tracker (0.0.3)
-    diff-lcs (1.2.5)
-    dogapi (1.11.0)
-      json (>= 1.5.1)
-    dropbox-sdk (1.5.1)
-      json
-    equalizer (0.0.9)
-    excon (0.44.4)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    flowdock (0.4.0)
-      httparty (~> 0.7)
-      multi_json
-    fog (1.28.0)
-      fog-atmos
-      fog-aws (~> 0.0)
-      fog-brightbox (~> 0.4)
-      fog-core (~> 1.27, >= 1.27.3)
-      fog-ecloud
-      fog-json
-      fog-profitbricks
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
-    fog-aws (0.1.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-brightbox (0.7.1)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-core (1.29.0)
-      builder
-      excon (~> 0.38)
-      formatador (~> 0.2)
-      mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-    fog-ecloud (0.0.2)
-      fog-core
-      fog-xml
-    fog-json (1.0.0)
-      multi_json (~> 1.0)
-    fog-profitbricks (0.0.2)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-radosgw (0.0.3)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.0.0)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.1)
-      fog-core
-      fog-json
-    fog-softlayer (0.4.1)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.0)
-      fog-core
-      fog-json
-    fog-terremark (0.0.4)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.0.1)
-      fission
-      fog-core
-    fog-voxel (0.0.2)
-      fog-core
-      fog-xml
-    fog-xml (0.1.1)
-      fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
-    formatador (0.2.5)
-    fuubar (2.0.0)
-      rspec (~> 3.0)
-      ruby-progressbar (~> 1.4)
-    hipchat (1.0.1)
-      httparty
-    http (0.5.0)
-      http_parser.rb
-    http_parser.rb (0.6.0)
-    httparty (0.12.0)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
-    inflecto (0.0.2)
-    ipaddress (0.8.0)
-    json (1.8.2)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    memoizable (0.4.0)
-      thread_safe (~> 0.1.3)
-    metaclass (0.0.4)
-    mime-types (1.25.1)
-    mini_portile (0.6.2)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    open4 (1.3.0)
-    pagerduty (2.0.0)
-      json (>= 1.7.7)
-    polyglot (0.3.3)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    ruby-progressbar (1.7.5)
-    simple_oauth (0.2.0)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    timecop (0.8.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    twitter (5.5.0)
-      addressable (~> 2.3)
-      buftok (~> 0.2.0)
-      descendants_tracker (~> 0.0.3)
-      equalizer (~> 0.0.9)
-      faraday (>= 0.8, < 0.10)
-      http (~> 0.5.0)
-      http_parser.rb (~> 0.6.0)
-      json (~> 1.8)
-      memoizable (~> 0.4.0)
-      simple_oauth (~> 0.2.0)
-    unf (0.1.3)
-      unf_ext
-    unf_ext (0.0.6)
-    xml-simple (1.1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aws-ses
-  backup
-  dogapi
-  dropbox-sdk (= 1.5.1)
-  flowdock
-  fog
-  fuubar
-  hipchat
-  json
-  mail (= 2.5.4)
-  mocha
-  net-scp
-  net-sftp
-  net-ssh
-  open4
-  pagerduty
-  rspec
-  thor
-  timecop
-  twitter
-  unf
-
-BUNDLED WITH
-   1.10.6
diff --git a/pkgs/tools/backup/backup/default.nix b/pkgs/tools/backup/backup/default.nix
deleted file mode 100644
index 23affbb8af6..00000000000
--- a/pkgs/tools/backup/backup/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, lib, bundlerEnv, ruby, curl }:
-
-bundlerEnv {
-  name = "backup_v4";
-
-  inherit ruby;
-  gemdir = ./.;
-
-  buildInputs = [ curl ];
-
-  meta = with lib; {
-    broken = true; # need ruby 2.1
-    description = "Easy full stack backup operations on UNIX-like systems";
-    homepage    = http://backup.github.io/backup/v4/;
-    license     = licenses.mit;
-    maintainers = [ maintainers.mrVanDalo ];
-    platforms   = platforms.unix;
-  };
-}
diff --git a/pkgs/tools/backup/backup/gemset.nix b/pkgs/tools/backup/backup/gemset.nix
deleted file mode 100644
index e2de995996e..00000000000
--- a/pkgs/tools/backup/backup/gemset.nix
+++ /dev/null
@@ -1,778 +0,0 @@
-{
-  "CFPropertyList" = {
-    version = "2.3.1";
-    source = {
-      type = "gem";
-      sha256 = "1wnk3gxnhfafbhgp0ic7qhzlx3lhv04v8nws2s31ii5s8135hs6k";
-    };
-  };
-  "addressable" = {
-    version = "2.3.5";
-    source = {
-      type = "gem";
-      sha256 = "11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7";
-    };
-  };
-  "atomic" = {
-    version = "1.1.14";
-    source = {
-      type = "gem";
-      sha256 = "09dzi1gxr5yj273s6s6ss7l2sq4ayavpg95561kib3n4kzvxrhk4";
-    };
-  };
-  "aws-ses" = {
-    version = "0.5.0";
-    source = {
-      type = "gem";
-      sha256 = "1kpfcdnakngypgkzn1f8cl8p4jg1rvmx3ag4ggcl0c7gs91ki8k3";
-    };
-    dependencies = [
-      "builder"
-      "mail"
-      "mime-types"
-      "xml-simple"
-    ];
-  };
-  "backup" = {
-    version = "4.2.2";
-    source = {
-      type = "gem";
-      sha256 = "0fj5jq6s1kpgp4bl1sr7qw1dgyc9zk0afh6mrfgbscg82irfxi1p";
-    };
-    dependencies = [
-      "CFPropertyList"
-      "addressable"
-      "atomic"
-      "aws-ses"
-      "buftok"
-      "builder"
-      "descendants_tracker"
-      "dogapi"
-      "dropbox-sdk"
-      "equalizer"
-      "excon"
-      "faraday"
-      "fission"
-      "flowdock"
-      "fog"
-      "fog-atmos"
-      "fog-aws"
-      "fog-brightbox"
-      "fog-core"
-      "fog-ecloud"
-      "fog-json"
-      "fog-profitbricks"
-      "fog-radosgw"
-      "fog-riakcs"
-      "fog-sakuracloud"
-      "fog-serverlove"
-      "fog-softlayer"
-      "fog-storm_on_demand"
-      "fog-terremark"
-      "fog-vmfusion"
-      "fog-voxel"
-      "fog-xml"
-      "formatador"
-      "hipchat"
-      "http"
-      "http_parser.rb"
-      "httparty"
-      "inflecto"
-      "ipaddress"
-      "json"
-      "mail"
-      "memoizable"
-      "mime-types"
-      "mini_portile"
-      "multi_json"
-      "multi_xml"
-      "multipart-post"
-      "net-scp"
-      "net-sftp"
-      "net-ssh"
-      "nokogiri"
-      "open4"
-      "pagerduty"
-      "polyglot"
-      "simple_oauth"
-      "thor"
-      "thread_safe"
-      "treetop"
-      "twitter"
-      "unf"
-      "unf_ext"
-      "xml-simple"
-    ];
-  };
-  "buftok" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs";
-    };
-  };
-  "builder" = {
-    version = "3.2.2";
-    source = {
-      type = "gem";
-      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
-    };
-  };
-  "descendants_tracker" = {
-    version = "0.0.3";
-    source = {
-      type = "gem";
-      sha256 = "0819j80k85j62qjg90v8z8s3h4nf3v6afxxz73hl6iqxr2dhgmq1";
-    };
-  };
-  "diff-lcs" = {
-    version = "1.2.5";
-    source = {
-      type = "gem";
-      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
-    };
-  };
-  "dogapi" = {
-    version = "1.11.0";
-    source = {
-      type = "gem";
-      sha256 = "01v5jphxbqdn8h0pifgl97igcincd1pjwd177a80ig9fpwndd19d";
-    };
-    dependencies = [
-      "json"
-    ];
-  };
-  "dropbox-sdk" = {
-    version = "1.5.1";
-    source = {
-      type = "gem";
-      sha256 = "1zrzxzjfgwkdnn5vjvkhhjh10azyy28982hpkw5xv0kwrqg07axj";
-    };
-    dependencies = [
-      "json"
-    ];
-  };
-  "equalizer" = {
-    version = "0.0.9";
-    source = {
-      type = "gem";
-      sha256 = "1i6vfh2lzyrvvm35qa9cf3xh2gxj941x0v78pp0c7bwji3f5hawr";
-    };
-  };
-  "excon" = {
-    version = "0.44.4";
-    source = {
-      type = "gem";
-      sha256 = "062ynrdazix4w1lz6n8qgm3dasi2837sfn88ma96pbp4sk11gbp5";
-    };
-  };
-  "faraday" = {
-    version = "0.8.8";
-    source = {
-      type = "gem";
-      sha256 = "1cnyj5japrnv6wvl01la5amf7hikckfznh8234ad21n730b2wci4";
-    };
-    dependencies = [
-      "multipart-post"
-    ];
-  };
-  "fission" = {
-    version = "0.5.0";
-    source = {
-      type = "gem";
-      sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh";
-    };
-    dependencies = [
-      "CFPropertyList"
-    ];
-  };
-  "flowdock" = {
-    version = "0.4.0";
-    source = {
-      type = "gem";
-      sha256 = "1myza5n6wqk550ky3ld4np89cd491prndqy0l1fqsddxpap6pp60";
-    };
-    dependencies = [
-      "httparty"
-      "multi_json"
-    ];
-  };
-  "fog" = {
-    version = "1.28.0";
-    source = {
-      type = "gem";
-      sha256 = "12b03r77vdicbsc7j6by2gysm16wij32z65qp6bkrxkfba9yb37h";
-    };
-    dependencies = [
-      "fog-atmos"
-      "fog-aws"
-      "fog-brightbox"
-      "fog-core"
-      "fog-ecloud"
-      "fog-json"
-      "fog-profitbricks"
-      "fog-radosgw"
-      "fog-riakcs"
-      "fog-sakuracloud"
-      "fog-serverlove"
-      "fog-softlayer"
-      "fog-storm_on_demand"
-      "fog-terremark"
-      "fog-vmfusion"
-      "fog-voxel"
-      "fog-xml"
-      "ipaddress"
-      "nokogiri"
-    ];
-  };
-  "fog-atmos" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
-  };
-  "fog-aws" = {
-    version = "0.1.1";
-    source = {
-      type = "gem";
-      sha256 = "17a3sspf81bgvkrrrmwx7aci7fjy1m7b3w61ljc2mpqbafz80v7i";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "fog-xml"
-      "ipaddress"
-    ];
-  };
-  "fog-brightbox" = {
-    version = "0.7.1";
-    source = {
-      type = "gem";
-      sha256 = "1cpa92q2ls51gidxzn407x53f010k0hmrl94ipw7rdzdapp8c4cn";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "inflecto"
-    ];
-  };
-  "fog-core" = {
-    version = "1.29.0";
-    source = {
-      type = "gem";
-      sha256 = "0ayv9j3i7jy2d1l4gw6sfchgb8l62590a6fpvpr7qvdjc79mvm3p";
-    };
-    dependencies = [
-      "builder"
-      "excon"
-      "formatador"
-      "mime-types"
-      "net-scp"
-      "net-ssh"
-    ];
-  };
-  "fog-ecloud" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0lhxjp6gi48zanqmkblyhxjp0lknl1akifgfk5lq3j3vj2d3pnr8";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
-  };
-  "fog-json" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "1517sm8bl0bmaw2fbaf5ra6midq3wzgkpm55lb9rw6jm5ys23lyw";
-    };
-    dependencies = [
-      "multi_json"
-    ];
-  };
-  "fog-profitbricks" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0hk290cw99qx727sxfhxlmczv9kv15hlnrflh00wfprqxk4r8rd4";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-      "nokogiri"
-    ];
-  };
-  "fog-radosgw" = {
-    version = "0.0.3";
-    source = {
-      type = "gem";
-      sha256 = "1fbpi0sfff5f5hrn4f7ish260cykzcqvzwmvm61i6mprfrfnx10r";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "fog-xml"
-    ];
-  };
-  "fog-riakcs" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "fog-xml"
-    ];
-  };
-  "fog-sakuracloud" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "1805m44x2pclhjyvdrpj6zg8l9dldgnc20h0g61r7hqxpydz066x";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-serverlove" = {
-    version = "0.1.1";
-    source = {
-      type = "gem";
-      sha256 = "094plkkr6xiss8k85fp66g7z544kxgfx1ck0f3sqndk27miw26jk";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-softlayer" = {
-    version = "0.4.1";
-    source = {
-      type = "gem";
-      sha256 = "1cf6y6xxjjpjglz31kf6jmmyh687x7sxhn4bx3hlr1nb1hcy19sq";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-storm_on_demand" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "0rrfv37x9y07lvdd03pbappb8ybvqb6g8rxzwvgy3mmbmbc6l6d2";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-terremark" = {
-    version = "0.0.4";
-    source = {
-      type = "gem";
-      sha256 = "0bxznlc904zaw3qaxhkvhqqbrv9n6nf5idih8ra9dihvacifwhvc";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
-  };
-  "fog-vmfusion" = {
-    version = "0.0.1";
-    source = {
-      type = "gem";
-      sha256 = "0x1vxc4a627g7ambcprhxiqvywy64li90145r96b2ig9z23hmy7g";
-    };
-    dependencies = [
-      "fission"
-      "fog-core"
-    ];
-  };
-  "fog-voxel" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0by7cs0c044b8dkcmcf3pjzydnrakj8pnbcxzhw8hwlgqr0jfqgn";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
-  };
-  "fog-xml" = {
-    version = "0.1.1";
-    source = {
-      type = "gem";
-      sha256 = "0kgxjwz0mzyp7bgj1ycl9jyfmzfqc1fjdz9sm57fgj5w31jfvxw5";
-    };
-    dependencies = [
-      "fog-core"
-      "nokogiri"
-    ];
-  };
-  "formatador" = {
-    version = "0.2.5";
-    source = {
-      type = "gem";
-      sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
-    };
-  };
-  "fuubar" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0xwqs24y8s73aayh39si17kccsmr0bjgmi6jrjyfp7gkjb6iyhpv";
-    };
-    dependencies = [
-      "rspec"
-      "ruby-progressbar"
-    ];
-  };
-  "hipchat" = {
-    version = "1.0.1";
-    source = {
-      type = "gem";
-      sha256 = "1khcb6cxrr1qn104rl87wq85anigykf45x7knxnyqfpwnbda2nh1";
-    };
-    dependencies = [
-      "httparty"
-    ];
-  };
-  "http" = {
-    version = "0.5.0";
-    source = {
-      type = "gem";
-      sha256 = "1vw10xxs0i7kn90lx3b2clfkm43nb59jjph902bafpsaarqsai8d";
-    };
-    dependencies = [
-      "http_parser.rb"
-    ];
-  };
-  "http_parser.rb" = {
-    version = "0.6.0";
-    source = {
-      type = "gem";
-      sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
-    };
-  };
-  "httparty" = {
-    version = "0.12.0";
-    source = {
-      type = "gem";
-      sha256 = "10y3znh7s1fx88lbnbsmyx5zri6jr1gi48zzzq89wir8q9zlp28c";
-    };
-    dependencies = [
-      "json"
-      "multi_xml"
-    ];
-  };
-  "inflecto" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4";
-    };
-  };
-  "ipaddress" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir";
-    };
-  };
-  "json" = {
-    version = "1.8.2";
-    source = {
-      type = "gem";
-      sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5";
-    };
-  };
-  "mail" = {
-    version = "2.5.4";
-    source = {
-      type = "gem";
-      sha256 = "0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4";
-    };
-    dependencies = [
-      "mime-types"
-      "treetop"
-    ];
-  };
-  "memoizable" = {
-    version = "0.4.0";
-    source = {
-      type = "gem";
-      sha256 = "0xhg8c9qw4y35qp1k8kv20snnxk6rlyilx354n1d72r0y10s7qcr";
-    };
-    dependencies = [
-      "thread_safe"
-    ];
-  };
-  "metaclass" = {
-    version = "0.0.4";
-    source = {
-      type = "gem";
-      sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5";
-    };
-  };
-  "mime-types" = {
-    version = "1.25.1";
-    source = {
-      type = "gem";
-      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
-    };
-  };
-  "mini_portile" = {
-    version = "0.6.2";
-    source = {
-      type = "gem";
-      sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w";
-    };
-  };
-  "mocha" = {
-    version = "1.1.0";
-    source = {
-      type = "gem";
-      sha256 = "107nmnngbv8lq2g7hbjpn5kplb4v2c8gs9lxrg6vs8gdbddkilzi";
-    };
-    dependencies = [
-      "metaclass"
-    ];
-  };
-  "multi_json" = {
-    version = "1.10.1";
-    source = {
-      type = "gem";
-      sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c";
-    };
-  };
-  "multi_xml" = {
-    version = "0.5.5";
-    source = {
-      type = "gem";
-      sha256 = "0i8r7dsz4z79z3j023l8swan7qpbgxbwwz11g38y2vjqjk16v4q8";
-    };
-  };
-  "multipart-post" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc";
-    };
-  };
-  "net-scp" = {
-    version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
-    };
-    dependencies = [
-      "net-ssh"
-    ];
-  };
-  "net-sftp" = {
-    version = "2.1.2";
-    source = {
-      type = "gem";
-      sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y";
-    };
-    dependencies = [
-      "net-ssh"
-    ];
-  };
-  "net-ssh" = {
-    version = "2.9.2";
-    source = {
-      type = "gem";
-      sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r";
-    };
-  };
-  "nokogiri" = {
-    version = "1.6.6.2";
-    source = {
-      type = "gem";
-      sha256 = "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30";
-    };
-    dependencies = [
-      "mini_portile"
-    ];
-  };
-  "open4" = {
-    version = "1.3.0";
-    source = {
-      type = "gem";
-      sha256 = "12jyp97p7pq29q1zmkdrhzvg5cg2x3hlfdbq6asnb9nqlkx6vhf2";
-    };
-  };
-  "pagerduty" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "1ads8bj2swm3gbhr6193ls83pnwsy39xyh3i8sw6rl8fxfdf717v";
-    };
-    dependencies = [
-      "json"
-    ];
-  };
-  "polyglot" = {
-    version = "0.3.3";
-    source = {
-      type = "gem";
-      sha256 = "082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v";
-    };
-  };
-  "rspec" = {
-    version = "3.4.0";
-    source = {
-      type = "gem";
-      sha256 = "12axhz2nj2m0dy350lxym76m36m1hq48hc59mf00z9dajbpnj78s";
-    };
-    dependencies = [
-      "rspec-core"
-      "rspec-expectations"
-      "rspec-mocks"
-    ];
-  };
-  "rspec-core" = {
-    version = "3.4.1";
-    source = {
-      type = "gem";
-      sha256 = "0zl4fbrzl4gg2bn3fhv910q04sm2jvzdidmvd71gdgqwbzk0zngn";
-    };
-    dependencies = [
-      "rspec-support"
-    ];
-  };
-  "rspec-expectations" = {
-    version = "3.4.0";
-    source = {
-      type = "gem";
-      sha256 = "07pz570glwg87zpyagxxal0daa1jrnjkiksnn410s6846884fk8h";
-    };
-    dependencies = [
-      "diff-lcs"
-      "rspec-support"
-    ];
-  };
-  "rspec-mocks" = {
-    version = "3.4.0";
-    source = {
-      type = "gem";
-      sha256 = "0iw9qvpawj3cfcg3xipi1v4y11g9q4f5lvmzgksn6f0chf97sjy1";
-    };
-    dependencies = [
-      "diff-lcs"
-      "rspec-support"
-    ];
-  };
-  "rspec-support" = {
-    version = "3.4.1";
-    source = {
-      type = "gem";
-      sha256 = "0l6zzlf22hn3pcwnxswsjsiwhqjg7a8mhvm680k5vq98307bkikr";
-    };
-  };
-  "ruby-progressbar" = {
-    version = "1.7.5";
-    source = {
-      type = "gem";
-      sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi";
-    };
-  };
-  "simple_oauth" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1vsjhxybif9r53jx4dhhwf80qjkg7gbwpfmskjqns223qrhwsxig";
-    };
-  };
-  "thor" = {
-    version = "0.18.1";
-    source = {
-      type = "gem";
-      sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3";
-    };
-  };
-  "thread_safe" = {
-    version = "0.1.3";
-    source = {
-      type = "gem";
-      sha256 = "0f2w62x5nx95d2c2lrn9v4g60xhykf8zw7jaddkrgal913dzifgq";
-    };
-    dependencies = [
-      "atomic"
-    ];
-  };
-  "timecop" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "0zf46hkd36y2ywysjfgkvpcc5v04s2rwlg2k7k8j23bh7k8sgiqs";
-    };
-  };
-  "treetop" = {
-    version = "1.4.15";
-    source = {
-      type = "gem";
-      sha256 = "1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz";
-    };
-    dependencies = [
-      "polyglot"
-      "polyglot"
-    ];
-  };
-  "twitter" = {
-    version = "5.5.0";
-    source = {
-      type = "gem";
-      sha256 = "0yl1im3s4svl4hxxsyc60mm7cxvwz538amc9y0vzw6lkiii5f197";
-    };
-    dependencies = [
-      "addressable"
-      "buftok"
-      "descendants_tracker"
-      "equalizer"
-      "faraday"
-      "http"
-      "http_parser.rb"
-      "json"
-      "memoizable"
-      "simple_oauth"
-    ];
-  };
-  "unf" = {
-    version = "0.1.3";
-    source = {
-      type = "gem";
-      sha256 = "1f2q8mxxngg8q608r6xajpharp9zz1ia3336y1lsg1asn2ach2sm";
-    };
-    dependencies = [
-      "unf_ext"
-    ];
-  };
-  "unf_ext" = {
-    version = "0.0.6";
-    source = {
-      type = "gem";
-      sha256 = "07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg";
-    };
-  };
-  "xml-simple" = {
-    version = "1.1.4";
-    source = {
-      type = "gem";
-      sha256 = "0x5c3mqhahh8hzqqq41659bxj0wn3n6bhj5p6b4hsia2k4akzg6s";
-    };
-  };
-}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e445747be1..d651b251e68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -774,8 +774,6 @@ with pkgs;
 
   backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { };
 
-  backup = callPackage ../tools/backup/backup { };
-
   bar = callPackage ../tools/system/bar {};
 
   base16-builder = callPackage ../misc/base16-builder { };
-- 
GitLab


From eb2ba8ac0d86fbbc35ad2a4b3cd840318cb11533 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 10 May 2018 09:52:22 +0900
Subject: [PATCH 0483/1085] pythonPackages.configobj: enable tests

I found a bug in configobj and wanted to run the testsuite to confirm it
was a bugs rather than a nixos oddity. Now that tests work let's upstream it.
---
 .../python-modules/configobj/default.nix      | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix
index 98631b6920b..dd2b26e0f59 100644
--- a/pkgs/development/python-modules/configobj/default.nix
+++ b/pkgs/development/python-modules/configobj/default.nix
@@ -1,19 +1,30 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
+{ stdenv, buildPythonPackage
+, fetchFromGitHub
+, six
+, mock, pytest
+}:
 
 buildPythonPackage rec {
   pname = "configobj";
   version = "5.0.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "00h9rcmws03xvdlfni11yb60bz3kxfvsj6dg6nrpzj71f03nbxd2";
+  # Pypi archives don't contain the tests
+  src = fetchFromGitHub {
+    owner = "DiffSK";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0x97794nk3dfn0i3si9fv7y19jnpnarb34bkdwlz7ii7ag6xihhw";
   };
 
-  # error: invalid command 'test'
-  doCheck = false;
 
   propagatedBuildInputs = [ six ];
 
+  checkPhase = ''
+    pytest --deselect=tests/test_configobj.py::test_options_deprecation
+  '';
+
+  checkInputs = [ mock pytest ];
+
   meta = with stdenv.lib; {
     description = "Config file reading, writing and validation";
     homepage = https://pypi.python.org/pypi/configobj;
-- 
GitLab


From 215dcb728547a8693fa458e3b554a458cce301e9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Oct 2017 15:40:26 +0200
Subject: [PATCH 0484/1085] flatpak: init at 0.11.7

---
 .../development/libraries/flatpak/default.nix | 74 +++++++++++++++++++
 .../libraries/flatpak/fix-test-paths.patch    | 46 ++++++++++++
 .../respect-xml-catalog-files-var.patch       | 13 ++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 135 insertions(+)
 create mode 100644 pkgs/development/libraries/flatpak/default.nix
 create mode 100644 pkgs/development/libraries/flatpak/fix-test-paths.patch
 create mode 100644 pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
new file mode 100644
index 00000000000..f26dad3ce15
--- /dev/null
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
+, gobjectIntrospection, gtk_doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc
+, bubblewrap, bzip2, dbus, glib, gpgme, json_glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
+, libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }:
+
+let
+  version = "0.11.7";
+  desktop_schemas = gnome3.gsettings_desktop_schemas;
+in stdenv.mkDerivation rec {
+  name = "flatpak-${version}";
+
+  outputs = [ "out" "man" "doc" "installedTests" ];
+
+  src = fetchurl {
+    url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz";
+    sha256 = "1vq4j7v68lp4fsvpas1bcsx1z4snpj0mkbq2mi00kx3jb48z768h";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./fix-test-paths.patch;
+      inherit coreutils python2 glibcLocales;
+      hicolorIconTheme = hicolor-icon-theme;
+    })
+    # patch taken from gtk_doc
+    ./respect-xml-catalog-files-var.patch
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection
+    gtk_doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
+  ] ++ stdenv.lib.optionals doCheck checkInputs;
+
+  buildInputs = [
+    bubblewrap bzip2 dbus glib gpgme json_glib libarchive libcap libseccomp
+    libsoup lzma ostree polkit python3 systemd xlibs.libXau
+  ];
+
+  checkInputs = [ valgrind ];
+
+  doCheck = false; # TODO: some issues with temporary files
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--with-system-bubblewrap=${bubblewrap}/bin/bwrap"
+    "--localstatedir=/var"
+    "--enable-installed-tests"
+  ];
+
+  makeFlags = [
+    "installed_testdir=$(installedTests)/libexec/installed-tests/flatpak"
+    "installed_test_metadir=$(installedTests)/share/installed-tests/flatpak"
+  ];
+
+  postPatch = ''
+    patchShebangs buildutil
+    patchShebangs tests
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/flatpak \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
+      --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Linux application sandboxing and distribution framework";
+    homepage = https://flatpak.org/;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch
new file mode 100644
index 00000000000..e0734009420
--- /dev/null
+++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch
@@ -0,0 +1,46 @@
+--- a/tests/libtest.sh
++++ b/tests/libtest.sh
+@@ -322,7 +322,7 @@
+         # running installed-tests: assume we know what we're doing
+         :
+     elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
+-            --ro-bind / / /bin/true > bwrap-result 2>&1; then
++            --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then
+         sed -e 's/^/# /' < bwrap-result
+         echo "1..0 # SKIP Cannot run bwrap"
+         exit 0
+@@ -330,7 +330,7 @@
+ }
+ 
+ skip_without_python2 () {
+-    if ! test -f /usr/bin/python2 || ! /usr/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
++    if ! test -f @python2@/bin/python2 || ! @python2@/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
+         echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support"
+         exit 0
+     fi
+@@ -350,12 +350,12 @@
+ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
+ DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
+ 
+-if ! /bin/kill -0 "$DBUS_SESSION_BUS_PID"; then
++if ! @coreutils@/bin/kill -0 "$DBUS_SESSION_BUS_PID"; then
+     assert_not_reached "Failed to start dbus-daemon"
+ fi
+ 
+ cleanup () {
+-    /bin/kill $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-}
++    @coreutils@/bin/kill $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-}
+     gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true
+     fusermount -u $XDG_RUNTIME_DIR/doc || :
+     if test -n "${TEST_SKIP_CLEANUP:-}"; then
+--- a/tests/testlibrary.c
++++ b/tests/testlibrary.c
+@@ -378,7 +378,7 @@
+     {
+       gint exit_code = 0;
+       char *argv[] = { (char *)bwrap, "--unshare-ipc", "--unshare-net",
+-          "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL };
++          "--unshare-pid", "--ro-bind", "/", "/", "@coreutils@/bin/true", NULL };
+       g_autofree char *argv_str = g_strjoinv (" ", argv);
+       g_test_message ("Spawning %s", argv_str);
+       g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error);
diff --git a/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch b/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch
new file mode 100644
index 00000000000..0e259aebd8a
--- /dev/null
+++ b/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch
@@ -0,0 +1,13 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -40,8 +40,8 @@
+ [
+   AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+   AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+-  if $jh_found_xmlcatalog && \
+-     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
++  # empty argument forces libxml to use XML_CATALOG_FILES variable
++  if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
+     AC_MSG_RESULT([found])
+     ifelse([$3],,,[$3
+ ])dnl
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6759098dfa..cd2f4482922 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2297,6 +2297,8 @@ with pkgs;
 
   flashbench = callPackage ../os-specific/linux/flashbench { };
 
+  flatpak = callPackage ../development/libraries/flatpak { };
+
   figlet = callPackage ../tools/misc/figlet { };
 
   file = callPackage ../tools/misc/file { };
-- 
GitLab


From fe54e14cefbd88c939e07735f61f8dc9fd054a1e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 01:19:20 +0200
Subject: [PATCH 0485/1085] xdg-desktop-portal: init at 0.11

---
 .../libraries/xdg-desktop-portal/default.nix  | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/xdg-desktop-portal/default.nix

diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
new file mode 100644
index 00000000000..6721d5f00ac
--- /dev/null
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }:
+
+let
+  version = "0.11";
+in stdenv.mkDerivation rec {
+  name = "xdg-desktop-portal-${version}";
+
+  outputs = [ "out" "installedTests" ];
+
+  src = fetchFromGitHub {
+    owner = "flatpak";
+    repo = "xdg-desktop-portal";
+    rev = version;
+    sha256 = "06gipd51snvlp2jp68v2c8rwbsv36kjzg9xacm81n1w4b2dpz4g0";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 ];
+  buildInputs = [ glib pipewire fuse ];
+
+  doCheck = true;
+
+  configureFlags = [
+    "--enable-installed-tests"
+  ];
+
+  makeFlags = [
+    "installed_testdir=$(installedTests)/libexec/installed-tests/xdg-desktop-portal"
+    "installed_test_metadir=$(installedTests)/share/installed-tests/xdg-desktop-portal"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Desktop integration portals for sandboxed apps";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd2f4482922..272bb1441fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18718,6 +18718,8 @@ with pkgs;
 
   xdaliclock = callPackage ../tools/misc/xdaliclock {};
 
+  xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { };
+
   xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };
 
   xdg_utils = callPackage ../tools/X11/xdg-utils {
-- 
GitLab


From 556c40c0e2e63b5f04a7f9f5d1af88a2fbfbcb3b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 31 Dec 2017 04:01:07 +0100
Subject: [PATCH 0486/1085] xdg-desktop-portal-gtk: init at 0.10

---
 .../xdg-desktop-portal-gtk/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix

diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
new file mode 100644
index 00000000000..720e394afc7
--- /dev/null
+++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib }:
+
+let
+  version = "0.11";
+in stdenv.mkDerivation rec {
+  name = "xdg-desktop-portal-gtk-${version}";
+
+  src = fetchFromGitHub {
+    owner = "flatpak";
+    repo = "xdg-desktop-portal-gtk";
+    rev = version;
+    sha256 = "03ysv29k7fp14hx0gakjigzzlniwicqd81nrhnc6w4pgin0y0zwg";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal ];
+  buildInputs = [ glib gtk3 ];
+
+  meta = with stdenv.lib; {
+    description = "Desktop integration portals for sandboxed apps";
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 272bb1441fd..51ac4297091 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18720,6 +18720,8 @@ with pkgs;
 
   xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { };
 
+  xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { };
+
   xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };
 
   xdg_utils = callPackage ../tools/X11/xdg-utils {
-- 
GitLab


From 2c591d6622a044b65067e771861e1c966eb04e20 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 21:10:34 -0700
Subject: [PATCH 0487/1085] virtualbox: 5.2.10 -> 5.2.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage -h’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage --help’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage help’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxBalloonCtrl -h’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxBalloonCtrl --help’ got 0 exit code
- found 5.2.12 with grep in /nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12
- directory tree listing: https://gist.github.com/f9bf852a0a8e6e0b4c44a9b68764850b
---
 pkgs/applications/virtualization/virtualbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index d09a30f98a7..6a3781d58ee 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -23,8 +23,8 @@ let
   # Do not forget to update the hash in ./guest-additions/default.nix!
   extpack = "5eef217dbe0a8e8caf383ea8db83344517af0f9093041b5345c8468a427b327b";
   extpackRev = "122406";
-  main = "1k14ngz1gcz02qwbpzfp4kgxv8s24js8pwd5nyyqs6jpxx6557pd";
-  version = "5.2.10";
+  main = "0n1lip8lkz4qqq5ml47xldsx41919ncfh060i7yj51bhas604q6s";
+  version = "5.2.12";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {
-- 
GitLab


From 352f8cb6b6dd402107e7d26f4b2cba8c56b9818a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 10 May 2018 20:07:11 -0500
Subject: [PATCH 0488/1085] retroarch: fix on macOS

---
 pkgs/misc/emulators/retroarch/default.nix | 36 +++++++++++++++++++++--
 pkgs/misc/emulators/retroarch/wrapper.nix |  4 +++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index e898a5804b0..c834f6c9047 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -12,11 +12,20 @@
 , udev ? null
 , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null
 , withVulkan ? stdenv.isLinux, vulkan-loader ? null
+, targetPlatform, fetchurl
 }:
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
+let
+
+  # ibtool is closed source so we have to download the blob
+  osx-MainMenu = fetchurl {
+    url = "https://github.com/matthewbauer/RetroArch/raw/b146a9ac6b2b516652a7bf05a9db5a804eab323d/pkg/apple/OSX/en.lproj/MainMenu.nib";
+    sha256 = "13k1l628wy0rp6wxrpwr4g1m9c997d0q8ks50f8zhmh40l5j2sp8";
+  };
+
+in stdenv.mkDerivation rec {
   name = "retroarch-bare-${version}";
   version = "1.7.1";
 
@@ -39,8 +48,31 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = optional withVulkan ''
+  postInstall = optionalString withVulkan ''
     wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
+  '' + optionalString targetPlatform.isDarwin ''
+    EXECUTABLE_NAME=RetroArch
+    PRODUCT_NAME=RetroArch
+    MACOSX_DEPLOYMENT_TARGET=10.5
+    app=$out/Applications/$PRODUCT_NAME.app
+
+    install -D pkg/apple/OSX/Info.plist $app/Contents/Info.plist
+    echo "APPL????" > $app/Contents/PkgInfo
+    mkdir -p $app/Contents/MacOS
+    ln -s $out/bin/retroarch $app/Contents/MacOS/$EXECUTABLE_NAME
+
+    # Hack to fill in Info.plist template w/o using xcode
+    sed -i -e 's,''${EXECUTABLE_NAME}'",$EXECUTABLE_NAME," \
+           -e 's,''${MACOSX_DEPLOYMENT_TARGET}'",$MACOSX_DEPLOYMENT_TARGET," \
+           -e 's,''${PRODUCT_NAME}'",$PRODUCT_NAME," \
+           -e 's,''${PRODUCT_NAME:rfc1034identifier}'",$PRODUCT_NAME," \
+           $app/Contents/Info.plist
+
+    install -D ${osx-MainMenu} \
+               $app/Contents/Resources/en.lproj/MainMenu.nib
+    install -D pkg/apple/OSX/en.lproj/InfoPlist.strings \
+               $app/Contents/Resources/en.lproj/InfoPlist.strings
+    install -D media/retroarch.icns $app/Contents/Resources/retroarch.icns
   '';
 
   preFixup = "rm $out/bin/retroarch-cg2glsl";
diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix
index 58d41699854..71b26b4af6f 100644
--- a/pkgs/misc/emulators/retroarch/wrapper.nix
+++ b/pkgs/misc/emulators/retroarch/wrapper.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation {
 
     ln -s -t $out ${retroarch}/share
 
+    if [ -d ${retroarch}/Applications ]; then
+      ln -s -t $out ${retroarch}/Applications
+    fi
+
     makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch \
       --suffix-each LD_LIBRARY_PATH ':' "$cores" \
       --add-flags "-L $out/lib/ --menu" \
-- 
GitLab


From 4d141bd463ad39c3a783ce9bd725495ceab2a97c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 10 May 2018 20:08:26 -0500
Subject: [PATCH 0489/1085] tests: move to attribute set

---
 pkgs/test/default.nix           | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix | 26 ++------------------------
 2 files changed, 28 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/test/default.nix

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
new file mode 100644
index 00000000000..38f6cb8e564
--- /dev/null
+++ b/pkgs/test/default.nix
@@ -0,0 +1,26 @@
+{ pkgs, callPackage }:
+
+with pkgs;
+
+{
+  cc-wrapper = callPackage ./cc-wrapper { };
+  cc-wrapper-gcc = callPackage ./cc-wrapper { stdenv = gccStdenv; };
+  cc-wrapper-gcc7 = callPackage ./cc-wrapper { stdenv = gcc7Stdenv; };
+  cc-wrapper-gcc8 = callPackage ./cc-wrapper { stdenv = gcc8Stdenv; };
+  cc-wrapper-clang = callPackage ./cc-wrapper { stdenv = llvmPackages.stdenv; };
+  cc-wrapper-libcxx = callPackage ./cc-wrapper { stdenv = llvmPackages.libcxxStdenv; };
+  cc-wrapper-clang-39 = callPackage ./cc-wrapper { stdenv = llvmPackages_39.stdenv; };
+  cc-wrapper-libcxx-39 = callPackage ./cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; };
+  cc-wrapper-clang-4 = callPackage ./cc-wrapper { stdenv = llvmPackages_4.stdenv; };
+  cc-wrapper-libcxx-4 = callPackage ./cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; };
+  cc-wrapper-clang-5 = callPackage ./cc-wrapper { stdenv = llvmPackages_5.stdenv; };
+  cc-wrapper-libcxx-5 = callPackage ./cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; };
+  cc-wrapper-clang-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.stdenv; };
+  cc-wrapper-libcxx-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; };
+  stdenv-inputs = callPackage ./stdenv-inputs { };
+
+  cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
+  cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
+
+  macOSSierraShared = callPackage ./macos-sierra-shared {};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e445747be1..a83e4f5fa7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -61,6 +61,8 @@ with pkgs;
     by Hydra.
   '';
 
+  tests = recurseIntoAttrs (callPackages ../test {});
+
   ### Nixpkgs maintainer tools
 
   nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { };
@@ -21470,30 +21472,6 @@ with pkgs;
 
   openfst = callPackage ../development/libraries/openfst {};
 
-  # `recurseIntoAttrs` for sake of hydra, not nix-env
-  tests = recurseIntoAttrs {
-    cc-wrapper = callPackage ../test/cc-wrapper { };
-    cc-wrapper-gcc = callPackage ../test/cc-wrapper { stdenv = gccStdenv; };
-    cc-wrapper-gcc7 = callPackage ../test/cc-wrapper { stdenv = gcc7Stdenv; };
-    cc-wrapper-gcc8 = callPackage ../test/cc-wrapper { stdenv = gcc8Stdenv; };
-    cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; };
-    cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; };
-    cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; };
-    cc-wrapper-libcxx-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; };
-    cc-wrapper-clang-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.stdenv; };
-    cc-wrapper-libcxx-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; };
-    cc-wrapper-clang-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.stdenv; };
-    cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; };
-    cc-wrapper-clang-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.stdenv; };
-    cc-wrapper-libcxx-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; };
-    stdenv-inputs = callPackage ../test/stdenv-inputs { };
-
-    cc-multilib-gcc = callPackage ../test/cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
-    cc-multilib-clang = callPackage ../test/cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
-
-    macOSSierraShared = callPackage ../test/macos-sierra-shared {};
-  };
-
   duti = callPackage ../os-specific/darwin/duti {};
 
   dnstracer = callPackage ../tools/networking/dnstracer {
-- 
GitLab


From a0ab41ca96cc632ee8f840e66a27101e73683db2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 10 May 2018 20:10:06 -0500
Subject: [PATCH 0490/1085] release: disable
 tests.cc-wrapper-gcc8.x86_64-darwin

This test is broken because gcc8.x86_64-darwin is broken. Please add
the test back in once we have fixed it!

Job: https://hydra.nixos.org/job/nixpkgs/trunk/gcc8.x86_64-darwin
Issue: #40038
---
 pkgs/top-level/release.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5233051cad8..efced59ad91 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -110,7 +110,10 @@ let
               jobs.tests.cc-wrapper-gcc7.x86_64-linux
               jobs.tests.cc-wrapper-gcc7.x86_64-darwin
               jobs.tests.cc-wrapper-gcc8.x86_64-linux
-              jobs.tests.cc-wrapper-gcc8.x86_64-darwin
+
+              # broken see issue #40038
+              # jobs.tests.cc-wrapper-gcc8.x86_64-darwin
+
               jobs.tests.cc-wrapper-clang.x86_64-linux
               jobs.tests.cc-wrapper-clang.x86_64-darwin
               jobs.tests.cc-wrapper-libcxx.x86_64-linux
-- 
GitLab


From b45552c35aea6e2cd3ef1edb877574fcec191859 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 10 May 2018 23:54:38 -0500
Subject: [PATCH 0491/1085] fmod: supports darwin

---
 pkgs/games/zandronum/fmod.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix
index 7f76101d8ce..2c53d93e401 100644
--- a/pkgs/games/zandronum/fmod.nix
+++ b/pkgs/games/zandronum/fmod.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, alsaLib, libpulseaudio }:
+{ stdenv, lib, fetchurl, alsaLib, libpulseaudio, undmg }:
 
 let
   bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
@@ -8,20 +8,30 @@ in
 stdenv.mkDerivation rec {
   name = "fmod-${version}";
   version = "4.44.64";
+  shortVersion = builtins.replaceStrings [ "." ] [ "" ] version;
 
-  src = fetchurl {
-    url = "https://zdoom.org/files/fmod/fmodapi44464linux.tar.gz";
+  src = fetchurl (if stdenv.isLinux then {
+    url = "https://zdoom.org/files/fmod/fmodapi${shortVersion}linux.tar.gz";
     sha256 = "047hk92xapwwqj281f4zwl0ih821rrliya70gfj82sdfjh9lz8i1";
-  };
+  } else {
+    url = "https://zdoom.org/files/fmod/fmodapi${shortVersion}mac-installer.dmg";
+    sha256 = "1m1y4cpcwpkl8x31d3s68xzp107f343ma09w2437i2adn5y7m8ii";
+  });
+
+  nativeBuildInputs = [ undmg ];
 
   dontStrip = true;
   dontPatchELF = true;
   dontBuild = true;
 
-  installPhase = ''
+  installPhase = lib.optionalString stdenv.isLinux ''
     install -Dm755 api/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex-${version}.so
     ln -s libfmodex-${version}.so $out/lib/libfmodex.so
     patchelf --set-rpath ${libPath} $out/lib/libfmodex.so
+  '' + lib.optionalString stdenv.isDarwin ''
+    install -D api/lib/libfmodex.dylib $out/lib/libfmodex.dylib
+    install -D api/lib/libfmodexL.dylib $out/lib/libfmodexL.dylib
+  '' + ''
     cp -r api/inc $out/include
   '';
 
@@ -29,7 +39,7 @@ stdenv.mkDerivation rec {
     description = "Programming library and toolkit for the creation and playback of interactive audio";
     homepage    = http://www.fmod.org/;
     license     = licenses.unfreeRedistributable;
-    platforms   = [ "x86_64-linux" "i686-linux" ];
+    platforms   = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
     maintainers = [ maintainers.lassulus ];
   };
 }
-- 
GitLab


From 236b89afebaf55a09c7ec3bea6136871c4d03884 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 10 May 2018 23:55:06 -0500
Subject: [PATCH 0492/1085] dwarf-fortress: supports darwin

---
 pkgs/games/dwarf-fortress/default.nix         |  6 +-
 pkgs/games/dwarf-fortress/game.nix            | 80 ++++++++++++++-----
 pkgs/games/dwarf-fortress/wrapper/default.nix |  2 +
 .../wrapper/dwarf-fortress-init.in            |  1 +
 .../dwarf-fortress/wrapper/dwarf-fortress.in  |  5 +-
 5 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index c759c4c60da..82710256c63 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, pkgsi686Linux }:
+{ pkgs, pkgsi686Linux, stdenv }:
 
 let
   callPackage = pkgs.newScope self;
@@ -13,7 +13,9 @@ let
 
     soundSense = callPackage ./soundsense.nix { };
 
-    dwarf-fortress-unfuck = callPackage ./unfuck.nix { };
+    # unfuck is linux-only right now, we will just use it there
+    dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { }
+                                              else null;
 
     dwarf-fortress = callPackage ./wrapper {
       themes = {
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 79dd46c2191..2dbe8ba098b 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -1,57 +1,93 @@
 { stdenv, lib, fetchurl
 , SDL, dwarf-fortress-unfuck
+
+# Our own "unfuck" libs for macOS
+, ncurses, fmodex, gcc
 }:
 
+with lib;
+
 let
   baseVersion = "44";
-  patchVersion = "09";
+  patchVersion = "10";
   dfVersion = "0.${baseVersion}.${patchVersion}";
-  libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ];
-  platform =
-    if stdenv.system == "x86_64-linux" then "linux"
-    else if stdenv.system == "i686-linux" then "linux32"
-    else throw "Unsupported platform";
-  sha256 =
-    if stdenv.system == "x86_64-linux" then "1haikynkg1pqyrzzqk1qxm19p36ww58qp8brh3fjxssp4x71rcdy"
-    else if stdenv.system == "i686-linux" then "0lmbrdf7wjdwj5yx0khnq871yxvhfwqxjjyfkqcdy5ik18lvlkj8"
-    else throw "Unsupported platform";
+
+  libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
+
+  homepage = http://www.bay12games.com/dwarves/;
+
+  # Other srcs are avilable like 32-bit mac & win, but I have only
+  # included the ones most likely to be needed by Nixpkgs users.
+  srcs = {
+    "x86_64-linux" = fetchurl {
+      url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2";
+      sha256 = "1haikynkg1pqyrzzqk1qxm19p36ww58qp8brh3fjxssp4x71rcdy";
+    };
+    "i686-linux" = fetchurl {
+      url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2";
+      sha256 = "0lmbrdf7wjdwj5yx0khnq871yxvhfwqxjjyfkqcdy5ik18lvlkj8";
+    };
+    "x86_64-darwin" = fetchurl {
+      url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2";
+      sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g";
+    };
+  };
 
 in
 
-assert dwarf-fortress-unfuck.dfVersion == dfVersion;
+assert dwarf-fortress-unfuck != null ->
+       dwarf-fortress-unfuck.dfVersion == dfVersion;
 
 stdenv.mkDerivation {
   name = "dwarf-fortress-original-${dfVersion}";
 
-  src = fetchurl {
-    url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_${platform}.tar.bz2";
-    inherit sha256;
-  };
+  src = if builtins.hasAttr stdenv.system srcs
+        then builtins.getAttr stdenv.system srcs
+        else throw "Unsupported systems";
 
   installPhase = ''
     mkdir -p $out
     cp -r * $out
     rm $out/libs/lib*
 
-    # Store the original hash
-    md5sum $out/libs/Dwarf_Fortress | awk '{ print $1 }' > $out/hash.md5.orig
+    exe=$out/${if stdenv.isLinux then "libs/Dwarf_Fortress"
+                                 else "dwarfort.exe"}
 
+    # Store the original hash
+    md5sum $exe | awk '{ print $1 }' > $out/hash.md5.orig
+  '' + optionalString stdenv.isLinux ''
     patchelf \
       --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
       --set-rpath "${libpath}" \
-      $out/libs/Dwarf_Fortress
+      $exe
+  '' + optionalString stdenv.isDarwin ''
+    # My custom unfucked dwarfort.exe for macOS. Can't use
+    # absolute paths because original doesn't have enough
+    # header space. Someone plz break into Tarn's house & put
+    # -headerpad_max_install_names into his LDFLAGS.
+
+    ln -s ${getLib ncurses}/lib/libncurses.dylib $out/libs
+    ln -s ${getLib gcc.cc}/lib/libstdc++.6.dylib $out/libs
+    ln -s ${getLib fmodex}/lib/libfmodex.dylib $out/libs
 
+    install_name_tool \
+      -change /usr/lib/libncurses.5.4.dylib \
+              @executable_path/libs/libncurses.dylib \
+      -change /usr/local/lib/x86_64/libstdc++.6.dylib \
+              @executable_path/libs/libstdc++.6.dylib \
+      $exe
+  '' + ''
     # Store the new hash
-    md5sum $out/libs/Dwarf_Fortress | awk '{ print $1 }' > $out/hash.md5
+    md5sum $exe | awk '{ print $1 }' > $out/hash.md5
   '';
 
   passthru = { inherit baseVersion patchVersion dfVersion; };
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "A single-player fantasy game with a randomly generated adventure world";
-    homepage = http://www.bay12games.com/dwarves;
+    inherit homepage;
     license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
+    platforms = attrNames srcs;
     maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ];
   };
 }
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 3d904d006e4..e82cc2be680 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
     name = "dwarf-fortress-init";
     src = ./dwarf-fortress-init.in;
     inherit env;
+    exe = if stdenv.isLinux then "libs/Dwarf_Fortress"
+                             else "dwarfort.exe";
   };
 
   runDF = ./dwarf-fortress.in;
diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
index 093dae562c2..054935af012 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
@@ -2,6 +2,7 @@ shopt -s extglob
 
 [ -z "$DF_DIR" ] && DF_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux"
 env_dir="@env@"
+exe="$env_dir/@exe@"
 
 update_path() {
   local path="$1"
diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
index f405f1b0e39..4448bd05fda 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
@@ -2,5 +2,8 @@
 
 source @dfInit@
 
+export DYLD_LIBRARY_PATH="$env_dir/libs"
+export DYLD_FRAMEWORK_PATH="$env_dir/libs"
+
 cd "$DF_DIR"
-exec "$env_dir/libs/Dwarf_Fortress" "$@"
+exec "$exe" "$@"
-- 
GitLab


From 2dc883159162f9c1d198092cfd4ccb62904bd36a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 11 May 2018 00:00:40 -0500
Subject: [PATCH 0493/1085] dwarf-fortress: revert to 44.09

Was at 44.10 but i have no way to test it on linux (and unsure how to
update dwarf-fortress-unfucked).
---
 pkgs/games/dwarf-fortress/game.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 2dbe8ba098b..79eb6e19132 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -9,7 +9,7 @@ with lib;
 
 let
   baseVersion = "44";
-  patchVersion = "10";
+  patchVersion = "09";
   dfVersion = "0.${baseVersion}.${patchVersion}";
 
   libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
@@ -29,7 +29,7 @@ let
     };
     "x86_64-darwin" = fetchurl {
       url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2";
-      sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g";
+      sha256 = "01dss8g9lmi8majp6lxcfw166ydz4himkz6am5pi29gixaf4vfqs";
     };
   };
 
-- 
GitLab


From 14a9c7bc1d9ff4b974c455d28058ccab3b6851ec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 21:45:45 -0700
Subject: [PATCH 0494/1085] wesnoth: 1.14.0 -> 1.14.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1/bin/wesnoth -h’ got 0 exit code
- ran ‘/nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1/bin/wesnoth --help’ got 0 exit code
- ran ‘/nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1/bin/wesnothd -h’ got 0 exit code
- ran ‘/nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1/bin/wesnothd --help’ got 0 exit code
- ran ‘/nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1/bin/wesnothd -V’ and found version 1.14.1
- ran ‘/nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1/bin/wesnothd --version’ and found version 1.14.1
- found 1.14.1 with grep in /nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1
- directory tree listing: https://gist.github.com/8868591a076d925d789cd1cfb562344c
---
 pkgs/games/wesnoth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 81ffd6b135f..4a3d2bd78a0 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.14.0";
+  version = "1.14.1";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw";
+    sha256 = "1mzrnbv71b4s41c5x8clhb53l8lidiwzny1hl828228pvys5bxkb";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From cbbd556473c40b4094e865d92c38eb9acfef6383 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:07:10 -0700
Subject: [PATCH 0495/1085] sleuthkit: 4.6.0 -> 4.6.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/img_cat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/img_stat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/mmls -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/mmstat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/mmcat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/blkcalc -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/blkcat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/blkls -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/blkstat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/ffind -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/fls -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/fcat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/fsstat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/icat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/ifind -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/ils -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/istat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/jcat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/jls -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/usnjls -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/hfind -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/srch_strings -h’ got 0 exit code
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/sigfind -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/tsk_recover -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/tsk_loaddb -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/tsk_comparedir -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/tsk_gettimes -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/fiwalk help’ got 0 exit code
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/jpeg_extract -h’ got 0 exit code
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/jpeg_extract --help’ got 0 exit code
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/jpeg_extract help’ got 0 exit code
- found 4.6.1 with grep in /nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1
- directory tree listing: https://gist.github.com/11dd945b5f40cfc632e6fca6df6a6600
---
 pkgs/tools/system/sleuthkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
index 61649859397..ad16746a266 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "4.6.0";
+  version = "4.6.1";
   name = "sleuthkit-${version}";
 
   src = fetchFromGitHub {
     owner = "sleuthkit";
     repo = "sleuthkit";
     rev = name;
-    sha256 = "0m5ll5sx0pxkn58y582b3v90rsfdrh8dm02kmv61psd0k6q0p91x";
+    sha256 = "1hf783mwa5ws9qvjpj6zgvivi0cfhs8r8m1869ajz5m80lv8fggw";
   };
 
   postPatch = ''
-- 
GitLab


From 35a3194e7f6bd965f72660e83f468a092d4e6ac4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:19:05 -0700
Subject: [PATCH 0496/1085] scowl: 2017.08.24 -> 2018.04.16

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2018.04.16 with grep in /nix/store/amyjmpkyvsn53x3fac7b01mwyi9jl30i-scowl-2018.04.16
- directory tree listing: https://gist.github.com/e67c69e3e02df834f3b040f36b261c13
---
 pkgs/data/misc/scowl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix
index e54dc3fa9fe..c90b8aa7e37 100644
--- a/pkgs/data/misc/scowl/default.nix
+++ b/pkgs/data/misc/scowl/default.nix
@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "scowl";
-  version = "2017.08.24";
+  version = "2018.04.16";
 
   src = fetchFromGitHub {
     owner = "en-wl";
     repo = "wordlist";
     rev = "rel-${version}";
-    sha256 = "16mgk6scbw8i38g63kh60bsnzgzfs8gvvz2n5jh4x5didbwly8nz";
+    sha256 = "0p0hgg5y88bb802z210cdk1c4fjwlpxxkci6yph3fk7g6s9xc73g";
   };
 
   postPatch = ''
-- 
GitLab


From d12afa66427d83a5f9d7dc26b16831c6bbb6ced6 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 10 May 2018 09:44:08 +0200
Subject: [PATCH 0497/1085] googleearth: init at 7.1.8.3036

---
 nixos/doc/manual/release-notes/rl-1809.xml    |  6 --
 .../applications/misc/googleearth/default.nix | 97 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 99 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/misc/googleearth/default.nix

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index e10827d5db2..fd998b1b318 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -101,12 +101,6 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      that can be mapped onto the YAML configuration defined in <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the <varname>docker/distribution</varname> docs</link>.
     </para>
    </listitem>
-   <listitem>
-    <para>
-     <literal>googleearth</literal> has been removed from Nixpkgs. Google does not provide
-     a stable URL for Nixpkgs to use to package this proprietary software.
-    </para>
-   </listitem>
    <listitem>
     <para>
      <literal>gnucash</literal> has changed from version 2.4 to 3.x.
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
new file mode 100644
index 00000000000..c77f8658220
--- /dev/null
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -0,0 +1,97 @@
+{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv
+, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4
+, zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }:
+
+let
+  arch =
+    if stdenv.system == "x86_64-linux" then "amd64"
+    else if stdenv.system == "i686-linux" then "i386"
+    else throw "Unsupported system ${stdenv.system}";
+  sha256 =
+    if arch == "amd64"
+    then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6"
+    else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2";
+  version = "7.1.8.3036";
+  fullPath = stdenv.lib.makeLibraryPath [
+    glibc
+    glib
+    stdenv.cc.cc
+    libSM
+    libICE
+    libXi
+    libXv
+    libGLU_combined
+    libXrender
+    libXrandr
+    libXfixes
+    libXcursor
+    libXinerama
+    freetype
+    libXext
+    libX11
+    zlib
+    fontconfig
+    libproxy
+    libxml2
+    gstreamer
+    dbus
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+  ];
+in
+stdenv.mkDerivation rec {
+  name = "googleearth-${version}";
+  src = fetchurl {
+    url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_${version}-r0_${arch}.deb";
+    inherit sha256;
+  };
+
+  phases = [ "unpackPhase" "installPhase" "checkPhase" ];
+
+  doCheck = true;
+
+  buildInputs = [ dpkg ];
+
+  unpackPhase = ''
+    dpkg-deb -x ${src} ./
+  '';
+
+  installPhase =''
+    mkdir $out
+    mv usr/* $out/
+    rmdir usr
+    mv * $out/
+    rm $out/bin/google-earth $out/opt/google/earth/free/googleearth
+
+    # patch and link googleearth binary
+    ln -s $out/opt/google/earth/free/googleearth-bin $out/bin/googleearth
+    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${fullPath}:\$ORIGIN" \
+      $out/opt/google/earth/free/googleearth-bin
+
+    # patch and link gpsbabel binary
+    ln -s $out/opt/google/earth/free/gpsbabel $out/bin/gpsbabel
+    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${fullPath}:\$ORIGIN" \
+      $out/opt/google/earth/free/gpsbabel
+
+    # patch libraries
+    for a in $out/opt/google/earth/free/*.so* ; do
+      patchelf --set-rpath "${fullPath}:\$ORIGIN" $a
+    done
+  '';
+
+  checkPhase = ''
+    $out/bin/gpsbabel -V > /dev/null
+  '';
+
+  dontPatchELF = true;
+
+  meta = with stdenv.lib; {
+    description = "A world sphere viewer";
+    homepage = http://earth.google.com;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ markus1189 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a83e4f5fa7e..afd339f6fd2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16181,6 +16181,8 @@ with pkgs;
 
   gollum = callPackage ../applications/misc/gollum { };
 
+  googleearth = callPackage ../applications/misc/googleearth { };
+
   google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; };
 
   google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; };
-- 
GitLab


From 83b3e6d705e73d8bb9bbd7bc17a7c68d3f5b47bb Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 11 May 2018 12:25:30 +0300
Subject: [PATCH 0498/1085] kernel: Drop bitrotted MIPS patches

Not a single one of these applies to even 4.4 anymore, so these have
clearly bitrotted a long, long time ago.
---
 .../linux/kernel/mips-ext3-n32.patch          |  17 -
 .../linux/kernel/mips-fpu-sigill.patch        | 507 ------------------
 .../linux/kernel/mips-fpureg-emulation.patch  | 144 -----
 pkgs/os-specific/linux/kernel/patches.nix     |  15 -
 pkgs/top-level/all-packages.nix               |  34 --
 5 files changed, 717 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/mips-ext3-n32.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/mips-fpureg-emulation.patch

diff --git a/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch b/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch
deleted file mode 100644
index fcb6f9177c7..00000000000
--- a/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Dirty patch that makes ext3 work again on 3.5 and 3.6 kernels,
-on mips n32.
-
-http://www.linux-mips.org/archives/linux-mips/2012-11/msg00030.html
-
-diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
-index 92490e9..bf63d7b 100644
---- a/fs/ext3/dir.c
-+++ b/fs/ext3/dir.c
-@@ -228,6 +228,7 @@ out:
- 
- static inline int is_32bit_api(void)
- {
-+	return 1;
- #ifdef CONFIG_COMPAT
- 	return is_compat_task();
- #else
diff --git a/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch b/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch
deleted file mode 100644
index 248aba2b2c2..00000000000
--- a/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch
+++ /dev/null
@@ -1,507 +0,0 @@
-From bf55ef4e3c2f622ac013f196affbd11b67b59223 Mon Sep 17 00:00:00 2001
-From: Mark H Weaver <mhw@netris.org>
-Date: Fri, 28 Oct 2011 13:24:37 -0400
-Subject: [PATCH 2/4] Fix handling of prefx instruction in mips/math-emu
-
-* The instruction is named prefx, not pfetch, and its function
-  field is 0x17, not 0x07.
-
-* Recognize the prefx instruction regardless of what bits happen to be
-  in bits 21-25, which is the format field of the floating-point ops,
-  but holds the base register of the prefx instruction.
----
- arch/mips/include/asm/inst.h |    4 ++--
- arch/mips/math-emu/cp1emu.c  |   16 +++++++---------
- 2 files changed, 9 insertions(+), 11 deletions(-)
-
-diff --git a/arch/mips/include/asm/inst.h b/arch/mips/include/asm/inst.h
-index ab84064..3048edc 100644
---- a/arch/mips/include/asm/inst.h
-+++ b/arch/mips/include/asm/inst.h
-@@ -161,8 +161,8 @@ enum cop1_sdw_func {
-  */
- enum cop1x_func {
- 	lwxc1_op     =  0x00, ldxc1_op     =  0x01,
--	pfetch_op    =  0x07, swxc1_op     =  0x08,
--	sdxc1_op     =  0x09, madd_s_op    =  0x20,
-+	swxc1_op     =  0x08, sdxc1_op     =  0x09,
-+	prefx_op     =  0x17, madd_s_op    =  0x20,
- 	madd_d_op    =  0x21, madd_e_op    =  0x22,
- 	msub_s_op    =  0x28, msub_d_op    =  0x29,
- 	msub_e_op    =  0x2a, nmadd_s_op   =  0x30,
-diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
-index dbf2f93..87ddba1 100644
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -739,7 +739,7 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 			break;
- 
- 		default:
--			return SIGILL;
-+			goto SIGILL_unless_prefx_op;
- 		}
- 		break;
- 	}
-@@ -809,19 +809,17 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 			goto copcsr;
- 
- 		default:
--			return SIGILL;
-+			goto SIGILL_unless_prefx_op;
- 		}
- 		break;
- 	}
- 
--	case 0x7:		/* 7 */
--		if (MIPSInst_FUNC(ir) != pfetch_op) {
--			return SIGILL;
--		}
--		/* ignore prefx operation */
--		break;
--
- 	default:
-+	      SIGILL_unless_prefx_op:
-+		if (MIPSInst_FUNC(ir) == prefx_op) {
-+			/* ignore prefx operation */
-+			break;
-+		}
- 		return SIGILL;
- 	}
- 
--- 
-1.7.5.4
-
-From 97a564e3eddbfb84844b8eccb3bd751c71dfb3eb Mon Sep 17 00:00:00 2001
-From: Mark H Weaver <mhw@netris.org>
-Date: Fri, 28 Oct 2011 13:35:27 -0400
-Subject: [PATCH 3/4] Don't process empty cause flags after simple fp move on
- mips
-
----
- arch/mips/math-emu/cp1emu.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
-index 87ddba1..fefcba2 100644
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -912,7 +912,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 		case fmov_op:
- 			/* an easy one */
- 			SPFROMREG(rv.s, MIPSInst_FS(ir));
--			goto copcsr;
-+			break;
- 
- 			/* binary op on handler */
- 		      scopbop:
-@@ -1099,7 +1099,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 		case fmov_op:
- 			/* an easy one */
- 			DPFROMREG(rv.d, MIPSInst_FS(ir));
--			goto copcsr;
-+			break;
- 
- 			/* binary op on handler */
- 		      dcopbop:{
--- 
-1.7.5.4
-
-From 4051727b3007ef3675e7258ed86fa8517f86d929 Mon Sep 17 00:00:00 2001
-From: Mark H Weaver <mhw@netris.org>
-Date: Fri, 28 Oct 2011 13:39:10 -0400
-Subject: [PATCH 4/4] Support Loongson2f floating-point instructions in
- mips/math-emu
-
-* (arch/mips/include/asm/inst.h): Add Loongson2f function field values
-  for madd/msub/nmadd/nmsub that use the spec2 opcode, and the
-  Loongson2f/MIPS-5 format field value for paired-single
-  floating-point operations.
-
-* (arch/mips/math-emu/cp1emu.c): Add support for the Loongson2f
-  instructions for madd/msub/nmadd/nmsub, which use the spec2 opcode.
-  Also add support for the Loongson2f instructions that use the
-  paired-single floating-point format.
----
- arch/mips/include/asm/inst.h |    4 +-
- arch/mips/math-emu/cp1emu.c  |  287 +++++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 289 insertions(+), 2 deletions(-)
-
-diff --git a/arch/mips/include/asm/inst.h b/arch/mips/include/asm/inst.h
-index 3048edc..0e8ba7c 100644
---- a/arch/mips/include/asm/inst.h
-+++ b/arch/mips/include/asm/inst.h
-@@ -61,6 +61,8 @@ enum spec_op {
- enum spec2_op {
- 	madd_op, maddu_op, mul_op, spec2_3_unused_op,
- 	msub_op, msubu_op, /* more unused ops */
-+	loongson_madd_op = 0x18, loongson_msub_op,
-+	loongson_nmadd_op, loongson_nmsub_op,
- 	clz_op = 0x20, clo_op,
- 	dclz_op = 0x24, dclo_op,
- 	sdbpp_op = 0x3f
-@@ -133,7 +135,7 @@ enum cop0_com_func {
-  */
- enum cop1_fmt {
- 	s_fmt, d_fmt, e_fmt, q_fmt,
--	w_fmt, l_fmt
-+	w_fmt, l_fmt, ps_fmt
- };
- 
- /*
-diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
-index fefcba2..166b2a4 100644
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -7,6 +7,9 @@
-  * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com
-  * Copyright (C) 2000  MIPS Technologies, Inc.
-  *
-+ * Loongson instruction support
-+ * Copyright (C) 2011  Mark H Weaver <mhw@netris.org>
-+ *
-  *  This program is free software; you can distribute it and/or modify it
-  *  under the terms of the GNU General Public License (Version 2) as
-  *  published by the Free Software Foundation.
-@@ -57,6 +60,14 @@
- #endif
- #define __mips 4
- 
-+#ifdef __loongson_fp
-+#undef __loongson_fp
-+#endif
-+#if __mips >= 4 && __mips != 32
-+/* Include support for Loongson floating point instructions */
-+#define __loongson_fp 1
-+#endif
-+
- /* Function which emulates a floating point instruction. */
- 
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
-@@ -66,6 +77,10 @@ static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
- static int fpux_emu(struct pt_regs *,
- 	struct mips_fpu_struct *, mips_instruction, void *__user *);
- #endif
-+#ifdef __loongson_fp
-+static int loongson_spec2_emu(struct pt_regs *,
-+	struct mips_fpu_struct *, mips_instruction, void *__user *);
-+#endif
- 
- /* Further private data for which no space exists in mips_fpu_struct */
- 
-@@ -203,6 +218,14 @@ static inline int cop1_64bit(struct pt_regs *xcp)
- #define DPFROMREG(dp, x)	DIFROMREG((dp).bits, x)
- #define DPTOREG(dp, x)	DITOREG((dp).bits, x)
- 
-+/* Support for Loongson paired single floating-point format */
-+#define PSIFROMREG(si1, si2, x) ({ u64 di; DIFROMREG(di, x);		\
-+			(si1) = (u32)di; (si2) = (u32)(di >> 32); })
-+#define PSITOREG(si1, si2, x) DITOREG((si1) | ((u64)(si2) << 32), x)
-+
-+#define PSPFROMREG(sp1, sp2, x) PSIFROMREG((sp1).bits, (sp2).bits, x)
-+#define PSPTOREG(sp1, sp2, x)	PSITOREG((sp1).bits, (sp2).bits, x)
-+
- /*
-  * Emulate the single floating point instruction pointed at by EPC.
-  * Two instructions if the instruction is in a branch delay slot.
-@@ -568,6 +591,15 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 		break;
- #endif
- 
-+#ifdef __loongson_fp
-+	case spec2_op:{
-+		int sig = loongson_spec2_emu(xcp, ctx, ir, fault_addr);
-+		if (sig)
-+			return sig;
-+		break;
-+	}
-+#endif
-+
- 	default:
- 		return SIGILL;
- 	}
-@@ -646,6 +678,172 @@ DEF3OP(msub, dp, ieee754dp_mul, ieee754dp_sub, );
- DEF3OP(nmadd, dp, ieee754dp_mul, ieee754dp_add, ieee754dp_neg);
- DEF3OP(nmsub, dp, ieee754dp_mul, ieee754dp_sub, ieee754dp_neg);
- 
-+#ifdef __loongson_fp
-+static int loongson_spec2_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+	mips_instruction ir, void *__user *fault_addr)
-+{
-+	int rfmt;		/* resulting format */
-+	unsigned rcsr = 0;	/* resulting csr */
-+	union {
-+		ieee754dp d;
-+		struct {
-+			ieee754sp s;
-+			ieee754sp s2;
-+		};
-+	} rv;			/* resulting value */
-+
-+	/* XXX maybe add a counter for loongson spec2 fp instructions? */
-+	/* MIPS_FPU_EMU_INC_STATS(cp1xops); */
-+
-+	switch (rfmt = (MIPSInst_FFMT(ir) & 0xf)) {
-+	case s_fmt:{
-+		ieee754sp(*handler) (ieee754sp, ieee754sp, ieee754sp);
-+		ieee754sp fd, fs, ft;
-+
-+		switch (MIPSInst_FUNC(ir)) {
-+		case loongson_madd_op:
-+			handler = fpemu_sp_madd;
-+			goto scoptop;
-+		case loongson_msub_op:
-+			handler = fpemu_sp_msub;
-+			goto scoptop;
-+		case loongson_nmadd_op:
-+			handler = fpemu_sp_nmadd;
-+			goto scoptop;
-+		case loongson_nmsub_op:
-+			handler = fpemu_sp_nmsub;
-+			goto scoptop;
-+
-+		      scoptop:
-+			SPFROMREG(fd, MIPSInst_FD(ir));
-+			SPFROMREG(fs, MIPSInst_FS(ir));
-+			SPFROMREG(ft, MIPSInst_FT(ir));
-+			rv.s = (*handler) (fd, fs, ft);
-+
-+		      copcsr:
-+			if (ieee754_cxtest(IEEE754_INEXACT))
-+				rcsr |= FPU_CSR_INE_X | FPU_CSR_INE_S;
-+			if (ieee754_cxtest(IEEE754_UNDERFLOW))
-+				rcsr |= FPU_CSR_UDF_X | FPU_CSR_UDF_S;
-+			if (ieee754_cxtest(IEEE754_OVERFLOW))
-+				rcsr |= FPU_CSR_OVF_X | FPU_CSR_OVF_S;
-+			if (ieee754_cxtest(IEEE754_INVALID_OPERATION))
-+				rcsr |= FPU_CSR_INV_X | FPU_CSR_INV_S;
-+
-+			break;
-+
-+		default:
-+			return SIGILL;
-+		}
-+		break;
-+	}
-+
-+	case d_fmt:{
-+		ieee754dp(*handler) (ieee754dp, ieee754dp, ieee754dp);
-+		ieee754dp fd, fs, ft;
-+
-+		switch (MIPSInst_FUNC(ir)) {
-+		case loongson_madd_op:
-+			handler = fpemu_dp_madd;
-+			goto dcoptop;
-+		case loongson_msub_op:
-+			handler = fpemu_dp_msub;
-+			goto dcoptop;
-+		case loongson_nmadd_op:
-+			handler = fpemu_dp_nmadd;
-+			goto dcoptop;
-+		case loongson_nmsub_op:
-+			handler = fpemu_dp_nmsub;
-+			goto dcoptop;
-+
-+		      dcoptop:
-+			DPFROMREG(fd, MIPSInst_FD(ir));
-+			DPFROMREG(fs, MIPSInst_FS(ir));
-+			DPFROMREG(ft, MIPSInst_FT(ir));
-+			rv.d = (*handler) (fd, fs, ft);
-+			goto copcsr;
-+
-+		default:
-+			return SIGILL;
-+		}
-+		break;
-+	}
-+
-+	case ps_fmt:{
-+		ieee754sp(*handler) (ieee754sp, ieee754sp, ieee754sp);
-+		struct _ieee754_csr ieee754_csr_save;
-+		ieee754sp fd1, fs1, ft1;
-+		ieee754sp fd2, fs2, ft2;
-+
-+		switch (MIPSInst_FUNC(ir)) {
-+		case loongson_madd_op:
-+			handler = fpemu_sp_madd;
-+			goto pscoptop;
-+		case loongson_msub_op:
-+			handler = fpemu_sp_msub;
-+			goto pscoptop;
-+		case loongson_nmadd_op:
-+			handler = fpemu_sp_nmadd;
-+			goto pscoptop;
-+		case loongson_nmsub_op:
-+			handler = fpemu_sp_nmsub;
-+			goto pscoptop;
-+
-+		      pscoptop:
-+			PSPFROMREG(fd1, fd2, MIPSInst_FD(ir));
-+			PSPFROMREG(fs1, fs2, MIPSInst_FS(ir));
-+			PSPFROMREG(ft1, ft2, MIPSInst_FT(ir));
-+			rv.s = (*handler) (fd1, fs1, ft1);
-+			ieee754_csr_save = ieee754_csr;
-+			rv.s2 = (*handler) (fd2, fs2, ft2);
-+			ieee754_csr.cx |= ieee754_csr_save.cx;
-+			ieee754_csr.sx |= ieee754_csr_save.sx;
-+			goto copcsr;
-+
-+		default:
-+			return SIGILL;
-+		}
-+		break;
-+	}
-+
-+	default:
-+		return SIGILL;
-+	}
-+
-+	/*
-+	 * Update the fpu CSR register for this operation.
-+	 * If an exception is required, generate a tidy SIGFPE exception,
-+	 * without updating the result register.
-+	 * Note: cause exception bits do not accumulate, they are rewritten
-+	 * for each op; only the flag/sticky bits accumulate.
-+	 */
-+	ctx->fcr31 = (ctx->fcr31 & ~FPU_CSR_ALL_X) | rcsr;
-+	if ((ctx->fcr31 >> 5) & ctx->fcr31 & FPU_CSR_ALL_E) {
-+		/*printk ("SIGFPE: fpu csr = %08x\n",ctx->fcr31); */
-+		return SIGFPE;
-+	}
-+
-+	/*
-+	 * Now we can safely write the result back to the register file.
-+	 */
-+	switch (rfmt) {
-+	case d_fmt:
-+		DPTOREG(rv.d, MIPSInst_FD(ir));
-+		break;
-+	case s_fmt:
-+		SPTOREG(rv.s, MIPSInst_FD(ir));
-+		break;
-+	case ps_fmt:
-+		PSPTOREG(rv.s, rv.s2, MIPSInst_FD(ir));
-+		break;
-+	default:
-+		return SIGILL;
-+	}
-+
-+	return 0;
-+}
-+#endif
-+
- static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 	mips_instruction ir, void *__user *fault_addr)
- {
-@@ -840,7 +1038,12 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 	unsigned cond;
- 	union {
- 		ieee754dp d;
--		ieee754sp s;
-+		struct {
-+			ieee754sp s;
-+#ifdef __loongson_fp
-+			ieee754sp s2; /* for Loongson paired singles */
-+#endif
-+		};
- 		int w;
- #ifdef __mips64
- 		s64 l;
-@@ -1210,6 +1413,83 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 		break;
- 	}
- 
-+#ifdef __loongson_fp
-+	case ps_fmt:{		/* 6 */
-+		/* Support for Loongson paired single fp instructions */
-+		union {
-+			ieee754sp(*b) (ieee754sp, ieee754sp);
-+			ieee754sp(*u) (ieee754sp);
-+		} handler;
-+
-+		switch (MIPSInst_FUNC(ir)) {
-+			/* binary ops */
-+		case fadd_op:
-+			handler.b = ieee754sp_add;
-+			goto pscopbop;
-+		case fsub_op:
-+			handler.b = ieee754sp_sub;
-+			goto pscopbop;
-+		case fmul_op:
-+			handler.b = ieee754sp_mul;
-+			goto pscopbop;
-+
-+			/* unary  ops */
-+		case fabs_op:
-+			handler.u = ieee754sp_abs;
-+			goto pscopuop;
-+		case fneg_op:
-+			handler.u = ieee754sp_neg;
-+			goto pscopuop;
-+		case fmov_op:
-+			/* an easy one */
-+			PSPFROMREG(rv.s, rv.s2, MIPSInst_FS(ir));
-+			break;
-+
-+		      pscopbop: /* paired binary op handler */
-+			{
-+				struct _ieee754_csr ieee754_csr_save;
-+				ieee754sp fs1, ft1;
-+				ieee754sp fs2, ft2;
-+
-+				PSPFROMREG(fs1, fs2, MIPSInst_FS(ir));
-+				PSPFROMREG(ft1, ft2, MIPSInst_FT(ir));
-+				rv.s  = (*handler.b) (fs1, ft1);
-+				ieee754_csr_save = ieee754_csr;
-+				rv.s2 = (*handler.b) (fs2, ft2);
-+				ieee754_csr.cx |= ieee754_csr_save.cx;
-+				ieee754_csr.sx |= ieee754_csr_save.sx;
-+				goto copcsr;
-+			}
-+		      pscopuop: /* paired unary op handler */
-+			{
-+				struct _ieee754_csr ieee754_csr_save;
-+				ieee754sp fs1;
-+				ieee754sp fs2;
-+
-+				PSPFROMREG(fs1, fs2, MIPSInst_FS(ir));
-+				rv.s  = (*handler.u) (fs1);
-+				ieee754_csr_save = ieee754_csr;
-+				rv.s2 = (*handler.u) (fs2);
-+				ieee754_csr.cx |= ieee754_csr_save.cx;
-+				ieee754_csr.sx |= ieee754_csr_save.sx;
-+				goto copcsr;
-+			}
-+			break;
-+
-+		default:
-+			if (MIPSInst_FUNC(ir) >= fcmp_op) {
-+				/* Loongson fp hardware handles all
-+				   cases of fp compare insns, so we
-+				   shouldn't have to */
-+				printk ("Loongson paired-single fp compare"
-+					" unimplemented in cp1emu.c\n");
-+			}
-+			return SIGILL;
-+		}
-+		break;
-+	}
-+#endif
-+
- 	case w_fmt:{
- 		ieee754sp fs;
- 
-@@ -1299,6 +1579,11 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 		DITOREG(rv.l, MIPSInst_FD(ir));
- 		break;
- #endif
-+#ifdef __loongson_fp
-+	case ps_fmt:
-+		PSPTOREG(rv.s, rv.s2, MIPSInst_FD(ir));
-+		break;
-+#endif
- 	default:
- 		return SIGILL;
- 	}
--- 
-1.7.5.4
-
diff --git a/pkgs/os-specific/linux/kernel/mips-fpureg-emulation.patch b/pkgs/os-specific/linux/kernel/mips-fpureg-emulation.patch
deleted file mode 100644
index 452c4f26f6f..00000000000
--- a/pkgs/os-specific/linux/kernel/mips-fpureg-emulation.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From ab1ce0a6cd51ca83194a865837f3b90f366a733d Mon Sep 17 00:00:00 2001
-From: Lluis Batlle i Rossell <viric@viric.name>
-Date: Sat, 16 Jun 2012 00:22:53 +0200
-Subject: [PATCH] MIPS: Add emulation for fpureg-mem unaligned access
-To: linux-mips@linux-mips.org
-Cc: loongson-dev@googlegroups.com
-
-Reusing most of the code from lw,ld,sw,sd emulation,
-I add the emulation for lwc1,ldc1,swc1,sdc1.
-
-This avoids the direct SIGBUS sent to userspace processes that have
-misaligned memory accesses.
-
-I've tested the change in Loongson2F, with an own test program, and
-WebKit 1.4.0, as both were killed by sigbus without this patch.
-
-Signed-off: Lluis Batlle i Rossell <viric@viric.name>
----
- arch/mips/kernel/unaligned.c |   43 +++++++++++++++++++++++++++++-------------
- 1 file changed, 30 insertions(+), 13 deletions(-)
-
-diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
-index 9c58bdf..4531e6c 100644
---- a/arch/mips/kernel/unaligned.c
-+++ b/arch/mips/kernel/unaligned.c
-@@ -85,6 +85,7 @@
- #include <asm/cop2.h>
- #include <asm/inst.h>
- #include <asm/uaccess.h>
-+#include <asm/fpu.h>
- 
- #define STR(x)  __STR(x)
- #define __STR(x)  #x
-@@ -108,6 +109,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 	union mips_instruction insn;
- 	unsigned long value;
- 	unsigned int res;
-+	fpureg_t *fpuregs;
- 
- 	perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, regs, 0);
- 
-@@ -183,6 +185,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		break;
- 
- 	case lw_op:
-+	case lwc1_op:
- 		if (!access_ok(VERIFY_READ, addr, 4))
- 			goto sigbus;
- 
-@@ -209,7 +212,12 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		if (res)
- 			goto fault;
- 		compute_return_epc(regs);
--		regs->regs[insn.i_format.rt] = value;
-+		if (insn.i_format.opcode == lw_op) {
-+			regs->regs[insn.i_format.rt] = value;
-+		} else {
-+			fpuregs = get_fpu_regs(current);
-+			fpuregs[insn.i_format.rt] = value;
-+		}
- 		break;
- 
- 	case lhu_op:
-@@ -291,6 +299,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		goto sigill;
- 
- 	case ld_op:
-+	case ldc1_op:
- #ifdef CONFIG_64BIT
- 		/*
- 		 * A 32-bit kernel might be running on a 64-bit processor.  But
-@@ -325,7 +334,12 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		if (res)
- 			goto fault;
- 		compute_return_epc(regs);
--		regs->regs[insn.i_format.rt] = value;
-+		if (insn.i_format.opcode == ld_op) {
-+			regs->regs[insn.i_format.rt] = value;
-+		} else {
-+			fpuregs = get_fpu_regs(current);
-+			fpuregs[insn.i_format.rt] = value;
-+		}
- 		break;
- #endif /* CONFIG_64BIT */
- 
-@@ -370,10 +384,16 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		break;
- 
- 	case sw_op:
-+	case swc1_op:
- 		if (!access_ok(VERIFY_WRITE, addr, 4))
- 			goto sigbus;
- 
--		value = regs->regs[insn.i_format.rt];
-+		if (insn.i_format.opcode == sw_op) {
-+			value = regs->regs[insn.i_format.rt];
-+		} else {
-+			fpuregs = get_fpu_regs(current);
-+			value = fpuregs[insn.i_format.rt];
-+		}
- 		__asm__ __volatile__ (
- #ifdef __BIG_ENDIAN
- 			"1:\tswl\t%1,(%2)\n"
-@@ -401,6 +421,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		break;
- 
- 	case sd_op:
-+	case sdc1_op:
- #ifdef CONFIG_64BIT
- 		/*
- 		 * A 32-bit kernel might be running on a 64-bit processor.  But
-@@ -412,7 +433,12 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		if (!access_ok(VERIFY_WRITE, addr, 8))
- 			goto sigbus;
- 
--		value = regs->regs[insn.i_format.rt];
-+		if (insn.i_format.opcode == sd_op) {
-+			value = regs->regs[insn.i_format.rt];
-+		} else {
-+			fpuregs = get_fpu_regs(current);
-+			value = fpuregs[insn.i_format.rt];
-+		}
- 		__asm__ __volatile__ (
- #ifdef __BIG_ENDIAN
- 			"1:\tsdl\t%1,(%2)\n"
-@@ -443,15 +469,6 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		/* Cannot handle 64-bit instructions in 32-bit kernel */
- 		goto sigill;
- 
--	case lwc1_op:
--	case ldc1_op:
--	case swc1_op:
--	case sdc1_op:
--		/*
--		 * I herewith declare: this does not happen.  So send SIGBUS.
--		 */
--		goto sigbus;
--
- 	/*
- 	 * COP2 is available to implementor for application specific use.
- 	 * It's up to applications to register a notifier chain and do
--- 
-1.7.9.5
-
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index cedb2dfc223..4ba182ea5a5 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -31,21 +31,6 @@ rec {
       patch = ./p9-fixes.patch;
     };
 
-  mips_fpureg_emu =
-    { name = "mips-fpureg-emulation";
-      patch = ./mips-fpureg-emulation.patch;
-    };
-
-  mips_fpu_sigill =
-    { name = "mips-fpu-sigill";
-      patch = ./mips-fpu-sigill.patch;
-    };
-
-  mips_ext3_n32 =
-    { name = "mips-ext3-n32";
-      patch = ./mips-ext3-n32.patch;
-    };
-
   modinst_arg_list_too_long =
     { name = "modinst-arglist-too-long";
       patch = ./modinst-arg-list-too-long.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afd339f6fd2..d466e57041a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13444,11 +13444,6 @@ with pkgs;
         kernelPatches.p9_fixes
         kernelPatches.cpu-cgroup-v2."4.9"
         kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
       ];
   };
 
@@ -13463,11 +13458,6 @@ with pkgs;
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
         kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
       ];
   };
 
@@ -13476,11 +13466,6 @@ with pkgs;
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.9"
         kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
       ];
   };
 
@@ -13491,11 +13476,6 @@ with pkgs;
         # when adding a new linux version
         kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
       ];
   };
 
@@ -13507,11 +13487,6 @@ with pkgs;
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
         kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16!
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
       ];
   };
 
@@ -13519,10 +13494,6 @@ with pkgs;
     kernelPatches = [
       kernelPatches.bridge_stp_helper
       kernelPatches.modinst_arg_list_too_long
-    ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
-      kernelPatches.mips_fpureg_emu
-      kernelPatches.mips_fpu_sigill
-      kernelPatches.mips_ext3_n32
     ];
   };
 
@@ -13530,11 +13501,6 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
       ];
   };
 
-- 
GitLab


From 79dcdce63387d8b0c624abbc00d00acaa7912a43 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 11 May 2018 04:35:42 -0500
Subject: [PATCH 0499/1085] openbsm: add audit_token_to_pid symbol

This is needed by some projects like Chromium that use openbsm/libbsm.
---
 .../openbsm/bsm-add-audit_token_to_pid.patch  | 24 +++++++++++++++++++
 .../development/libraries/openbsm/default.nix |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch

diff --git a/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch b/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch
new file mode 100644
index 00000000000..77b9e1febdd
--- /dev/null
+++ b/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch
@@ -0,0 +1,24 @@
+Subject: Add audit_token_to_pid()
+
+Description: Apple provides audit_token_to_pid to get the pid of an
+audit token. Unfortunately, they have never released this to the
+OpenBSM project.
+
+diff -r -u -p1 a/bsm/libbsm.h b/bsm/libbsm.h
+--- a/bsm/libbsm.h	      2009-04-15 16:45:54.000000000 -0500
++++ b/bsm/libbsm.h	      2018-05-11 04:11:14.063083147 -0500
+@@ -1298,1 +1298,2 @@ int audit_set_stat(au_stat_t *stats, siz
+ int audit_send_trigger(int *trigger);
++pid_t audit_token_to_pid(audit_token_t atoken);
+
+diff -r -u -p1 a/libbsm/bsm_wrappers.c b/libbsm/bsm_wrappers.c
+--- a/libbsm/bsm_wrappers.c	       2009-04-15 16:46:06.000000000 -0500
++++ b/libbsm/bsm_wrappers.c	       2018-05-11 04:10:15.710820393 -0500
+@@ -823,1 +823,6 @@ audit_get_car(char *path, size_t sz)
+ }
++
++pid_t audit_token_to_pid(audit_token_t atoken)
++{
++	return atoken.val[5];
++}
+ 
\ No newline at end of file
diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix
index a6e62cea9d7..9f75bff40e9 100644
--- a/pkgs/development/libraries/openbsm/default.nix
+++ b/pkgs/development/libraries/openbsm/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1";
   };
 
+  patches = [ ./bsm-add-audit_token_to_pid.patch ];
+
   meta = {
     homepage = http://www.openbsm.org/;
     platforms = lib.platforms.unix;
-- 
GitLab


From b7074a600bfb39cfd5385fca2b0c24966b5f7ba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 11 May 2018 12:07:56 +0200
Subject: [PATCH 0500/1085] i3status: 2.11 -> 2.12

---
 pkgs/applications/window-managers/i3/status.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index fa964e86974..ae6d8bd22b7 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -2,11 +2,11 @@
   }:
 
 stdenv.mkDerivation rec {
-  name = "i3status-2.11";
+  name = "i3status-2.12";
 
   src = fetchurl {
     url = "https://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq";
+    sha256 = "06krpbijv4yi33nypg6qcn4hilcrdyarsdpd9fmr2cq46qaqiikg";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 35375aa7edeec272947179d78328667bc928ca3a Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Fri, 11 May 2018 13:56:18 +0300
Subject: [PATCH 0501/1085] hostapd: remove assertion (allow 5GHz channels)

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

diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index bf2d0916fa3..63f56437d1c 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -151,11 +151,6 @@ in
 
   config = mkIf cfg.enable {
 
-    assertions = [
-      { assertion = (cfg.channel >= 1 && cfg.channel <= 13);
-        message = "channel must be between 1 and 13";
-      }];
-
     environment.systemPackages =  [ pkgs.hostapd ];
 
     systemd.services.hostapd =
-- 
GitLab


From d510ab9339b3d97d964af08927ea74acc6589b6b Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@utzutzutz.net>
Date: Fri, 11 May 2018 13:14:28 +0200
Subject: [PATCH 0502/1085] emby: 3.4.0.0 -> 3.4.1.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 4defe9787ba..f781e1114eb 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.4.0.0";
+  version = "3.4.1.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "1936d5bcrf23av5nc8yh6708gxngsbkh86gvmzpsv3d33jgqv1nl";
+    sha256 = "08jr6v8xhmiwbby0lfvpjrlma280inwh5qp6v4p93lzd07fjynh5";
   };
 
   buildInputs = with pkgs; [
-- 
GitLab


From c3dba0b7a79c780ac8359f00d65af29930c7ae20 Mon Sep 17 00:00:00 2001
From: Philipp Steinpass <philipp@xndr.de>
Date: Sun, 29 Apr 2018 20:36:06 +0200
Subject: [PATCH 0503/1085] nixos/gnunet: create switch for package.

---
 nixos/modules/services/networking/gnunet.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix
index 02cd53c6fa3..008b09e81a5 100644
--- a/nixos/modules/services/networking/gnunet.nix
+++ b/nixos/modules/services/networking/gnunet.nix
@@ -102,6 +102,14 @@ in
         };
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.gnunet;
+        defaultText = "pkgs.gnunet";
+        description = "Overridable attribute of the gnunet package to use.";
+        example = literalExample "pkgs.gnunet_git";
+      };
+
       extraOptions = mkOption {
         default = "";
         description = ''
@@ -130,16 +138,16 @@ in
 
     # The user tools that talk to `gnunetd' should come from the same source,
     # so install them globally.
-    environment.systemPackages = [ pkgs.gnunet ];
+    environment.systemPackages = [ cfg.package ];
 
     systemd.services.gnunet = {
       description = "GNUnet";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.gnunet pkgs.miniupnpc ];
+      path = [ cfg.package pkgs.miniupnpc ];
       environment.TMPDIR = "/tmp";
       serviceConfig.PrivateTemp = true;
-      serviceConfig.ExecStart = "${pkgs.gnunet}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}";
+      serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}";
       serviceConfig.User = "gnunet";
       serviceConfig.UMask = "0007";
       serviceConfig.WorkingDirectory = homeDir;
-- 
GitLab


From b15da3e3308d37b0c976ea809e3f4d07d7fdd6ad Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 11 May 2018 04:43:23 +0200
Subject: [PATCH 0504/1085] tor-browser-bundle-bin: 7.5.3 -> 7.5.4

---
 .../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 a2094305db5..97b719c1471 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.5.3";
+  version = "7.5.4";
 
   lang = "en-US";
 
@@ -108,7 +108,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 = "0vgw1qsd6rqbbgnsw9zwcv5m308abh7wp1p12mp8g04xndxnzw0d";
+      sha256 = "1d5q2vc7kyd2wizl4551yf54rcagh3y2xf1lzvrswxq4kasii3h9";
     };
 
     "i686-linux" = fetchurl {
@@ -116,7 +116,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 = "0scjy51zmyn7za0gii0dvndq06slip64nd0ik2cjyq232agvbxmr";
+      sha256 = "18v7ykv23gsylvn9mlkp5547yz3y833i9h126r7195wsqdshizdj";
     };
   };
 in
-- 
GitLab


From 16b4691dd1b4cc4c551f54bd4220f62244c11a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 11 May 2018 14:35:17 +0200
Subject: [PATCH 0505/1085] seafile-client: 6.1.7 -> 6.1.8

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

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 35926836e30..279dc508225 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -5,14 +5,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.1.7";
+  version = "6.1.8";
   name = "seafile-client-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     rev = "v${version}";
-    sha256 = "1wf258sxn4pqdn1xypqwlxbnls771k2c6whpbinpns3knv5zvgaq";
+    sha256 = "0gy7jfxr5f8qvbqj80g7fzaw9b3vax750c4z5cr7f43rv99284pc";
   };
 
   nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
-- 
GitLab


From 5862c6835a3280089a8258a9067fde69f827396c Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Tue, 8 May 2018 22:14:03 +0000
Subject: [PATCH 0506/1085] pythonPackages.immutables: init at 0.5

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

diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix
new file mode 100644
index 00000000000..975353406ca
--- /dev/null
+++ b/pkgs/development/python-modules/immutables/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder }:
+
+buildPythonPackage rec {
+  pname = "immutables";
+  version = "0.5";
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1hba0vkqanwfnb5b3rs14bs7schsmczhan5nd93c1i6fzi17glap";
+  };
+
+  meta = {
+    description = "An immutable mapping type for Python";
+    homepage = https://github.com/MagicStack/immutables;
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7868f7d7ff0..f1be5635342 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3120,6 +3120,8 @@ in {
 
   imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { };
 
+  immutables = callPackage ../development/python-modules/immutables {};
+
   imread = buildPythonPackage rec {
     name = "python-imread-${version}";
     version = "0.6";
-- 
GitLab


From 1bfa8c294c6034c60a54cdd93e86229a44499509 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Tue, 8 May 2018 22:14:21 +0000
Subject: [PATCH 0507/1085] pythonPackages.contextvars: init at 2.2

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

diff --git a/pkgs/development/python-modules/contextvars/default.nix b/pkgs/development/python-modules/contextvars/default.nix
new file mode 100644
index 00000000000..d8ee3b1ca9e
--- /dev/null
+++ b/pkgs/development/python-modules/contextvars/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, isPy36, immutables }:
+
+buildPythonPackage rec {
+  pname = "contextvars";
+  version = "2.2";
+  disabled = !isPy36;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "046b385nfzkjh0wqmd268p2jkgn9fg6hz40npq7j1w3c8aqzhwvx";
+  };
+
+  propagatedBuildInputs = [ immutables ];
+
+  meta = {
+    description = "A backport of the Python 3.7 contextvars module for Python 3.6";
+    homepage = https://github.com/MagicStack/contextvars;
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f1be5635342..cfeeb96e883 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1629,6 +1629,8 @@ in {
 
   contexter = callPackage ../development/python-modules/contexter { };
 
+  contextvars = callPackage ../development/python-modules/contextvars {};
+
   contextlib2 = callPackage ../development/python-modules/contextlib2 { };
 
   cookiecutter = callPackage ../development/python-modules/cookiecutter { };
-- 
GitLab


From 46440d3426bf3eaeb5082713543ed008c8661a03 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 11 May 2018 09:19:41 -0400
Subject: [PATCH 0508/1085] docker-edge: 18.04.0-ce -> 18.05.0-ce

---
 pkgs/applications/virtualization/docker/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 2a271a96ecd..2ab2bd02219 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -209,10 +209,10 @@ rec {
     tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };
 
-  docker_18_04 = dockerGen rec {
-    version = "18.04.0-ce";
-    rev = "3d479c0af67cb9ea43a9cfc1bf2ef097e06a3470"; # git commit
-    sha256 = "1askbk8b92cdv7vlm688g2f1v2xjhmx77578318x76dydfql3jfl";
+  docker_18_05 = dockerGen rec {
+    version = "18.05.0-ce";
+    rev = "f150324782643a5268a04e7d1a675587125da20e"; # git commit
+    sha256 = "0vgh03qwlfm25sm3yaa6vf5ap2ag575f814ccgcrp5zlcal13r0z";
     runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871";
     runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
     containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9e89c1ac4b..f6d3a7a5b93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15306,10 +15306,10 @@ with pkgs;
   # go 1.9 pin until https://github.com/moby/moby/pull/35739
   inherit (callPackage ../applications/virtualization/docker { go = go_1_9; })
     docker_18_03
-    docker_18_04;
+    docker_18_05;
 
   docker = docker_18_03;
-  docker-edge = docker_18_04;
+  docker-edge = docker_18_05;
 
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
 
-- 
GitLab


From 93b4e6956e0fe80bce72733804ef4983c402120f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 May 2018 01:01:21 +0200
Subject: [PATCH 0509/1085] acpid: fix cross

---
 pkgs/os-specific/linux/acpid/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index 7a234b16c91..f5a0cb25c80 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "acpid-2.0.29";
@@ -8,6 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "1zq38al07z92r2md18zivrzgjqnn7m2wahdpgri6wijwjwkknl2q";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace "AC_FUNC_MALLOC" "" \
+      --replace "AC_FUNC_REALLOC" "" \
+      --replace "strrchr strtol" "strrchr strtol malloc realloc"
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://tedfelix.com/linux/acpid-netlink.html;
     description = "A daemon for delivering ACPI events to userspace programs";
-- 
GitLab


From 183f56f2d62eabb3f60fb7417fdbdfb930d1da31 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 May 2018 14:44:54 +0200
Subject: [PATCH 0510/1085] acpid: 2.0.28 -> 2.0.29

---
 pkgs/os-specific/linux/acpid/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index f5a0cb25c80..ad763d2ee29 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
+  # remove when https://sourceforge.net/p/acpid2/code/merge-requests/1/ is merged
   postPatch = ''
     substituteInPlace configure.ac \
       --replace "AC_FUNC_MALLOC" "" \
-- 
GitLab


From cb44120b8159c0f3f49f6c8ec181b69059da2ff6 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com>
Date: Fri, 11 May 2018 14:41:24 +0100
Subject: [PATCH 0511/1085] Fix typo

---
 pkgs/os-specific/darwin/osx-private-sdk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/osx-private-sdk/default.nix b/pkgs/os-specific/darwin/osx-private-sdk/default.nix
index 1eecdbc5618..115512a6feb 100644
--- a/pkgs/os-specific/darwin/osx-private-sdk/default.nix
+++ b/pkgs/os-specific/darwin/osx-private-sdk/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0bv0884yxpvk2ishxj8gdy1w6wb0gwfq55q5qjp0s8z0z7f63zqh";
   };
 
-  # NOTE: we install only headers that are really needed to keep closure sie
+  # NOTE: we install only headers that are really needed to keep closure size
   # reasonable.
   installPhase = ''
     mkdir -p $out/include
-- 
GitLab


From 5f8ee95642587a4186dacc0beb978193507d6255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Jos=C3=A9=20Ruiz-Henestrosa=20Ruiz?=
 <ruizh.cj@gmail.com>
Date: Fri, 11 May 2018 15:55:24 +0200
Subject: [PATCH 0512/1085] tdesktop: Fix the icon path (#40298)

The `.desktop` file now refers to the icon as `telegram` instead of `telegram-desktop`. This caused a placeholder icon to be shown instead.
---
 .../networking/instant-messengers/telegram/tdesktop/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 2588340de1d..7581482504b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -114,7 +114,7 @@ mkDerivation rec {
     install -m444 "$src/lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop"
     sed "s,/usr/bin,$out/bin,g" $archPatches/tg.protocol > $out/share/kde4/services/tg.protocol
     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"
+      install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram.png"
     done
   '';
 
-- 
GitLab


From 095219565f04916fe5589e7c4757cfb0b777e567 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 08:05:21 -0700
Subject: [PATCH 0513/1085] falkon: 3.0.0 -> 3.0.1

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.0.1 with grep in /nix/store/daa848kdkmv0l77b796h86djs0yn2wwh-falkon-3.0.1
- directory tree listing: https://gist.github.com/f0235aa275d8b64a8b8f61cf7b328049
---
 pkgs/applications/networking/browsers/falkon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
index de56a0605b8..9dad2df7fd0 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "falkon-${version}";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner  = "KDE";
     repo   = "falkon";
     rev    = "v${version}";
-    sha256 = "148idxvx32iwg18m3b7s22awcijnbrywz9r8gnfrq6gpwr0m2jna";
+    sha256 = "1ay1ljrdjcfqwjv4rhf4psh3dfihnvhpmpqcayd3p9lh57x7fh41";
   };
 
   preConfigure = ''
-- 
GitLab


From 9e9cdd7027e6d941fc08c2eb71ed5423cf4a8f01 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 11 May 2018 11:12:15 -0400
Subject: [PATCH 0514/1085] lib: Add more configure flag helpers

Add with/without to match enable/disable, and add
`--{enable,with}-key=value` versions of both.
---
 lib/default.nix | 39 ++++++++++++++++++++-------------------
 lib/strings.nix | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 60ce01a93cd..4ca2e2ea6e3 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -51,11 +51,11 @@ let
     # back-compat aliases
     platforms = systems.forMeta;
 
-    inherit (builtins) add addErrorContext attrNames
-      concatLists deepSeq elem elemAt filter genericClosure genList
-      getAttr hasAttr head isAttrs isBool isInt isList
-      isString length lessThan listToAttrs pathExists readFile
-      replaceStrings seq stringLength sub substring tail;
+    inherit (builtins) add addErrorContext attrNames concatLists
+      deepSeq elem elemAt filter genericClosure genList getAttr
+      hasAttr head isAttrs isBool isInt isList isString length
+      lessThan listToAttrs pathExists readFile replaceStrings seq
+      stringLength sub substring tail;
     inherit (trivial) id const concat or and boolToString mergeAttrs
       flip mapNullable inNixShell min max importJSON warn info
       nixpkgsVersion version mod compare splitByAndCompare
@@ -74,30 +74,32 @@ let
     inherit (lists) singleton foldr fold foldl foldl' imap0 imap1
       concatMap flatten remove findSingle findFirst any all count
       optional optionals toList range partition zipListsWith zipLists
-      reverseList listDfs toposort sort naturalSort compareLists take drop sublist
-      last init crossLists unique intersectLists subtractLists
-      mutuallyExclusive;
+      reverseList listDfs toposort sort naturalSort compareLists take
+      drop sublist last init crossLists unique intersectLists
+      subtractLists mutuallyExclusive;
     inherit (strings) concatStrings concatMapStrings concatImapStrings
       intersperse concatStringsSep concatMapStringsSep
       concatImapStringsSep makeSearchPath makeSearchPathOutput
       makeLibraryPath makeBinPath makePerlPath optionalString
       hasPrefix hasSuffix stringToCharacters stringAsChars escape
-      escapeShellArg escapeShellArgs replaceChars lowerChars upperChars
-      toLower toUpper addContextFrom splitString removePrefix
-      removeSuffix versionOlder versionAtLeast getVersion nameFromURL
-      enableFeature fixedWidthString fixedWidthNumber isStorePath
+      escapeShellArg escapeShellArgs replaceChars lowerChars
+      upperChars toLower toUpper addContextFrom splitString
+      removePrefix removeSuffix versionOlder versionAtLeast getVersion
+      nameFromURL enableFeature enableFeatureAs withFeature
+      withFeatureAs fixedWidthString fixedWidthNumber isStorePath
       toInt readPathsFromFile fileContents;
     inherit (stringsWithDeps) textClosureList textClosureMap
       noDepEntry fullDepEntry packEntry stringAfter;
     inherit (customisation) overrideDerivation makeOverridable
-      callPackageWith callPackagesWith extendDerivation
-      hydraJob makeScope;
+      callPackageWith callPackagesWith extendDerivation hydraJob
+      makeScope;
     inherit (meta) addMetaAttrs dontDistribute setName updateName
       appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio
       hiPrioSet;
     inherit (sources) pathType pathIsDirectory cleanSourceFilter
       cleanSource sourceByRegex sourceFilesBySuffices
-      commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource;
+      commitIdFromGitRepo cleanSourceWith pathHasContext
+      canCleanSource;
     inherit (modules) evalModules closeModules unifyModuleSyntax
       applyIfFunction unpackSubmodule packSubmodule mergeModules
       mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
@@ -119,8 +121,7 @@ let
       traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
       traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal
       traceShowValMarked showVal traceCall traceCall2 traceCall3
-      traceValIfNot runTests testAllTrue traceCallXml
-      attrNamesToStr;
+      traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr;
     inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs
       defaultOverridableDelayableArgs composedArgsAndFun
       maybeAttrNullable maybeAttr ifEnable checkFlag getValue
@@ -129,7 +130,7 @@ let
       closePropagation mapAttrsFlatten nvs setAttr setAttrMerge
       mergeAttrsWithFunc mergeAttrsConcatenateValues
       mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults
-      mergeAttrsByFuncDefaultsClean mergeAttrBy
-      prepareDerivationArgs nixType imap overridableDelayableArgs;
+      mergeAttrsByFuncDefaultsClean mergeAttrBy prepareDerivationArgs
+      nixType imap overridableDelayableArgs;
   });
 in lib
diff --git a/lib/strings.nix b/lib/strings.nix
index 61babf0b1aa..e09ec42bfea 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -414,6 +414,39 @@ rec {
   */
   enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}";
 
+  /* Create an --{enable-<feat>=<value>,disable-<feat>} string that can be passed to
+     standard GNU Autoconf scripts.
+
+     Example:
+       enableFeature true "shared" "foo"
+       => "--enable-shared=foo"
+       enableFeature false "shared" (throw "ignored")
+       => "--disable-shared"
+  */
+  enableFeatureAs = enable: feat: value: enableFeature enable feat + optionalString enable "=${value}";
+
+  /* Create an --{with,without}-<feat> string that can be passed to
+     standard GNU Autoconf scripts.
+
+     Example:
+       withFeature true "shared"
+       => "--with-shared"
+       withFeature false "shared"
+       => "--without-shared"
+  */
+  withFeature = with_: feat: "--${if with_ then "with" else "without"}-${feat}";
+
+  /* Create an --{with-<feat>=<value>,without-<feat>} string that can be passed to
+     standard GNU Autoconf scripts.
+
+     Example:
+       with_Feature true "shared" "foo"
+       => "--with-shared=foo"
+       with_Feature false "shared" (throw "ignored")
+       => "--without-shared"
+  */
+  withFeatureAs = with_: feat: value: withFeature with_ feat + optionalString with_ "=${value}";
+
   /* Create a fixed width string with additional prefix to match
      required width.
 
-- 
GitLab


From 9d0202faa123aac3067065bb3f2ffd47d4610f0b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 8 May 2018 00:19:20 +0200
Subject: [PATCH 0515/1085] tzdata: 2017c -> 2018e

Notable changes:

  - North Korea switches back to +09 on 2018-05-05.
---
 pkgs/data/misc/tzdata/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 6c8fd6229a3..9d2790ff1b5 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,28 +2,31 @@
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
-  version = "2017c";
+  version = "2018e";
 
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n";
+        sha256 = "0bk97fv2i5ns42prpmlaadsswdjwv0ifi7whj2s4q6l44rcqwa3b";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41";
+        sha256 = "1kpb02631s58i068mwq63xlamcv1ffj4p6y4wpb9kdl01vr0qd6a";
       })
     ];
 
   sourceRoot = ".";
 
-  outputs = [ "out" "man" "dev" ];
+  outputs = [ "out" "bin" "man" "dev" ];
   propagatedBuildOutputs = [];
 
   makeFlags = [
     "TOPDIR=$(out)"
     "TZDIR=$(out)/share/zoneinfo"
+    "BINDIR=$(bin)/bin"
+    "ZICDIR=$(bin)/bin"
     "ETCDIR=$(TMPDIR)/etc"
+    "TZDEFAULT=$(TMPDIR)/etc"
     "LIBDIR=$(dev)/lib"
     "MANDIR=$(man)/share/man"
     "AWK=awk"
@@ -58,9 +61,10 @@ stdenv.mkDerivation rec {
 
   setupHook = ./tzdata-setup-hook.sh;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.iana.org/time-zones;
     description = "Database of current and historical time zones";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ fpletz ];
   };
 }
-- 
GitLab


From 59a6f939f83789c2f132bfda50fe0b1dc190f102 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 11 May 2018 18:21:41 +0200
Subject: [PATCH 0516/1085] pythonPackages.prometheus_client: init at 0.2.0

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

diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix
new file mode 100644
index 00000000000..eaf353af082
--- /dev/null
+++ b/pkgs/development/python-modules/prometheus_client/default.nix
@@ -0,0 +1,19 @@
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+  pname = "prometheus_client";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1r3510jq6iryd2a8jln2qpvqy112y5502ncbfkn116xl7gj74r6r";
+  };
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Prometheus instrumentation library for Python applications";
+    homepage = https://github.com/prometheus/client_python;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c805a8ba520..2e8f77d8a90 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18267,6 +18267,8 @@ EOF
   coinmarketcap = callPackage ../development/python-modules/coinmarketcap { };
 
   pyowm = callPackage ../development/python-modules/pyowm { };
+
+  prometheus_client = callPackage ../development/python-modules/prometheus_client { };
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From c4f5d559dad3f86071ddb8de02a9f3ed715d13b8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 11 May 2018 18:22:03 +0200
Subject: [PATCH 0517/1085] home-assistant: add prometheus component dependency

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 6e0e216488d..1fc3a828603 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -256,7 +256,7 @@
     "nuheat" = ps: with ps; [  ];
     "nuimo_controller" = ps: with ps; [  ];
     "pilight" = ps: with ps; [  ];
-    "prometheus" = ps: with ps; [  ];
+    "prometheus" = ps: with ps; [ prometheus_client ];
     "python_script" = ps: with ps; [  ];
     "qwikswitch" = ps: with ps; [  ];
     "rainbird" = ps: with ps; [  ];
-- 
GitLab


From 1a695870402a2f0bc949eb520665991cb181583d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 11 May 2018 18:31:49 +0200
Subject: [PATCH 0518/1085] git-cola: port to qt5

`git-cola` is a simple GUI `git` wrapper based on QT. Since 2.7
(namely https://github.com/git-cola/git-cola/commit/293364b45c4cbf3faff3fd7aba79b474d0abc845)
it supports QT5 which provides a nicer inteface.

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

diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 73f9921d486..391ca26de25 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }:
 
 let
-  inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock;
+  inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock;
 in buildPythonApplication rec {
   name = "git-cola-${version}";
   version = "3.1";
@@ -14,7 +14,7 @@ in buildPythonApplication rec {
   };
 
   buildInputs = [ git gettext ];
-  propagatedBuildInputs = [ pyqt4 sip pyinotify ];
+  propagatedBuildInputs = [ pyqt5 sip pyinotify ];
 
   doCheck = false;
 
-- 
GitLab


From 46fa7ab6863326af795ab34e96cce2719f4961f2 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Tue, 8 May 2018 22:19:22 +0000
Subject: [PATCH 0519/1085] pythonPackages.outcome: init at 0.1.0a0

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

diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix
new file mode 100644
index 00000000000..e91925c75d5
--- /dev/null
+++ b/pkgs/development/python-modules/outcome/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
+, attrs
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "outcome";
+  version = "0.1.0a0";
+  disabled = pythonOlder "3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0cqwakzigw0602dxlb7c1882jwr8hn5nrxk1l8iwlmzc9whh48wn";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ attrs ];
+  # Has a test dependency on trio, which depends on outcome.
+  doCheck = false;
+
+  meta = {
+    description = "Capture the outcome of Python function calls.";
+    homepage = https://github.com/python-trio/outcome;
+    license = with lib.licenses; [ mit asl20 ];
+    maintainers = with lib.maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2e8f77d8a90..05d956de788 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -303,6 +303,8 @@ in {
 
   oauthenticator = callPackage ../development/python-modules/oauthenticator { };
 
+  outcome = callPackage ../development/python-modules/outcome {};
+
   plantuml = callPackage ../tools/misc/plantuml { };
 
   Pmw = callPackage ../development/python-modules/Pmw { };
-- 
GitLab


From c983bbb557d5d201015d71868796777fab46d52b Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Fri, 11 May 2018 16:38:30 +0000
Subject: [PATCH 0520/1085] pythonPackages.trustme: init at 0.4.0

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

diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix
new file mode 100644
index 00000000000..0c3ccb5258e
--- /dev/null
+++ b/pkgs/development/python-modules/trustme/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, cryptography, pytest, pyopenssl, service-identity }:
+
+buildPythonPackage rec {
+  pname = "trustme";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1215vr6l6c0fzsv5gyay82fxd4fidvq2rd94wvjrljs6h2wajazk";
+  };
+
+  checkInputs = [ pytest pyopenssl service-identity ];
+  checkPhase = ''
+    py.test
+  '';
+  propagatedBuildInputs = [
+    cryptography
+  ];
+
+  meta = {
+    description = "#1 quality TLS certs while you wait, for the discerning tester";
+    homepage = https://github.com/python-trio/trustme;
+    license = with lib.licenses; [ mit asl20 ];
+    maintainers = with lib.maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 05d956de788..7a7616e7fff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -438,6 +438,8 @@ in {
     hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; };
   };
 
+  trustme = callPackage ../development/python-modules/trustme {};
+
   tokenserver = callPackage ../development/python-modules/tokenserver {};
 
   toml = callPackage ../development/python-modules/toml { };
-- 
GitLab


From f78c25239e9aaaec67851ce3a5af150b49d6ac49 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Tue, 8 May 2018 22:19:48 +0000
Subject: [PATCH 0521/1085] pythonPackages.trio: init at 0.4.0

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

diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
new file mode 100644
index 00000000000..2bd607170fd
--- /dev/null
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -0,0 +1,42 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
+, attrs
+, sortedcontainers
+, async_generator
+, idna
+, outcome
+, contextvars
+, pytest
+, pyopenssl
+, trustme
+}:
+
+buildPythonPackage rec {
+  pname = "trio";
+  version = "0.4.0";
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ib1x47knlad9pljb64ywfiv6m3dfrqqjwka6j1b73hixmszb5h4";
+  };
+
+  checkInputs = [ pytest pyopenssl trustme ];
+  # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it.
+  checkPhase = ''
+    py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname'
+  '';
+  propagatedBuildInputs = [
+    attrs
+    sortedcontainers
+    async_generator
+    idna
+    outcome
+  ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ];
+
+  meta = {
+    description = "An async/await-native I/O library for humans and snake people";
+    homepage = https://github.com/python-trio/trio;
+    license = with lib.licenses; [ mit asl20 ];
+    maintainers = with lib.maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a7616e7fff..4a4717ea6a7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -440,6 +440,8 @@ in {
 
   trustme = callPackage ../development/python-modules/trustme {};
 
+  trio = callPackage ../development/python-modules/trio {};
+
   tokenserver = callPackage ../development/python-modules/tokenserver {};
 
   toml = callPackage ../development/python-modules/toml { };
-- 
GitLab


From 2d4e30ccb028e2d0369460e2b9b3462a89bf954e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 May 2018 19:05:39 +0200
Subject: [PATCH 0522/1085] graphite2: fix cross

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

diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index a5dc1f41e98..30a99415981 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0xdg6bc02bl8yz39l5i2skczfg17q4lif0qqan0dhvk0mibpcpj7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ freetype cmake ];
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ freetype ];
 
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ];
 
-- 
GitLab


From 0d2a4ed49c81a0cda44b406d454dc58637e94c3a Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 11 May 2018 19:26:35 +0200
Subject: [PATCH 0523/1085] nixos/tests/mesos: wait for all services and ports

to be available before sending requests.
Avoids non-deterministic test failure.
---
 nixos/tests/mesos.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix
index 34671df047c..007d7ac2160 100644
--- a/nixos/tests/mesos.nix
+++ b/nixos/tests/mesos.nix
@@ -66,9 +66,11 @@ import ./make-test.nix ({ pkgs, ...} : rec {
   testScript =
     ''
       startAll;
+      $master->waitForUnit("zookeeper.service");
       $master->waitForUnit("mesos-master.service");
+      $slave->waitForUnit("docker.service");
       $slave->waitForUnit("mesos-slave.service");
-
+      $master->waitForOpenPort(2181);
       $master->waitForOpenPort(5050);
       $slave->waitForOpenPort(5051);
 
-- 
GitLab


From ec00b6fbb3669e1852f537a8b624c6102f3eeb32 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 11 May 2018 19:29:33 +0200
Subject: [PATCH 0524/1085] nixos/mesos-slave: start after docker

If docker is enabled, start mesos-slave.service after docker.service
to avoid a race condition that could result in mesos-slave to fail
with "Failed to create docker: Timed out getting docker version"
---
 nixos/modules/services/misc/mesos-slave.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
index effa29b64f6..468c7f36ecc 100644
--- a/nixos/modules/services/misc/mesos-slave.nix
+++ b/nixos/modules/services/misc/mesos-slave.nix
@@ -187,7 +187,7 @@ in {
     systemd.services.mesos-slave = {
       description = "Mesos Slave";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ;
       path = [ pkgs.runtimeShellPackage ];
       serviceConfig = {
         ExecStart = ''
-- 
GitLab


From 170d799146a02952ead929fb267d40aba977fdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Fri, 11 May 2018 20:53:01 +0200
Subject: [PATCH 0525/1085] kitty: 0.9.0 -> 0.9.1 (#40335)

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

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 49635332525..e9c860f0b90 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -5,7 +5,7 @@
 
 with python3Packages;
 buildPythonApplication rec {
-  version = "0.9.0";
+  version = "0.9.1";
   name = "kitty-${version}";
   format = "other";
 
@@ -13,7 +13,7 @@ buildPythonApplication rec {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "0q6dwwzq1qq3rgh4myxhidgk4bj1p23bhaw5cxb1q0hdgpc54ni8";
+    sha256 = "08j2k3852c64z4mgh1j0dgdj6c2alkckpav67lzg1lxsz3w2izh2";
   };
 
   buildInputs = [
-- 
GitLab


From ac369f6fe8fc102d5bbbb7e25ed15a1bd8f103cd Mon Sep 17 00:00:00 2001
From: mingchuan <sifmelcara@users.noreply.github.com>
Date: Sat, 12 May 2018 02:54:09 +0800
Subject: [PATCH 0526/1085] powerline-go: 1.10.0 -> 1.11.0 (#40369)

---
 pkgs/tools/misc/powerline-go/default.nix |  4 ++--
 pkgs/tools/misc/powerline-go/deps.nix    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix
index e31c0da6306..b0d1afc654d 100644
--- a/pkgs/tools/misc/powerline-go/default.nix
+++ b/pkgs/tools/misc/powerline-go/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "powerline-go";
-  version = "1.10.0";
+  version = "1.11.0";
   name = "${pname}-${version}";
   rev = "v${version}";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "justjanne";
     repo = pname;
     inherit rev;
-    sha256 = "1bmgim61cx6i4m24a474nm3w4zqjflm0wnw3y24299n9dj14izs3";
+    sha256 = "1s3d9p4jf23n63n6vx3frnw3wkmg3kyiazapixy66790qkx6ddi9";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/misc/powerline-go/deps.nix b/pkgs/tools/misc/powerline-go/deps.nix
index 78e28efb3b1..e033a1cf48c 100644
--- a/pkgs/tools/misc/powerline-go/deps.nix
+++ b/pkgs/tools/misc/powerline-go/deps.nix
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shirou/gopsutil";
-      rev = "63047d776e07105e370af46ecbd0ae96850f5ef2";
-      sha256 = "0204f0gx3fd8ya6rb478a7a4gr2v4i3m71148iv3jrdfvr5q5aaw";
+      rev = "57f370e13068146efe1cb7129f79e5d51da8a242";
+      sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb";
     };
   }
   {
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "2b6c08872f4b66da917bb4ce98df4f0307330f78";
-      sha256 = "07wgdhs7ac3qmx0lfr4zazg2l159jqbwmn7jx49rr9811vivl1yh";
+      rev = "2d027ae1dddd4694d54f7a8b6cbe78dca8720226";
+      sha256 = "1fdab3scp9fm88jxwjw8a3hh5ykx6ads3zcacgy48k2n6b0rqrdw";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "79b0c6888797020a994db17c8510466c72fe75d9";
-      sha256 = "0aydjw886c4dwcjg7ssb7xp39ag1529nh3ly1la71rqjr94cjnag";
+      rev = "9950ad118b73f9207b991f01920a3509c68f7f2b";
+      sha256 = "1607m89kpdxgc2lj14mrp02bg7c42g1zv0fzrl5961gvm5qzbjja";
     };
   }
   {
@@ -41,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f";
-      sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr";
+      rev = "7dd2c8130f5e924233f5543598300651c386d431";
+      sha256 = "0ja6skzplirb7dgf5d4wi0navinf8j5iakak020lwm7287wnpcrg";
     };
   }
   {
-- 
GitLab


From 1d2f7dff36517acfabd69d2ad5455c9b2c2655bb Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 11 May 2018 13:51:20 -0500
Subject: [PATCH 0527/1085] gimp: only use libgudev on linux

libgudev relies on udev which is a part of systemd. These are very
tightly coupled to Linux so we just enable them on Linux.
---
 pkgs/applications/graphics/gimp/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 2536367f6ce..80bc2d49efc 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -43,11 +43,12 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ];
   propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc
   buildInputs = [
-    babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes libgudev
+    babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes
     freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr
     libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp
     python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ];
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ];
 
   pythonPath = [ pygtk ];
 
-- 
GitLab


From 341794a4b9e8e88e7a346e6972797be134688e1d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 11 May 2018 15:02:18 -0400
Subject: [PATCH 0528/1085] lib/systems: Sort platforms, and space CPUs

---
 lib/systems/examples.nix  |  10 +--
 lib/systems/parse.nix     |   5 ++
 lib/systems/platforms.nix | 178 +++++++++++++++++++++-----------------
 3 files changed, 106 insertions(+), 87 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 32c24bab7c9..05c788ddd1a 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -47,15 +47,7 @@ rec {
 
   ben-nanonote = rec {
     config = "mipsel-unknown-linux-uclibc";
-    platform = {
-      name = "ben_nanonote";
-      kernelMajor = "2.6";
-      kernelArch = "mips";
-      gcc = {
-        arch = "mips32";
-        float = "soft";
-      };
-    };
+    platform = platforms.ben_nanonote;
   };
 
   fuloongminipc = rec {
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 3667766aa9f..33daf079164 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -79,15 +79,20 @@ rec {
     armv8r   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv8m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; };
+
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
+
     mips     = { bits = 32; significantByte = bigEndian;    family = "mips"; };
     mipsel   = { bits = 32; significantByte = littleEndian; family = "mips"; };
     mips64   = { bits = 64; significantByte = bigEndian;    family = "mips"; };
     mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
+
     powerpc  = { bits = 32; significantByte = bigEndian;    family = "power"; };
+
     riscv32  = { bits = 32; significantByte = littleEndian; family = "riscv"; };
     riscv64  = { bits = 64; significantByte = littleEndian; family = "riscv"; };
+
     wasm32   = { bits = 32; significantByte = littleEndian; family = "wasm"; };
     wasm64   = { bits = 64; significantByte = littleEndian; family = "wasm"; };
   };
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index d6587ac49a8..cceaecf0184 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -20,6 +20,10 @@ rec {
     kernelAutoModules = false;
   };
 
+  ##
+  ## ARM
+  ##
+
   pogoplug4 = {
     name = "pogoplug4";
 
@@ -372,84 +376,6 @@ rec {
     kernelBaseConfig = "guruplug_defconfig";
   };
 
-  fuloong2f_n32 = {
-    name = "fuloong2f_n32";
-    kernelMajor = "2.6";
-    kernelBaseConfig = "lemote2f_defconfig";
-    kernelArch = "mips";
-    kernelAutoModules = false;
-    kernelExtraConfig = ''
-      MIGRATION n
-      COMPACTION n
-
-      # nixos mounts some cgroup
-      CGROUPS y
-
-      BLK_DEV_RAM y
-      BLK_DEV_INITRD y
-      BLK_DEV_CRYPTOLOOP m
-      BLK_DEV_DM m
-      DM_CRYPT m
-      MD y
-      REISERFS_FS m
-      EXT4_FS m
-      USB_STORAGE_CYPRESS_ATACB m
-
-      IP_PNP y
-      IP_PNP_DHCP y
-      IP_PNP_BOOTP y
-      NFS_FS y
-      ROOT_NFS y
-      TUN m
-      NFS_V4 y
-      NFS_V4_1 y
-      NFS_FSCACHE y
-      NFSD m
-      NFSD_V2_ACL y
-      NFSD_V3 y
-      NFSD_V3_ACL y
-      NFSD_V4 y
-
-      # Fail to build
-      DRM n
-      SCSI_ADVANSYS n
-      USB_ISP1362_HCD n
-      SND_SOC n
-      SND_ALI5451 n
-      FB_SAVAGE n
-      SCSI_NSP32 n
-      ATA_SFF n
-      SUNGEM n
-      IRDA n
-      ATM_HE n
-      SCSI_ACARD n
-      BLK_DEV_CMD640_ENHANCED n
-
-      FUSE_FS m
-
-      # Needed for udev >= 150
-      SYSFS_DEPRECATED_V2 n
-
-      VGA_CONSOLE n
-      VT_HW_CONSOLE_BINDING y
-      SERIAL_8250_CONSOLE y
-      FRAMEBUFFER_CONSOLE y
-      EXT2_FS y
-      EXT3_FS y
-      REISERFS_FS y
-      MAGIC_SYSRQ y
-
-      # The kernel doesn't boot at all, with FTRACE
-      FTRACE n
-    '';
-    kernelTarget = "vmlinux";
-    gcc = {
-      arch = "loongson2f";
-      float = "hard";
-      abi = "n32";
-    };
-  };
-
   beaglebone = armv7l-hf-multiplatform // {
     name = "beaglebone";
     kernelBaseConfig = "bb.org_defconfig";
@@ -537,6 +463,102 @@ rec {
     };
   };
 
+  ##
+  ## MIPS
+  ##
+
+  ben_nanonote = {
+    name = "ben_nanonote";
+    kernelMajor = "2.6";
+    kernelArch = "mips";
+    gcc = {
+      arch = "mips32";
+      float = "soft";
+    };
+  };
+
+  fuloong2f_n32 = {
+    name = "fuloong2f_n32";
+    kernelMajor = "2.6";
+    kernelBaseConfig = "lemote2f_defconfig";
+    kernelArch = "mips";
+    kernelAutoModules = false;
+    kernelExtraConfig = ''
+      MIGRATION n
+      COMPACTION n
+
+      # nixos mounts some cgroup
+      CGROUPS y
+
+      BLK_DEV_RAM y
+      BLK_DEV_INITRD y
+      BLK_DEV_CRYPTOLOOP m
+      BLK_DEV_DM m
+      DM_CRYPT m
+      MD y
+      REISERFS_FS m
+      EXT4_FS m
+      USB_STORAGE_CYPRESS_ATACB m
+
+      IP_PNP y
+      IP_PNP_DHCP y
+      IP_PNP_BOOTP y
+      NFS_FS y
+      ROOT_NFS y
+      TUN m
+      NFS_V4 y
+      NFS_V4_1 y
+      NFS_FSCACHE y
+      NFSD m
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
+
+      # Fail to build
+      DRM n
+      SCSI_ADVANSYS n
+      USB_ISP1362_HCD n
+      SND_SOC n
+      SND_ALI5451 n
+      FB_SAVAGE n
+      SCSI_NSP32 n
+      ATA_SFF n
+      SUNGEM n
+      IRDA n
+      ATM_HE n
+      SCSI_ACARD n
+      BLK_DEV_CMD640_ENHANCED n
+
+      FUSE_FS m
+
+      # Needed for udev >= 150
+      SYSFS_DEPRECATED_V2 n
+
+      VGA_CONSOLE n
+      VT_HW_CONSOLE_BINDING y
+      SERIAL_8250_CONSOLE y
+      FRAMEBUFFER_CONSOLE y
+      EXT2_FS y
+      EXT3_FS y
+      REISERFS_FS y
+      MAGIC_SYSRQ y
+
+      # The kernel doesn't boot at all, with FTRACE
+      FTRACE n
+    '';
+    kernelTarget = "vmlinux";
+    gcc = {
+      arch = "loongson2f";
+      float = "hard";
+      abi = "n32";
+    };
+  };
+
+  ##
+  ## Other
+  ##
+
   riscv-multiplatform = bits: {
     name = "riscv-multiplatform";
     kernelArch = "riscv";
-- 
GitLab


From cd9b1b16659fa200359e0a28a1c3cfa9c7c796a0 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Fri, 11 May 2018 21:29:45 +0200
Subject: [PATCH 0529/1085] openmpi: 3.0.1 -> 3.1.0 (#40344)

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

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 2d3b9780090..1748ebd5f3c 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -8,15 +8,15 @@
 }:
 
 let
-  majorVersion = "3.0";
-  minorVersion = "1";
+  majorVersion = "3.1";
+  minorVersion = "0";
 
 in stdenv.mkDerivation rec {
   name = "openmpi-${majorVersion}.${minorVersion}";
 
   src = fetchurl {
     url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";
-    sha256 = "0pbqrm5faf57nasy1s81wqivl7zvxmv8lzjh8hvb0f3qxv8m0d36";
+    sha256 = "0v7hrmf1z5d1rmm0z5gi79l536j3z5s5b0kf9q5rr1fc4i0h8p5j";
   };
 
   postPatch = ''
-- 
GitLab


From 7c2d43f3f93fbffec09cbf7a1b9b0b53bc58568b Mon Sep 17 00:00:00 2001
From: Scott Trinh <scottyparade@gmail.com>
Date: Fri, 11 May 2018 15:31:56 -0400
Subject: [PATCH 0530/1085] Fix small typo in configuration documentation
 (#40357)

* Fix small typo in configuration documentation
* doc: Fix second instance of same typo
---
 doc/configuration.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/configuration.xml b/doc/configuration.xml
index 4411b4844e9..c91f38f3093 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -378,7 +378,7 @@
     myPackages = pkgs.buildEnv {
       name = "my-packages";
       paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ];
-      pathsToLink = [ "/share/man" "/share/doc" /bin" ];
+      pathsToLink = [ "/share/man" "/share/doc" "/bin" ];
       extraOutputsToInstall = [ "man" "doc" ];
     };
   };
@@ -416,7 +416,7 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
         nox
         silver-searcher
       ];
-      pathsToLink = [ "/share/man" "/share/doc" /bin" "/etc" ];
+      pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ];
       extraOutputsToInstall = [ "man" "doc" ];
     };
   };
-- 
GitLab


From 4f06c77709cb23bd10927c85d4bf24ed4ed82eb2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 11 May 2018 12:35:27 -0700
Subject: [PATCH 0531/1085] hstr: 1.24 -> 1.25 (#40352)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/7z31mpl2b4dh98vvb04nx4hzrrh5k6ak-hstr-1.25/bin/hh -h’ got 0 exit code
- ran ‘/nix/store/7z31mpl2b4dh98vvb04nx4hzrrh5k6ak-hstr-1.25/bin/hh --help’ got 0 exit code
- ran ‘/nix/store/7z31mpl2b4dh98vvb04nx4hzrrh5k6ak-hstr-1.25/bin/hstr -h’ got 0 exit code
- ran ‘/nix/store/7z31mpl2b4dh98vvb04nx4hzrrh5k6ak-hstr-1.25/bin/hstr --help’ got 0 exit code
- found 1.25 with grep in /nix/store/7z31mpl2b4dh98vvb04nx4hzrrh5k6ak-hstr-1.25
- directory tree listing: https://gist.github.com/78f6aa615325f274537cb003e3aabf26
---
 pkgs/applications/misc/hstr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index db50b0d2169..026cf9ecc14 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "hstr-${version}";
-  version = "1.24";
+  version = "1.25";
 
   src = fetchurl {
     url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
-    sha256 = "0w8is777fwq6r17zhl9xwrv9f7vanllzjiasx1pg6pxvppq7rh0x";
+    sha256 = "10njj0a3s5czv497wk3whka3gxr7vmhabs12vaw7kgb07h4ssnhg";
   };
 
   buildInputs = [ readline ncurses ];
-- 
GitLab


From d3e3e131f565be1d72e98980e0e22cc0b05f46ec Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 11 May 2018 21:48:38 +0200
Subject: [PATCH 0532/1085] fuse3: 3.2.2 -> 3.2.3

---
 pkgs/os-specific/linux/fuse/common.nix              | 13 +++++--------
 pkgs/os-specific/linux/fuse/default.nix             |  7 ++-----
 pkgs/os-specific/linux/fuse/fuse3-fix-version.patch |  8 --------
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/fuse/fuse3-fix-version.patch

diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index 95011653ad0..04a4a1a0e1f 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -1,4 +1,4 @@
-{ version, sha256Hash, maintainers }:
+{ version, sha256Hash }:
 
 { stdenv, fetchFromGitHub, fetchpatch
 , fusePackages, utillinux, gettext
@@ -28,10 +28,7 @@ in stdenv.mkDerivation rec {
         url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
         sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
       })
-    ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch
-    # TODO: Only relevant for 3.2.2 (opened an upstream issue)
-    ++ stdenv.lib.optional isFuse3 ./fuse3-fix-version.patch;
-
+    ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch;
 
   nativeBuildInputs = if isFuse3
     then [ meson ninja pkgconfig ]
@@ -76,10 +73,10 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "Kernel module and library that allows filesystems to be implemented in user space";
-    platforms = stdenv.lib.platforms.linux;
-    inherit maintainers;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.primeos ];
   };
 }
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index ddf280bbe2f..f308930f0dc 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -4,17 +4,14 @@ let
   mkFuse = args: callPackage (import ./common.nix args) {
     inherit utillinux;
   };
-  maintainers = stdenv.lib.maintainers;
 in {
   fuse_2 = mkFuse {
     version = "2.9.7";
     sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2";
-    maintainers = [ ];
   };
 
   fuse_3 = mkFuse {
-    version = "3.2.2";
-    sha256Hash = "1a0x4vpyg9lc6clwvx995mk0v6jqd37xabzp9rpdir37x814g3wh";
-    maintainers = [ maintainers.primeos ];
+    version = "3.2.3";
+    sha256Hash = "185p1vjcsyzpcdkrcyw06zpapv4jc43qw9i8a4amzpgk1rsgg19d";
   };
 }
diff --git a/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch b/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch
deleted file mode 100644
index b6351aab3c0..00000000000
--- a/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/meson.build	2018-04-01 01:05:19.612723597 +0200
-+++ b/meson.build	2018-04-01 01:40:58.171109615 +0200
-@@ -1,4 +1,4 @@
--project('libfuse3', 'c', version: '3.2.1',
-+project('libfuse3', 'c', version: '3.2.2',
-         meson_version: '>= 0.38',
-         default_options: [ 'buildtype=debugoptimized' ])
-
-- 
GitLab


From 18370267efa8f210b96ce74c7fdc37fc419ec187 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Sat, 12 May 2018 02:12:04 +0400
Subject: [PATCH 0533/1085] chromium: 66.0.3359.139 -> 66.0.3359.170

Update includes 4 security fixes, including one critical (see [0]):

* [835887] Critical: Chain leading to sandbox escape. Reported by Anonymous on 2018-04-23:
* [836858] High CVE-2018-6121: Privilege Escalation in extensions.
* [836141] High CVE-2018-6122: Type confusion in V8.
* [$5000][833721] High CVE-2018-6120: Heap buffer overflow in PDFium.  Reported by Zhou Aiting(@zhouat1) of Qihoo 360 Vulcan Team on 2018-04-17

[0] https://chromereleases.googleblog.com/2018/05/stable-channel-update-for-desktop.html

PS: Didn't build Beta and Dev, verified only Stable for now

cc @bendlas @aszlig
---
 .../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 7be5d259115..147e8d33a0e 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 = "136gx9qqbzfzaf19k0gxb8n4ypd4ycyr83i9v68nqdvy2k26vf4n";
-    sha256bin64 = "0w628afj5k4xygizlznwxkljgc1prxqc3lanaz6gdmyrl7gk1s7n";
-    version = "67.0.3396.18";
+    sha256 = "169lxj6rhpqcnrg3n2api82975hkifz6wmks1bh04jkxw0z2vkny";
+    sha256bin64 = "1hd4s35yhi2xidy3xncp66p03cv715bzbf3gcv5dl0d1h3nmhhdf";
+    version = "67.0.3396.40";
   };
   dev = {
-    sha256 = "1yspf0n385ail9qxsmax58mfk5yi473ygsraqs83q30pfgxc5z2f";
-    sha256bin64 = "1gi1xpnjwkg7sxv94ksv6fiymw13rxdq2hyvza8b9famvfcaz07j";
-    version = "68.0.3409.2";
+    sha256 = "0j4vcfbdj8cvdsmnb6pz0k71w559rm3ka1yyv0yfq7f756hinpvp";
+    sha256bin64 = "1qqhyjdd227psvr904w3d3lq47bfwmpk6f7sam2gp4j0wxn23w8w";
+    version = "68.0.3423.2";
   };
   stable = {
-    sha256 = "1ck4wbi28702p1lfs4sz894ysbgm7fj79wrqj8srsy65z2ssaxdy";
-    sha256bin64 = "1vgrgay3h0961vj96ql2p0pb16gzfr48r4hk25rxdqbflnz7njz0";
-    version = "66.0.3359.139";
+    sha256 = "1pki90vnc8amzdwagcsnkwnqnw4k442234x8wfc7cf0rkmjackc6";
+    sha256bin64 = "0a68w4p0dqxal7xh7nlfzsj7yl9xxp1bq3khfnpa3r7r38zbxnpw";
+    version = "66.0.3359.170";
   };
 }
-- 
GitLab


From 2490c50346250a15d84067b16722a1a9ec3e2aae Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 12 May 2018 00:23:34 +0200
Subject: [PATCH 0534/1085] signal-desktop: 1.10.0 -> 1.10.1

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

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 4fe4d6ceca2..80f219560e3 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,13 +40,13 @@ in
   stdenv.mkDerivation rec {
     name = "signal-desktop-${version}";
 
-    version = "1.10.0";
+    version = "1.10.1";
 
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-          sha256 = "0fjc5zf3lr5pmlc57yv3spjk2hq4b3lxngc6iw6c73ficnz4ij7i";
+          sha256 = "1ndk2in9mbsm5i2k7pgpbd6smbgpswxmjvr12zmbmw893ay015h3";
         }
       else
         throw "Signal for Desktop is not currently supported on ${stdenv.system}";
-- 
GitLab


From e3f6c6d18d8ffbb4f9462adbf6648500b9514bbb Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 11 May 2018 17:35:56 -0400
Subject: [PATCH 0535/1085] lib: Add 32-bit Android platforms

---
 lib/systems/examples.nix  | 12 ++++++++++++
 lib/systems/platforms.nix | 21 +++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 05c788ddd1a..87da31f3137 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -29,6 +29,18 @@ rec {
     platform = platforms.aarch64-multiplatform;
   };
 
+  armv5te-android-prebuilt = rec {
+    config = "armv5tel-unknown-linux-androideabi";
+    platform = platforms.armv5te-android;
+    useAndroidPrebuilt = true;
+  };
+
+  armv7a-android-prebuilt = rec {
+    config = "armv7a-unknown-linux-androideabi";
+    platform = platforms.armv7a-android;
+    useAndroidPrebuilt = true;
+  };
+
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
     platform = platforms.aarch64-multiplatform;
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index cceaecf0184..5becaf581a4 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -384,6 +384,27 @@ rec {
     kernelTarget = "zImage";
   };
 
+  # https://developer.android.com/ndk/guides/abis#armeabi
+  armv5te-android = {
+    name = "armeabi";
+    gcc = {
+      arch = "armv5te";
+      float = "soft";
+      float-abi = "soft";
+    };
+  };
+
+  # https://developer.android.com/ndk/guides/abis#v7a
+  armv7a-android =  {
+    name = "armeabi-v7a";
+    gcc = {
+      arch = "armv7-a";
+      float = "hard";
+      float-abi = "softfp";
+      fpu = "vfpv3-d16";
+    };
+  };
+
   armv7l-hf-multiplatform = {
     name = "armv7l-hf-multiplatform";
     kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc.
-- 
GitLab


From f4de66977749f733b9a13d5f03550960ff800b0b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 11 May 2018 18:30:38 -0400
Subject: [PATCH 0536/1085] lib/systems/inspect: Fix after assertions

Function are never equal in Nix, so we need to filter out this attribute
in ABIs.
---
 lib/systems/inspect.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 9960954e464..c0c283469fe 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -3,6 +3,9 @@ with import ./parse.nix { inherit lib; };
 with lib.attrsets;
 with lib.lists;
 
+let abis_ = abis; in
+let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis_; in
+
 rec {
   patterns = rec {
     isi686         = { cpu = cpuTypes.i686; };
-- 
GitLab


From 28bacc2093a43c21f34a192397d2b2561a9fd29d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 11 May 2018 17:35:56 -0400
Subject: [PATCH 0537/1085] lib/systems: Add assertion to "android" ABI

This is analogous to the GNU assertion.
---
 lib/systems/parse.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 02ca3a6b361..3dba5ad4698 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -199,8 +199,16 @@ rec {
     msvc         = {};
     eabi         = {};
 
-    androideabi  = {};
-    android      = {};
+    androideabi  = { float = "hard"; };
+    android      = {
+      assertions = [
+        { assertion = platform: !platform.isAarch32;
+          message = ''
+            The "android" ABI is not for 32-bit ARM. Use "androideabi" instead.
+          '';
+        }
+      ];
+    };
 
     gnueabi      = { float = "soft"; };
     gnueabihf    = { float = "hard"; };
-- 
GitLab


From 827ef0914089e1a2bba140b49e1311eff28cc156 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 27 Feb 2018 18:36:48 -0500
Subject: [PATCH 0538/1085] prebuilt android cc: Edit wrapper to pass the right
 -m flags for armv7a

---
 lib/systems/examples.nix                      |  3 ++
 .../mobile/androidenv/androidndk-pkgs.nix     | 33 ++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 897ba448b95..9c43d9b1bbc 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -31,18 +31,21 @@ rec {
 
   armv5te-android-prebuilt = rec {
     config = "armv5tel-unknown-linux-androideabi";
+    sdkVer = "21";
     platform = platforms.armv5te-android;
     useAndroidPrebuilt = true;
   };
 
   armv7a-android-prebuilt = rec {
     config = "armv7a-unknown-linux-androideabi";
+    sdkVer = "21";
     platform = platforms.armv7a-android;
     useAndroidPrebuilt = true;
   };
 
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
+    sdkVer = "21";
     platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index 19fc0dc812d..f0557390988 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -15,7 +15,12 @@ let
     "x86_64-unknown-linux-gnu" = {
       double = "linux-x86_64";
     };
-    "arm-unknown-linux-androideabi" = {
+   "armv5tel-unknown-linux-androideabi" = {
+      arch = "arm";
+      triple = "arm-linux-androideabi";
+      gccVer = "4.8";
+    };
+   "armv7a-unknown-linux-androideabi" = {
       arch = "arm";
       triple = "arm-linux-androideabi";
       gccVer = "4.8";
@@ -59,9 +64,29 @@ rec {
     cc = binaries;
     bintools = binutils;
     libc = targetAndroidndkPkgs.libraries;
-    extraBuildCommands =
+    extraBuildCommands = lib.optionalString targetPlatform.isAarch32 (let
+        p = targetPlatform.platform.gcc or {};
+        float = p.float or (targetPlatform.parsed.abi.float or null);
+        flags = lib.concatLists [
+          (lib.optional (p ? arch) "-march=${p.arch}")
+          (lib.optional (p ? cpu) "-mcpu=${p.cpu}")
+          (lib.optional (p ? abi) "-mabi=${p.abi}")
+          (lib.optional (p ? fpu) "-mfpu=${p.fpu}")
+          (lib.optional (float != null) "-mfloat=${float}")
+          (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}")
+          (lib.optional (p ? mode) "-mmode=${p.mode}")
+        ];
+      in ''
+        sed -E -i \
+          $out/bin/${targetPlatform.config}-cc \
+          $out/bin/${targetPlatform.config}-c++ \
+          $out/bin/${targetPlatform.config}-gcc \
+          $out/bin/${targetPlatform.config}-g++ \
+          -e '130i    extraBefore+=(-Wl,--fix-cortex-a8)' \
+          -e 's|^(extraBefore=)\(\)$|\1(${builtins.toString flags})|'
+      '')
       # GCC 4.9 is the first relase with "-fstack-protector"
-      lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''
+      + lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''
         sed -E \
         -i $out/nix-support/add-hardening.sh \
         -e 's|(-fstack-protector)-strong|\1|g'
@@ -76,7 +101,7 @@ rec {
   libraries = {
     name = "bionic-prebuilt";
     type = "derivation";
-    outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-21/arch-${hostInfo.arch}/usr/";
+    outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/";
     drvPath = throw "fake derivation, build ${buildAndroidndk} to use";
   };
 }
-- 
GitLab


From e4777ae2d84c5f38740b744fe85e305f1a2f0209 Mon Sep 17 00:00:00 2001
From: Ihor Antonov <ngortheone@gmail.com>
Date: Wed, 2 May 2018 11:13:13 -0400
Subject: [PATCH 0539/1085] Fix kernel panic on ec2 kvm instances caused by io
 timeout on nvme root volume

---
 nixos/maintainers/scripts/ec2/amazon-image.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 972c04453ae..5ab5d400e05 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -8,6 +8,11 @@ in {
 
   imports = [ ../../../modules/virtualisation/amazon-image.nix ];
 
+  # Required to avoid kernel panics on KVM instances where nvme volume availability can get delayed
+  # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes
+  # TODO change value to 4294967295 when kernel is updated to 4.15 or later
+  config.boot.kernelParams = [ "nvme_core.io_timeout=255" ];
+
   options.amazonImage = {
     name = mkOption {
       type = types.str;
-- 
GitLab


From 08ebd830a559692f9b34a1619cca44b1888468a0 Mon Sep 17 00:00:00 2001
From: Ihor Antonov <ngortheone@gmail.com>
Date: Wed, 9 May 2018 10:15:16 -0400
Subject: [PATCH 0540/1085] Fix kernel crash caused by absent root device

---
 .../maintainers/scripts/ec2/amazon-image.nix  |  2 +-
 nixos/modules/system/boot/grow-partition.nix  |  2 +-
 nixos/modules/system/boot/stage-1-init.sh     | 50 ++++++++++---------
 nixos/modules/virtualisation/amazon-image.nix |  7 ---
 4 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 5ab5d400e05..eeae27ede0f 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -8,7 +8,7 @@ in {
 
   imports = [ ../../../modules/virtualisation/amazon-image.nix ];
 
-  # Required to avoid kernel panics on KVM instances where nvme volume availability can get delayed
+  # Required to provide good EBS experience,
   # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes
   # TODO change value to 4294967295 when kernel is updated to 4.15 or later
   config.boot.kernelParams = [ "nvme_core.io_timeout=255" ];
diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix
index 1e6f9e442b6..8c9b1502558 100644
--- a/nixos/modules/system/boot/grow-partition.nix
+++ b/nixos/modules/system/boot/grow-partition.nix
@@ -30,7 +30,7 @@ with lib;
 
     boot.initrd.postDeviceCommands = ''
       rootDevice="${config.fileSystems."/".device}"
-      if [ -e "$rootDevice" ]; then
+      if waitDevice "$rootDevice"; then
         rootDevice="$(readlink -f "$rootDevice")"
         parentDevice="$rootDevice"
         while [ "''${parentDevice%[0-9]}" != "''${parentDevice}" ]; do
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 964ec68cfe2..1facf419ed0 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -74,6 +74,32 @@ ln -s /proc/mounts /etc/mtab # to shut up mke2fs
 touch /etc/udev/hwdb.bin # to shut up udev
 touch /etc/initrd-release
 
+# Function for waiting a device to appear.
+waitDevice() {
+    local device="$1"
+
+    # USB storage devices tend to appear with some delay.  It would be
+    # great if we had a way to synchronously wait for them, but
+    # alas...  So just wait for a few seconds for the device to
+    # appear.
+    if test ! -e $device; then
+        echo -n "waiting for device $device to appear..."
+        try=20
+        while [ $try -gt 0 ]; do
+            sleep 1
+            # also re-try lvm activation now that new block devices might have appeared
+            lvm vgchange -ay
+            # and tell udev to create nodes for the new LVs
+            udevadm trigger --action=add
+            if test -e $device; then break; fi
+            echo -n "."
+            try=$((try - 1))
+        done
+        echo
+        [ $try -ne 0 ]
+    fi
+}
+
 # Mount special file systems.
 specialMount() {
   local device="$1"
@@ -377,31 +403,7 @@ lustrateRoot () {
     exec 4>&-
 }
 
-# Function for waiting a device to appear.
-waitDevice() {
-    local device="$1"
 
-    # USB storage devices tend to appear with some delay.  It would be
-    # great if we had a way to synchronously wait for them, but
-    # alas...  So just wait for a few seconds for the device to
-    # appear.
-    if test ! -e $device; then
-        echo -n "waiting for device $device to appear..."
-        try=20
-        while [ $try -gt 0 ]; do
-            sleep 1
-            # also re-try lvm activation now that new block devices might have appeared
-            lvm vgchange -ay
-            # and tell udev to create nodes for the new LVs
-            udevadm trigger --action=add
-            if test -e $device; then break; fi
-            echo -n "."
-            try=$((try - 1))
-        done
-        echo
-        [ $try -ne 0 ]
-    fi
-}
 
 
 # Try to resume - all modules are loaded now.
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index f74c42a777f..e9e935e9020 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -48,13 +48,6 @@ let cfg = config.ec2; in
     boot.loader.grub.extraPerEntryConfig = mkIf (!cfg.hvm) "root (hd0)";
     boot.loader.timeout = 0;
 
-    boot.initrd.postDeviceCommands =
-      ''
-        # Force udev to exit to prevent random "Device or resource busy
-        # while trying to open /dev/xvda" errors from fsck.
-        udevadm control --exit || true
-      '';
-
     boot.initrd.network.enable = true;
 
     # Mount all formatted ephemeral disks and activate all swap devices.
-- 
GitLab


From 13f83ba05fbf8a70a497f3136f35e7fe604d0bc0 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 12 May 2018 02:16:25 +0200
Subject: [PATCH 0541/1085] nixos/tests/kafka: fix and refactor tests

- refactor into single file for all versions
- improve timing, prevent non-deterministic failures
- fix tests for i686-linux
---
 nixos/release.nix          |  5 +--
 nixos/tests/kafka.nix      | 68 ++++++++++++++++++++++++++++++++++++++
 nixos/tests/kafka_0_10.nix | 48 ---------------------------
 nixos/tests/kafka_0_11.nix | 48 ---------------------------
 nixos/tests/kafka_0_9.nix  | 48 ---------------------------
 nixos/tests/kafka_1_0.nix  | 48 ---------------------------
 6 files changed, 69 insertions(+), 196 deletions(-)
 create mode 100644 nixos/tests/kafka.nix
 delete mode 100644 nixos/tests/kafka_0_10.nix
 delete mode 100644 nixos/tests/kafka_0_11.nix
 delete mode 100644 nixos/tests/kafka_0_9.nix
 delete mode 100644 nixos/tests/kafka_1_0.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index ae70b535a5e..57fc245e57d 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -313,10 +313,7 @@ in rec {
   tests.plotinus = callTest tests/plotinus.nix {};
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};
-  tests.kafka_0_9 = callTest tests/kafka_0_9.nix {};
-  tests.kafka_0_10 = callTest tests/kafka_0_10.nix {};
-  tests.kafka_0_11 = callTest tests/kafka_0_11.nix {};
-  tests.kafka_1_0 = callTest tests/kafka_1_0.nix {};
+  tests.kafka = callSubTests tests/kafka.nix {};
   tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
   tests.kernel-latest = callTest tests/kernel-latest.nix {};
   tests.kernel-lts = callTest tests/kernel-lts.nix {};
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
new file mode 100644
index 00000000000..6209b4b8e2b
--- /dev/null
+++ b/nixos/tests/kafka.nix
@@ -0,0 +1,68 @@
+{ system ? builtins.currentSystem }:
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
+
+let
+  makeKafkaTest = name: kafkaPackage: (makeTest {
+    inherit name;
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ nequissimus ];
+    };
+
+    nodes = {
+      zookeeper1 = { config, ... }: {
+        services.zookeeper = {
+          enable = true;
+        };
+
+        networking.firewall.allowedTCPPorts = [ 2181 ];
+        virtualisation.memorySize = 1024;
+      };
+      kafka = { config, ... }: {
+        services.apache-kafka = {
+          enable = true;
+          extraProperties = ''
+            offsets.topic.replication.factor = 1
+            zookeeper.session.timeout.ms = 600000
+          '';
+          package = kafkaPackage;
+          zookeeper = "zookeeper1:2181";
+          # These are the default options, but UseCompressedOops doesn't work with 32bit JVM
+          jvmOptions = [
+            "-server" "-Xmx1G" "-Xms1G" "-XX:+UseParNewGC" "-XX:+UseConcMarkSweepGC" "-XX:+CMSClassUnloadingEnabled"
+            "-XX:+CMSScavengeBeforeRemark" "-XX:+DisableExplicitGC" "-Djava.awt.headless=true" "-Djava.net.preferIPv4Stack=true"
+          ] ++ optionals (! pkgs.stdenv.isi686 ) [ "-XX:+UseCompressedOops" ];
+        };
+
+        networking.firewall.allowedTCPPorts = [ 9092 ];
+        # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048)
+        virtualisation.memorySize = 2047; 
+      };
+    };
+
+    testScript = ''
+      startAll;
+
+      $zookeeper1->waitForUnit("default.target");
+      $zookeeper1->waitForUnit("zookeeper.service");
+      $zookeeper1->waitForOpenPort(2181);
+
+      $kafka->waitForUnit("default.target");
+      $kafka->waitForUnit("apache-kafka.service");
+      $kafka->waitForOpenPort(9092);
+
+      $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+      $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+    '' + (if name == "kafka_0_9" then ''
+      $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+    '' else ''
+      $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+    '');
+  });
+
+in with pkgs; {
+  kafka_0_9  = makeKafkaTest "kafka_0_9"  apacheKafka_0_9;
+  kafka_0_10 = makeKafkaTest "kafka_0_10" apacheKafka_0_10;
+  kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11;
+  kafka_1_0  = makeKafkaTest "kafka_1_0"  apacheKafka_1_0;
+}
diff --git a/nixos/tests/kafka_0_10.nix b/nixos/tests/kafka_0_10.nix
deleted file mode 100644
index 6e7820f64bc..00000000000
--- a/nixos/tests/kafka_0_10.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-import ./make-test.nix ({ pkgs, lib, ... } :
-let
-  kafkaPackage = pkgs.apacheKafka_0_10;
-in {
-  name = "kafka_0_10";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  nodes = {
-    zookeeper1 = { config, ... }: {
-      services.zookeeper = {
-        enable = true;
-      };
-
-      networking.firewall.allowedTCPPorts = [ 2181 ];
-    };
-    kafka = { config, ... }: {
-      services.apache-kafka = {
-        enable = true;
-        extraProperties = ''
-          offsets.topic.replication.factor = 1
-        '';
-        package = kafkaPackage;
-        zookeeper = "zookeeper1:2181";
-      };
-
-      networking.firewall.allowedTCPPorts = [ 9092 ];
-      virtualisation.memorySize = 2048;
-    };
-  };
-
-  testScript = ''
-    startAll;
-
-    $zookeeper1->waitForUnit("zookeeper");
-    $zookeeper1->waitForUnit("network.target");
-    $zookeeper1->waitForOpenPort(2181);
-
-    $kafka->waitForUnit("apache-kafka");
-    $kafka->waitForUnit("network.target");
-    $kafka->waitForOpenPort(9092);
-
-    $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
-    $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
-    $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
-  '';
-})
diff --git a/nixos/tests/kafka_0_11.nix b/nixos/tests/kafka_0_11.nix
deleted file mode 100644
index 39f9c36bb22..00000000000
--- a/nixos/tests/kafka_0_11.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-import ./make-test.nix ({ pkgs, lib, ... } :
-let
-  kafkaPackage = pkgs.apacheKafka_0_11;
-in {
-  name = "kafka_0_11";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  nodes = {
-    zookeeper1 = { config, ... }: {
-      services.zookeeper = {
-        enable = true;
-      };
-
-      networking.firewall.allowedTCPPorts = [ 2181 ];
-    };
-    kafka = { config, ... }: {
-      services.apache-kafka = {
-        enable = true;
-        extraProperties = ''
-          offsets.topic.replication.factor = 1
-        '';
-        package = kafkaPackage;
-        zookeeper = "zookeeper1:2181";
-      };
-
-      networking.firewall.allowedTCPPorts = [ 9092 ];
-      virtualisation.memorySize = 2048;
-    };
-  };
-
-  testScript = ''
-    startAll;
-
-    $zookeeper1->waitForUnit("zookeeper");
-    $zookeeper1->waitForUnit("network.target");
-    $zookeeper1->waitForOpenPort(2181);
-
-    $kafka->waitForUnit("apache-kafka");
-    $kafka->waitForUnit("network.target");
-    $kafka->waitForOpenPort(9092);
-
-    $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
-    $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
-    $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
-  '';
-})
diff --git a/nixos/tests/kafka_0_9.nix b/nixos/tests/kafka_0_9.nix
deleted file mode 100644
index fee82aba2bd..00000000000
--- a/nixos/tests/kafka_0_9.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-import ./make-test.nix ({ pkgs, lib, ... } :
-let
-  kafkaPackage = pkgs.apacheKafka_0_9;
-in {
-  name = "kafka_0_9";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  nodes = {
-    zookeeper1 = { config, ... }: {
-      services.zookeeper = {
-        enable = true;
-      };
-
-      networking.firewall.allowedTCPPorts = [ 2181 ];
-    };
-    kafka = { config, ... }: {
-      services.apache-kafka = {
-        enable = true;
-        extraProperties = ''
-          offsets.topic.replication.factor = 1
-        '';
-        package = kafkaPackage;
-        zookeeper = "zookeeper1:2181";
-      };
-
-      networking.firewall.allowedTCPPorts = [ 9092 ];
-      virtualisation.memorySize = 2048;
-    };
-  };
-
-  testScript = ''
-    startAll;
-
-    $zookeeper1->waitForUnit("zookeeper");
-    $zookeeper1->waitForUnit("network.target");
-    $zookeeper1->waitForOpenPort(2181);
-
-    $kafka->waitForUnit("apache-kafka");
-    $kafka->waitForUnit("network.target");
-    $kafka->waitForOpenPort(9092);
-
-    $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
-    $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
-    $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
-  '';
-})
diff --git a/nixos/tests/kafka_1_0.nix b/nixos/tests/kafka_1_0.nix
deleted file mode 100644
index 936840dbcfd..00000000000
--- a/nixos/tests/kafka_1_0.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-import ./make-test.nix ({ pkgs, lib, ... } :
-let
-  kafkaPackage = pkgs.apacheKafka_1_0;
-in {
-  name = "kafka_1_0";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  nodes = {
-    zookeeper1 = { config, ... }: {
-      services.zookeeper = {
-        enable = true;
-      };
-
-      networking.firewall.allowedTCPPorts = [ 2181 ];
-    };
-    kafka = { config, ... }: {
-      services.apache-kafka = {
-        enable = true;
-        extraProperties = ''
-          offsets.topic.replication.factor = 1
-        '';
-        package = kafkaPackage;
-        zookeeper = "zookeeper1:2181";
-      };
-
-      networking.firewall.allowedTCPPorts = [ 9092 ];
-      virtualisation.memorySize = 2048;
-    };
-  };
-
-  testScript = ''
-    startAll;
-
-    $zookeeper1->waitForUnit("zookeeper");
-    $zookeeper1->waitForUnit("network.target");
-    $zookeeper1->waitForOpenPort(2181);
-
-    $kafka->waitForUnit("apache-kafka");
-    $kafka->waitForUnit("network.target");
-    $kafka->waitForOpenPort(9092);
-
-    $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
-    $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
-    $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
-  '';
-})
-- 
GitLab


From 6a96dc041727859cd36a861d37c8b68d26c41933 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 11 May 2018 20:14:38 -0400
Subject: [PATCH 0542/1085] lib/system: Remove float from androideabi

There are two different official variations which differ in their float
support, so such a blanket statement is invalid.
`lib.systems.platforms.*android` already handles each case correctly.

Correcting an error in 827ef0914089e1a2bba140b49e1311eff28cc156.
---
 lib/systems/parse.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 3dba5ad4698..4c34ace3f27 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -199,7 +199,7 @@ rec {
     msvc         = {};
     eabi         = {};
 
-    androideabi  = { float = "hard"; };
+    androideabi  = {};
     android      = {
       assertions = [
         { assertion = platform: !platform.isAarch32;
-- 
GitLab


From c839771129f17cad501effb6676b0e0cde5cbd0b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 11 May 2018 16:01:40 -0500
Subject: [PATCH 0543/1085] xquartz: fix build

Things done:

- use libGLU instead of mesa for darwin support
- move patches from local to github url
- fixup xquartz install

There may still be some issues at runtime. PRs welcome!

Fixes #40196
---
 ...2-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch |  41 ---
 ...iTrapezoids-and-miTriangles-routines.patch | 297 ------------------
 ...Revert-fb-changes-that-broke-XQuartz.patch | 243 --------------
 .../servers/x11/xorg/darwin/bundle_main.patch | 118 -------
 .../x11/xorg/darwin/private-extern.patch      |  12 -
 pkgs/servers/x11/xorg/darwin/stub.patch       |  80 -----
 pkgs/servers/x11/xorg/overrides.nix           |  36 ++-
 pkgs/servers/x11/xquartz/system-fonts.nix     |   4 +-
 pkgs/top-level/all-packages.nix               |   2 +-
 9 files changed, 28 insertions(+), 805 deletions(-)
 delete mode 100644 pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/bundle_main.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/private-extern.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/stub.patch

diff --git a/pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch b/pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
deleted file mode 100644
index ed0518da5ce..00000000000
--- a/pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 91971455ee46b1059de75260ef0d1a45170d8b65 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Fri, 13 Jan 2012 12:00:57 -0800
-Subject: [PATCH 2/6] sdksyms.sh: Use CPPFLAGS, not CFLAGS
-
-CFLAGS can include flags which are not useful to the preprocessor
-or can even cause it to fail.  This fixes a build issue on darwin
-when building for more than one architecture.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-Reviewed-by: Keith Packard <keithp@keithp.com>
----
- hw/xfree86/Makefile.am | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index 27f2cc6..d898c43 100644
---- a/hw/xfree86/Makefile.am
-+++ b/hw/xfree86/Makefile.am
-@@ -48,8 +48,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
- bin_PROGRAMS = Xorg
- nodist_Xorg_SOURCES = sdksyms.c
- 
--AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
--AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
-+AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
- 	-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
- 	-I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
- 
-@@ -135,7 +134,7 @@ CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh
- EXTRA_DIST += sdksyms.sh
- 
- sdksyms.dep sdksyms.c: sdksyms.sh
--	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
-+	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS)
- 
- SDKSYMS_DEP = sdksyms.dep
- -include $(SDKSYMS_DEP)
--- 
-2.3.2 (Apple Git-55)
-
diff --git a/pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch b/pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
deleted file mode 100644
index 4027227bb53..00000000000
--- a/pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-From b229a04bde765424542eeba17a7e2bc25785a890 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 2 Nov 2013 11:00:23 -0700
-Subject: [PATCH 4/6] Use old miTrapezoids and miTriangles routines
-
-Reverts commits:
-    788ccb9a8bcf6a4fb4054c507111eec3338fb969
-    566f1931ee2916269e164e114bffaf2da1d039d1
-
-http://xquartz.macosforge.org/trac/ticket/525
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- fb/fbpict.c     |   2 -
- render/mipict.c |   4 +-
- render/mipict.h |  27 ++++++++++++++
- render/mitrap.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- render/mitri.c  |  61 +++++++++++++++++++++++++++++++
- 5 files changed, 201 insertions(+), 4 deletions(-)
-
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index c8378ad..cafb027 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
-@@ -499,10 +499,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
-     ps->UnrealizeGlyph = fbUnrealizeGlyph;
-     ps->CompositeRects = miCompositeRects;
-     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
--    ps->Trapezoids = fbTrapezoids;
-     ps->AddTraps = fbAddTraps;
-     ps->AddTriangles = fbAddTriangles;
--    ps->Triangles = fbTriangles;
- 
-     return TRUE;
- }
-diff --git a/render/mipict.c b/render/mipict.c
-index a725104..e14293a 100644
---- a/render/mipict.c
-+++ b/render/mipict.c
-@@ -575,8 +575,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
-     ps->Composite = 0;          /* requires DDX support */
-     ps->Glyphs = miGlyphs;
-     ps->CompositeRects = miCompositeRects;
--    ps->Trapezoids = 0;
--    ps->Triangles = 0;
-+    ps->Trapezoids = miTrapezoids;
-+    ps->Triangles = miTriangles;
- 
-     ps->RasterizeTrapezoid = 0; /* requires DDX support */
-     ps->AddTraps = 0;           /* requires DDX support */
-diff --git a/render/mipict.h b/render/mipict.h
-index 23ce9e8..e0f1d4c 100644
---- a/render/mipict.h
-+++ b/render/mipict.h
-@@ -122,6 +122,16 @@ miCompositeRects(CARD8 op,
-                  xRenderColor * color, int nRect, xRectangle *rects);
- 
- extern _X_EXPORT void
-+miTriangles (CARD8	    op,
-+	     PicturePtr	    pSrc,
-+	     PicturePtr	    pDst,
-+	     PictFormatPtr  maskFormat,
-+	     INT16	    xSrc,
-+	     INT16	    ySrc,
-+	     int	    ntri,
-+	     xTriangle	    *tris);
-+
-+extern _X_EXPORT void
- 
- miTriStrip(CARD8 op,
-            PicturePtr pSrc,
-@@ -137,10 +147,27 @@ miTriFan(CARD8 op,
-          PictFormatPtr maskFormat,
-          INT16 xSrc, INT16 ySrc, int npoints, xPointFixed * points);
- 
-+extern _X_EXPORT PicturePtr
-+miCreateAlphaPicture (ScreenPtr	    pScreen, 
-+		      PicturePtr    pDst,
-+		      PictFormatPtr pPictFormat,
-+		      CARD16	    width,
-+		      CARD16	    height);
-+
- extern _X_EXPORT void
-  miTrapezoidBounds(int ntrap, xTrapezoid * traps, BoxPtr box);
- 
- extern _X_EXPORT void
-+miTrapezoids (CARD8        op,
-+             PicturePtr    pSrc,
-+             PicturePtr    pDst,
-+             PictFormatPtr maskFormat,
-+             INT16         xSrc,
-+             INT16         ySrc,
-+             int           ntrap,
-+             xTrapezoid    *traps);
-+
-+extern _X_EXPORT void
-  miPointFixedBounds(int npoint, xPointFixed * points, BoxPtr bounds);
- 
- extern _X_EXPORT void
-diff --git a/render/mitrap.c b/render/mitrap.c
-index 17b6dcd..71c1857 100644
---- a/render/mitrap.c
-+++ b/render/mitrap.c
-@@ -34,6 +34,55 @@
- #include "picturestr.h"
- #include "mipict.h"
- 
-+PicturePtr
-+miCreateAlphaPicture (ScreenPtr	    pScreen, 
-+		      PicturePtr    pDst,
-+		      PictFormatPtr pPictFormat,
-+		      CARD16	    width,
-+		      CARD16	    height)
-+{
-+    PixmapPtr	    pPixmap;
-+    PicturePtr	    pPicture;
-+    GCPtr	    pGC;
-+    int		    error;
-+    xRectangle	    rect;
-+
-+    if (width > 32767 || height > 32767)
-+	return 0;
-+
-+    if (!pPictFormat)
-+    {
-+	if (pDst->polyEdge == PolyEdgeSharp)
-+	    pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+	else
-+	    pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+	if (!pPictFormat)
-+	    return 0;
-+    }
-+
-+    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 
-+					pPictFormat->depth, 0);
-+    if (!pPixmap)
-+	return 0;
-+    pGC = GetScratchGC (pPixmap->drawable.depth, pScreen);
-+    if (!pGC)
-+    {
-+	(*pScreen->DestroyPixmap) (pPixmap);
-+	return 0;
-+    }
-+    ValidateGC (&pPixmap->drawable, pGC);
-+    rect.x = 0;
-+    rect.y = 0;
-+    rect.width = width;
-+    rect.height = height;
-+    (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect);
-+    FreeScratchGC (pGC);
-+    pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat,
-+			      0, 0, serverClient, &error);
-+    (*pScreen->DestroyPixmap) (pPixmap);
-+    return pPicture;
-+}
-+
- static xFixed
- miLineFixedX(xLineFixed * l, xFixed y, Bool ceil)
- {
-@@ -79,3 +128,65 @@ miTrapezoidBounds(int ntrap, xTrapezoid * traps, BoxPtr box)
-             box->x2 = x2;
-     }
- }
-+
-+
-+void
-+miTrapezoids (CARD8        op,
-+             PicturePtr    pSrc,
-+             PicturePtr    pDst,
-+             PictFormatPtr maskFormat,
-+             INT16         xSrc,
-+             INT16         ySrc,
-+             int           ntrap,
-+             xTrapezoid    *traps)
-+{
-+    ScreenPtr          pScreen = pDst->pDrawable->pScreen;
-+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
-+
-+    /*
-+     * Check for solid alpha add
-+     */
-+    if (op == PictOpAdd && miIsSolidAlpha (pSrc))
-+    {
-+       for (; ntrap; ntrap--, traps++)
-+           (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0);
-+    } 
-+    else if (maskFormat)
-+    {
-+       PicturePtr      pPicture;
-+       BoxRec          bounds;
-+       INT16           xDst, yDst;
-+       INT16           xRel, yRel;
-+       
-+       xDst = traps[0].left.p1.x >> 16;
-+       yDst = traps[0].left.p1.y >> 16;
-+
-+       miTrapezoidBounds (ntrap, traps, &bounds);
-+       if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
-+           return;
-+       pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
-+                                        bounds.x2 - bounds.x1,
-+                                        bounds.y2 - bounds.y1);
-+       if (!pPicture)
-+           return;
-+       for (; ntrap; ntrap--, traps++)
-+           (*ps->RasterizeTrapezoid) (pPicture, traps, 
-+                                      -bounds.x1, -bounds.y1);
-+       xRel = bounds.x1 + xSrc - xDst;
-+       yRel = bounds.y1 + ySrc - yDst;
-+       CompositePicture (op, pSrc, pPicture, pDst,
-+                         xRel, yRel, 0, 0, bounds.x1, bounds.y1,
-+                         bounds.x2 - bounds.x1,
-+                         bounds.y2 - bounds.y1);
-+       FreePicture (pPicture, 0);
-+    }
-+    else
-+    {
-+       if (pDst->polyEdge == PolyEdgeSharp)
-+           maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+       else
-+           maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+       for (; ntrap; ntrap--, traps++)
-+           miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
-+    }
-+}
-diff --git a/render/mitri.c b/render/mitri.c
-index 922f22a..bdca9ca 100644
---- a/render/mitri.c
-+++ b/render/mitri.c
-@@ -65,3 +65,64 @@ miTriangleBounds(int ntri, xTriangle * tris, BoxPtr bounds)
- {
-     miPointFixedBounds(ntri * 3, (xPointFixed *) tris, bounds);
- }
-+
-+
-+void
-+miTriangles (CARD8	    op,
-+	     PicturePtr	    pSrc,
-+	     PicturePtr	    pDst,
-+	     PictFormatPtr  maskFormat,
-+	     INT16	    xSrc,
-+	     INT16	    ySrc,
-+	     int	    ntri,
-+	     xTriangle	    *tris)
-+{
-+    ScreenPtr		pScreen = pDst->pDrawable->pScreen;
-+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
-+    
-+    /*
-+     * Check for solid alpha add
-+     */
-+    if (op == PictOpAdd && miIsSolidAlpha (pSrc))
-+    {
-+	(*ps->AddTriangles) (pDst, 0, 0, ntri, tris);
-+    }
-+    else if (maskFormat)
-+    {
-+	BoxRec		bounds;
-+	PicturePtr	pPicture;
-+	INT16		xDst, yDst;
-+	INT16		xRel, yRel;
-+	
-+	xDst = tris[0].p1.x >> 16;
-+	yDst = tris[0].p1.y >> 16;
-+
-+	miTriangleBounds (ntri, tris, &bounds);
-+	if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
-+	    return;
-+	pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
-+					 bounds.x2 - bounds.x1,
-+					 bounds.y2 - bounds.y1);
-+	if (!pPicture)
-+	    return;
-+	(*ps->AddTriangles) (pPicture, -bounds.x1, -bounds.y1, ntri, tris);
-+	
-+	xRel = bounds.x1 + xSrc - xDst;
-+	yRel = bounds.y1 + ySrc - yDst;
-+	CompositePicture (op, pSrc, pPicture, pDst,
-+			  xRel, yRel, 0, 0, bounds.x1, bounds.y1,
-+			  bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
-+	FreePicture (pPicture, 0);
-+    }
-+    else
-+    {
-+	if (pDst->polyEdge == PolyEdgeSharp)
-+	    maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+	else
-+	    maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+	
-+	for (; ntri; ntri--, tris++)
-+	    miTriangles (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, tris);
-+    }
-+}
-+
--- 
-2.3.2 (Apple Git-55)
-
diff --git a/pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch b/pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
deleted file mode 100644
index 03d4decdb1c..00000000000
--- a/pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-From 4c7572abafeac9b2dcd884c444c5a5bae5b302c3 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 31 May 2014 13:14:20 -0700
-Subject: [PATCH 6/6] fb: Revert fb changes that broke XQuartz
-
-    http://bugs.freedesktop.org/show_bug.cgi?id=26124
-
-Revert "Use new pixman_glyph_cache_t API that will be in pixman 0.28.0"
-Revert "fb: Fix origin of source picture in fbGlyphs"
-Revert "fb: Publish fbGlyphs and fbUnrealizeGlyph"
-
-This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366.
-This reverts commit 983e30361f49a67252d0b5d82630e70724d69dbf.
-This reverts commit 3c2c59eed3c68c0e5a93c38cf01eedad015e3157.
----
- fb/fb.h       |   3 --
- fb/fbpict.c   | 149 +---------------------------------------------------------
- fb/fbpict.h   |  11 +----
- fb/fbscreen.c |   1 -
- 4 files changed, 2 insertions(+), 162 deletions(-)
-
-diff --git a/fb/fb.h b/fb/fb.h
-index 59eaac3..046b948 100644
---- a/fb/fb.h
-+++ b/fb/fb.h
-@@ -1116,9 +1116,6 @@ extern _X_EXPORT void
- extern _X_EXPORT Bool
-  fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
- 
--extern _X_EXPORT void
--fbDestroyGlyphCache(void);
--
- /*
-  * fbpixmap.c
-  */
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 6ee63e9..9c4cc42 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
-@@ -65,152 +65,6 @@ fbComposite(CARD8 op,
-     free_pixman_pict(pDst, dest);
- }
- 
--static pixman_glyph_cache_t *glyphCache;
--
--void
--fbDestroyGlyphCache(void)
--{
--    if (glyphCache)
--    {
--	pixman_glyph_cache_destroy (glyphCache);
--	glyphCache = NULL;
--    }
--}
--
--static void
--fbUnrealizeGlyph(ScreenPtr pScreen,
--		 GlyphPtr pGlyph)
--{
--    if (glyphCache)
--	pixman_glyph_cache_remove (glyphCache, pGlyph, NULL);
--}
--
--void
--fbGlyphs(CARD8 op,
--	 PicturePtr pSrc,
--	 PicturePtr pDst,
--	 PictFormatPtr maskFormat,
--	 INT16 xSrc,
--	 INT16 ySrc, int nlist,
--	 GlyphListPtr list,
--	 GlyphPtr *glyphs)
--{
--#define N_STACK_GLYPHS 512
--    ScreenPtr pScreen = pDst->pDrawable->pScreen;
--    pixman_glyph_t stack_glyphs[N_STACK_GLYPHS];
--    pixman_glyph_t *pglyphs = stack_glyphs;
--    pixman_image_t *srcImage, *dstImage;
--    int srcXoff, srcYoff, dstXoff, dstYoff;
--    GlyphPtr glyph;
--    int n_glyphs;
--    int x, y;
--    int i, n;
--    int xDst = list->xOff, yDst = list->yOff;
--
--    miCompositeSourceValidate(pSrc);
--
--    n_glyphs = 0;
--    for (i = 0; i < nlist; ++i)
--	n_glyphs += list[i].len;
--
--    if (!glyphCache)
--	glyphCache = pixman_glyph_cache_create();
--
--    pixman_glyph_cache_freeze (glyphCache);
--
--    if (n_glyphs > N_STACK_GLYPHS) {
--	if (!(pglyphs = malloc (n_glyphs * sizeof (pixman_glyph_t))))
--	    goto out;
--    }
--
--    i = 0;
--    x = y = 0;
--    while (nlist--) {
--        x += list->xOff;
--        y += list->yOff;
--        n = list->len;
--        while (n--) {
--	    const void *g;
--
--            glyph = *glyphs++;
--
--	    if (!(g = pixman_glyph_cache_lookup (glyphCache, glyph, NULL))) {
--		pixman_image_t *glyphImage;
--		PicturePtr pPicture;
--		int xoff, yoff;
--
--		pPicture = GetGlyphPicture(glyph, pScreen);
--		if (!pPicture) {
--		    n_glyphs--;
--		    goto next;
--		}
--
--		if (!(glyphImage = image_from_pict(pPicture, FALSE, &xoff, &yoff)))
--		    goto out;
--
--		g = pixman_glyph_cache_insert(glyphCache, glyph, NULL,
--					      glyph->info.x,
--					      glyph->info.y,
--					      glyphImage);
--
--		free_pixman_pict(pPicture, glyphImage);
--
--		if (!g)
--		    goto out;
--	    }
--
--	    pglyphs[i].x = x;
--	    pglyphs[i].y = y;
--	    pglyphs[i].glyph = g;
--	    i++;
--
--	next:
--            x += glyph->info.xOff;
--            y += glyph->info.yOff;
--	}
--	list++;
--    }
--
--    if (!(srcImage = image_from_pict(pSrc, FALSE, &srcXoff, &srcYoff)))
--	goto out;
--
--    if (!(dstImage = image_from_pict(pDst, TRUE, &dstXoff, &dstYoff)))
--	goto out_free_src;
--
--    if (maskFormat) {
--	pixman_format_code_t format;
--	pixman_box32_t extents;
--
--	format = maskFormat->format | (maskFormat->depth << 24);
--
--	pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents);
--
--	pixman_composite_glyphs(op, srcImage, dstImage, format,
--				xSrc + srcXoff + extents.x1 - xDst, ySrc + srcYoff + extents.y1 - yDst,
--				extents.x1, extents.y1,
--				extents.x1 + dstXoff, extents.y1 + dstYoff,
--				extents.x2 - extents.x1,
--				extents.y2 - extents.y1,
--				glyphCache, n_glyphs, pglyphs);
--    }
--    else {
--	pixman_composite_glyphs_no_mask(op, srcImage, dstImage,
--					xSrc + srcXoff - xDst, ySrc + srcYoff - yDst,
--					dstXoff, dstYoff,
--					glyphCache, n_glyphs, pglyphs);
--    }
--
--    free_pixman_pict(pDst, dstImage);
--
--out_free_src:
--    free_pixman_pict(pSrc, srcImage);
--
--out:
--    pixman_glyph_cache_thaw(glyphCache);
--    if (pglyphs != stack_glyphs)
--	free(pglyphs);
--}
--
- static pixman_image_t *
- create_solid_fill_image(PicturePtr pict)
- {
-@@ -461,8 +315,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
-         return FALSE;
-     ps = GetPictureScreen(pScreen);
-     ps->Composite = fbComposite;
--    ps->Glyphs = fbGlyphs;
--    ps->UnrealizeGlyph = fbUnrealizeGlyph;
-+    ps->Glyphs = miGlyphs;
-     ps->CompositeRects = miCompositeRects;
-     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
-     ps->AddTraps = fbAddTraps;
-diff --git a/fb/fbpict.h b/fb/fbpict.h
-index 5cb8663..110f32d 100644
---- a/fb/fbpict.h
-+++ b/fb/fbpict.h
-@@ -65,20 +65,11 @@ fbTrapezoids(CARD8 op,
-              INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps);
- 
- extern _X_EXPORT void
-+
- fbTriangles(CARD8 op,
-             PicturePtr pSrc,
-             PicturePtr pDst,
-             PictFormatPtr maskFormat,
-             INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris);
- 
--extern _X_EXPORT void
--fbGlyphs(CARD8 op,
--	 PicturePtr pSrc,
--	 PicturePtr pDst,
--	 PictFormatPtr maskFormat,
--	 INT16 xSrc,
--	 INT16 ySrc, int nlist,
--	 GlyphListPtr list,
--	 GlyphPtr *glyphs);
--
- #endif                          /* _FBPICT_H_ */
-diff --git a/fb/fbscreen.c b/fb/fbscreen.c
-index 71bcc5d..55330fc 100644
---- a/fb/fbscreen.c
-+++ b/fb/fbscreen.c
-@@ -32,7 +32,6 @@ fbCloseScreen(ScreenPtr pScreen)
-     int d;
-     DepthPtr depths = pScreen->allowedDepths;
- 
--    fbDestroyGlyphCache();
-     for (d = 0; d < pScreen->numDepths; d++)
-         free(depths[d].vids);
-     free(depths);
--- 
-2.3.2 (Apple Git-55)
-
diff --git a/pkgs/servers/x11/xorg/darwin/bundle_main.patch b/pkgs/servers/x11/xorg/darwin/bundle_main.patch
deleted file mode 100644
index e60ca5738d1..00000000000
--- a/pkgs/servers/x11/xorg/darwin/bundle_main.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-cstrahan:
-
-This patch makes it possible (and necessary) to specify the default
-shell, xterm client, and startx script from environment variables. These
-defaults are used when launching the XQuartz.app, which in turn needs to know
-how to start the X server. I've patched `command_from_prefs' so that it ignores
-the preferences settings and immediately sets them to whatever the environment
-variables are.
-
-When developing an installable package for XQuartz/XQuartz.app, we'll need to
-set an `LSEnvironment' entry in the plist for the XQuartz.app, we'll also need
-to wrap the XQuartz.app/Contents/MacOS/X11 script (the Xquartz server will
-invoke this script during initialization. See stub.patch for more details.).
-
-diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
-index b403662..b1e2070 100644
---- a/hw/xquartz/mach-startup/bundle-main.c
-+++ b/hw/xquartz/mach-startup/bundle-main.c
-@@ -77,13 +77,7 @@ FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN;
- 
- extern int noPanoramiXExtension;
- 
--#define DEFAULT_CLIENT X11BINDIR "/xterm"
--#define DEFAULT_STARTX X11BINDIR "/startx -- " X11BINDIR "/Xquartz"
--#define DEFAULT_SHELL  "/bin/sh"
--
--#ifndef BUILD_DATE
- #define BUILD_DATE ""
--#endif
- #ifndef XSERVER_VERSION
- #define XSERVER_VERSION "?"
- #endif
-@@ -718,14 +712,14 @@ main(int argc, char **argv, char **envp)
-         pid_t child1, child2;
-         int status;
- 
--        pref_app_to_run = command_from_prefs("app_to_run", DEFAULT_CLIENT);
-+        pref_app_to_run = command_from_prefs("app_to_run", getenv("XQUARTZ_DEFAULT_CLIENT"));
-         assert(pref_app_to_run);
- 
--        pref_login_shell = command_from_prefs("login_shell", DEFAULT_SHELL);
-+        pref_login_shell = command_from_prefs("login_shell", getenv("XQUARTZ_DEFAULT_SHELL"));
-         assert(pref_login_shell);
- 
-         pref_startx_script = command_from_prefs("startx_script",
--                                                DEFAULT_STARTX);
-+                                                getenv("XQUARTZ_DEFAULT_STARTX"));
-         assert(pref_startx_script);
- 
-         /* Do the fork-twice trick to avoid having to reap zombies */
-@@ -804,10 +798,12 @@ execute(const char *command)
- static char *
- command_from_prefs(const char *key, const char *default_value)
- {
-+    if (default_value == NULL)
-+        return NULL;
-+
-     char *command = NULL;
- 
-     CFStringRef cfKey;
--    CFPropertyListRef PlistRef;
- 
-     if (!key)
-         return NULL;
-@@ -817,40 +813,24 @@ command_from_prefs(const char *key, const char *default_value)
-     if (!cfKey)
-         return NULL;
- 
--    PlistRef = CFPreferencesCopyAppValue(cfKey,
--                                         kCFPreferencesCurrentApplication);
-+    CFStringRef cfDefaultValue = CFStringCreateWithCString(
-+        NULL, default_value, kCFStringEncodingASCII);
-+    int len = strlen(default_value) + 1;
- 
--    if ((PlistRef == NULL) ||
--        (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
--        CFStringRef cfDefaultValue = CFStringCreateWithCString(
--            NULL, default_value, kCFStringEncodingASCII);
--        int len = strlen(default_value) + 1;
-+    if (!cfDefaultValue)
-+        goto command_from_prefs_out;
- 
--        if (!cfDefaultValue)
--            goto command_from_prefs_out;
-+    CFPreferencesSetAppValue(cfKey, cfDefaultValue,
-+                             kCFPreferencesCurrentApplication);
-+    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
-+    CFRelease(cfDefaultValue);
- 
--        CFPreferencesSetAppValue(cfKey, cfDefaultValue,
--                                 kCFPreferencesCurrentApplication);
--        CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
--        CFRelease(cfDefaultValue);
--
--        command = (char *)malloc(len * sizeof(char));
--        if (!command)
--            goto command_from_prefs_out;
--        strcpy(command, default_value);
--    }
--    else {
--        int len = CFStringGetLength((CFStringRef)PlistRef) + 1;
--        command = (char *)malloc(len * sizeof(char));
--        if (!command)
--            goto command_from_prefs_out;
--        CFStringGetCString((CFStringRef)PlistRef, command, len,
--                           kCFStringEncodingASCII);
--    }
-+    command = (char *)malloc(len * sizeof(char));
-+    if (!command)
-+        goto command_from_prefs_out;
-+    strcpy(command, default_value);
- 
- command_from_prefs_out:
--    if (PlistRef)
--        CFRelease(PlistRef);
-     if (cfKey)
-         CFRelease(cfKey);
-     return command;
diff --git a/pkgs/servers/x11/xorg/darwin/private-extern.patch b/pkgs/servers/x11/xorg/darwin/private-extern.patch
deleted file mode 100644
index 87af7865c37..00000000000
--- a/pkgs/servers/x11/xorg/darwin/private-extern.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/hw/xquartz/xpr/x-list.new.h b/hw/xquartz/xpr/x-list.h
-index 28385fd..71f9d26 100644
---- a/hw/xquartz/xpr/x-list.new.h
-+++ b/hw/xquartz/xpr/x-list.h
-@@ -45,6 +45,7 @@ struct x_list_struct {
- #endif
- 
- #ifndef X_EXTERN
-+#define __private_extern__ extern
- #define X_EXTERN __private_extern__
- #endif
- 
diff --git a/pkgs/servers/x11/xorg/darwin/stub.patch b/pkgs/servers/x11/xorg/darwin/stub.patch
deleted file mode 100644
index db3215b498a..00000000000
--- a/pkgs/servers/x11/xorg/darwin/stub.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-cstrahan:
-
-When the X / Xquartz server initiallizes, it starts the XQuartz.app and
-hands-off the display FD. To start the XQuartz.app, Xquartz normally uses some
-system calls to get the path of the application by app bundle id, and then
-executes the Contents/MacOS/X11 script contained inside, which in turn executes
-Contents/MacOS/X11.bin (the actual app).
-
-This patch replaces that discovery technique with a simple call to
-`getenv'. In order to make Xquartz actually work, we'll need another wrapper
-that sets the `XQUARTZ_X11' environment variable to point to the `X11' script.
-
-diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
-index 756e4ef..3313a55 100644
---- a/hw/xquartz/mach-startup/stub.c
-+++ b/hw/xquartz/mach-startup/stub.c
-@@ -61,54 +61,16 @@ aslclient aslc;
- static void
- set_x11_path(void)
- {
--#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
--
--    CFURLRef appURL = NULL;
--    OSStatus osstatus =
--        LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(
--                                     kX11AppBundleId), nil, nil, &appURL);
--
--    switch (osstatus) {
--    case noErr:
--        if (appURL == NULL) {
--            asl_log(
--                aslc, NULL, ASL_LEVEL_ERR,
--                "Xquartz: Invalid response from LSFindApplicationForInfo(%s)",
--                kX11AppBundleId);
--            exit(1);
--        }
--
--        if (!CFURLGetFileSystemRepresentation(appURL, true,
--                                              (unsigned char *)x11_path,
--                                              sizeof(x11_path))) {
--            asl_log(aslc, NULL, ASL_LEVEL_ERR,
--                    "Xquartz: Error resolving URL for %s",
--                    kX11AppBundleId);
--            exit(3);
--        }
--
--        strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
--        asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: X11.app = %s", x11_path);
--        break;
--
--    case kLSApplicationNotFoundErr:
--        asl_log(aslc, NULL, ASL_LEVEL_ERR,
--                "Xquartz: Unable to find application for %s",
--                kX11AppBundleId);
--        exit(10);
--
--    default:
--        asl_log(aslc, NULL, ASL_LEVEL_ERR,
--                "Xquartz: Unable to find application for %s, error code = %d",
--                kX11AppBundleId,
--                (int)osstatus);
--        exit(11);
-+    char *xquartzX11 = getenv("XQUARTZ_X11");
-+    if (xquartzX11) {
-+        strlcpy(x11_path, xquartzX11,
-+                sizeof(x11_path));
-+    } else {
-+        asl_log(
-+            aslc, NULL, ASL_LEVEL_ERR,
-+            "Xquartz: XQUARTZ_X11 environment variable not set");
-+        exit(1);
-     }
--#else
--    /* TODO: Make Tiger smarter... but TBH, this should never get called on Tiger... */
--    strlcpy(x11_path, "/Applications/Utilities/X11.app/Contents/MacOS/X11",
--            sizeof(x11_path));
--#endif
- }
- 
- static int
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 5efa4bfcfd5..ce78eba4b43 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -456,7 +456,7 @@ in
             };
             nativeBuildInputs = [ pkgconfig ];
             buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
-            postPatch = "sed '1i#include <malloc.h>' -i include/os.h";
+            postPatch = stdenv.lib.optionalString stdenv.isLinux "sed '1i#include <malloc.h>' -i include/os.h";
             meta.platforms = stdenv.lib.platforms.unix;
         } else throw "unsupported xorg abiCompat ${args.abiCompat} for ${attrs_passed.name}";
 
@@ -465,7 +465,7 @@ in
       version = (builtins.parseDrvName attrs.name).version;
       commonBuildInputs = attrs.buildInputs ++ [ xtrans ];
       commonPropagatedBuildInputs = [
-        args.zlib args.libGL args.mesa_noglu args.dbus
+        args.zlib args.libGL args.libGLU args.dbus
         xf86bigfontproto glproto xf86driproto
         compositeproto scrnsaverproto resourceproto
         xf86dgaproto
@@ -526,6 +526,7 @@ in
         '';
         passthru.version = version; # needed by virtualbox guest additions
       } else {
+        nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.autoreconfHook xorg.utilmacros xorg.fontutil ];
         buildInputs = commonBuildInputs ++ [
           args.bootstrap_cmds args.automake args.autoconf
           args.apple_sdk.libs.Xplugin
@@ -535,16 +536,31 @@ in
         propagatedBuildInputs = commonPropagatedBuildInputs ++ [
           libAppleWM applewmproto
         ];
-        # Patches can be pulled from the server-*-apple branches of:
-        # http://cgit.freedesktop.org/~jeremyhu/xserver/
+
+        # XQuartz patchset
         patches = commonPatches ++ [
-          ./darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
-          ./darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
-          ./darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
-          ./darwin/private-extern.patch
-          ./darwin/bundle_main.patch
-          ./darwin/stub.patch
+          (args.fetchpatch {
+            url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch";
+            sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k";
+            name = "use-cppflags-not-cflags.patch";
+          })
+          (args.fetchpatch {
+            url = "https://github.com/XQuartz/xorg-server/commit/75ee9649bcfe937ac08e03e82fd45d9e18110ef4.patch";
+            sha256 = "1vlfylm011y00j8mig9zy6gk9bw2b4ilw2qlsc6la49zi3k0i9fg";
+            name = "use-old-mitrapezoids-and-mitriangles-routines.patch";
+          })
+          (args.fetchpatch {
+            url = "https://github.com/XQuartz/xorg-server/commit/c58f47415be79a6564a9b1b2a62c2bf866141e73.patch";
+            sha256 = "19sisqzw8x2ml4lfrwfvavc2jfyq2bj5xcf83z89jdxg8g1gdd1i";
+            name = "revert-fb-changes-1.patch";
+          })
+          (args.fetchpatch {
+            url = "https://github.com/XQuartz/xorg-server/commit/56e6f1f099d2821e5002b9b05b715e7b251c0c97.patch";
+            sha256 = "0zm9g0g1jvy79sgkvy0rjm6ywrdba2xjd1nsnjbxjccckbr6i396";
+            name = "revert-fb-changes-2.patch";
+          })
         ];
+
         configureFlags = [
           # note: --enable-xquartz is auto
           "CPPFLAGS=-I${./darwin/dri}"
diff --git a/pkgs/servers/x11/xquartz/system-fonts.nix b/pkgs/servers/x11/xquartz/system-fonts.nix
index cf24bb439b9..db47f8afe01 100644
--- a/pkgs/servers/x11/xquartz/system-fonts.nix
+++ b/pkgs/servers/x11/xquartz/system-fonts.nix
@@ -26,9 +26,7 @@ stdenv.mkDerivation {
       fi;
     done;
     cd $out/share/X11-fonts/
-    rm fonts.dir
-    rm fonts.scale
-    rm fonts.alias
+    rm -f fonts.dir fonts.scale fonts.alias
     mkfontdir
     mkfontscale
     cat $( find ${xorg.fontalias}/ -name fonts.alias) >fonts.alias
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6d3a7a5b93..a4766030f04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13043,7 +13043,7 @@ with pkgs;
     inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig
       libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind
       dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
-      autoconf automake libtool mtdev pixman libGL
+      autoconf automake libtool mtdev pixman libGL libGLU
       cairo epoxy;
     inherit (buildPackages) pkgconfig xmlto asciidoc flex bison;
     inherit (darwin) apple_sdk cf-private libobjc;
-- 
GitLab


From c41675bce0ce3eb4d79180c804892e8e3c268e55 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 12 May 2018 01:06:47 -0400
Subject: [PATCH 0544/1085] GHCJS 8.2

---
 .../compilers/ghcjs-ng/8.2/dep-overrides.nix  |   6 +
 .../compilers/ghcjs-ng/8.2/git.json           |   6 +
 .../compilers/ghcjs-ng/8.2/stage0.nix         | 168 ++++++++++++++++++
 pkgs/development/compilers/ghcjs-ng/README.md |  20 +++
 .../compilers/ghcjs-ng/common-overrides.nix   |   8 +
 .../ghcjs-ng/configured-ghcjs-src.nix         |  44 +++++
 .../compilers/ghcjs-ng/default.nix            |  77 ++++++++
 .../compilers/ghcjs-ng/mk-stage0.nix          |  25 +++
 pkgs/top-level/haskell-packages.nix           |  28 ++-
 9 files changed, 377 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
 create mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/git.json
 create mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix
 create mode 100644 pkgs/development/compilers/ghcjs-ng/README.md
 create mode 100644 pkgs/development/compilers/ghcjs-ng/common-overrides.nix
 create mode 100644 pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
 create mode 100644 pkgs/development/compilers/ghcjs-ng/default.nix
 create mode 100644 pkgs/development/compilers/ghcjs-ng/mk-stage0.nix

diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
new file mode 100644
index 00000000000..72066ee1701
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
@@ -0,0 +1,6 @@
+{ haskellLib }:
+
+let inherit (haskellLib) dontHaddock;
+in self: super: {
+  ghcjs = dontHaddock super.ghcjs;
+}
diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/git.json b/pkgs/development/compilers/ghcjs-ng/8.2/git.json
new file mode 100644
index 00000000000..efe7794a103
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/8.2/git.json
@@ -0,0 +1,6 @@
+{
+  "url": "https://github.com/ghcjs/ghcjs",
+  "rev": "0cff73c3ee13b464adba90f308b77751c75b9f26",
+  "sha256": "1shg34zi6ryaihar62qdkkalv8dsrsqbv58jzkhk9in38sdfkjxv",
+  "fetchSubmodules": true
+}
diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix
new file mode 100644
index 00000000000..0680ff156e1
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix
@@ -0,0 +1,168 @@
+{ callPackage, configuredSrc }:
+
+{
+
+  ghcjs = callPackage
+    ({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring
+    , base64-bytestring, binary, bytestring, Cabal, containers
+    , cryptohash, data-default, deepseq, directory, executable-path
+    , filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs
+    , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts
+    , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl
+    , network, optparse-applicative, parallel, parsec, process, random
+    , regex-posix, safe, shelly, split, stdenv, stringsearch, syb
+    , system-fileio, system-filepath, tar, template-haskell
+    , template-haskell-ghcjs, terminfo, test-framework
+    , test-framework-hunit, text, time, transformers
+    , transformers-compat, unix, unix-compat, unordered-containers
+    , vector, wai, wai-app-static, wai-extra, wai-websockets, warp
+    , webdriver, websockets, wl-pprint-text, yaml
+    }:
+    mkDerivation {
+      pname = "ghcjs";
+      version = "8.2.0.1";
+      src = configuredSrc + /.;
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      setupHaskellDepends = [
+        base Cabal containers directory filepath process template-haskell
+        transformers
+      ];
+      libraryHaskellDepends = [
+        aeson array attoparsec base base16-bytestring base64-bytestring
+        binary bytestring Cabal containers cryptohash data-default deepseq
+        directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs
+        ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl
+        optparse-applicative parallel parsec process regex-posix safe split
+        stringsearch syb template-haskell template-haskell-ghcjs text time
+        transformers unordered-containers vector wl-pprint-text yaml
+      ];
+      executableHaskellDepends = [
+        aeson base binary bytestring Cabal containers directory
+        executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs
+        lens mtl optparse-applicative process shelly system-fileio
+        system-filepath tar terminfo text time transformers
+        transformers-compat unix unix-compat unordered-containers vector
+        yaml
+      ];
+      testHaskellDepends = [
+        aeson base bytestring data-default deepseq directory http-types
+        HUnit lens lifted-base network optparse-applicative process random
+        shelly system-fileio system-filepath test-framework
+        test-framework-hunit text time transformers unordered-containers
+        wai wai-app-static wai-extra wai-websockets warp webdriver
+        websockets yaml
+      ];
+      description = "Haskell to JavaScript compiler";
+      license = stdenv.lib.licenses.mit;
+    }) {};
+
+  ghc-api-ghcjs = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+    , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci-ghcjs
+    , hoopl, hpc, process, stdenv, template-haskell-ghcjs, terminfo
+    , time, transformers, unix
+    }:
+    mkDerivation {
+      pname = "ghc-api-ghcjs";
+      version = "8.2.2";
+      src = configuredSrc + /lib/ghc-api-ghcjs;
+      libraryHaskellDepends = [
+        array base binary bytestring containers deepseq directory filepath
+        ghc-boot ghc-boot-th ghci-ghcjs hoopl hpc process
+        template-haskell-ghcjs terminfo time transformers unix
+      ];
+      homepage = "http://www.haskell.org/ghc/";
+      description = "The GHC API (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  ghci-ghcjs = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+    , deepseq, filepath, ghc-boot, ghc-boot-th, stdenv
+    , template-haskell-ghcjs, transformers, unix
+    }:
+    mkDerivation {
+      pname = "ghci-ghcjs";
+      version = "8.2.2";
+      src = configuredSrc + /lib/ghci-ghcjs;
+      libraryHaskellDepends = [
+        array base binary bytestring containers deepseq filepath ghc-boot
+        ghc-boot-th template-haskell-ghcjs transformers unix
+      ];
+      description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  ghcjs-th = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, ghc-prim
+    , ghci-ghcjs, stdenv, template-haskell-ghcjs
+    }:
+    mkDerivation {
+      pname = "ghcjs-th";
+      version = "0.1.0.0";
+      src = configuredSrc + /lib/ghcjs-th;
+      libraryHaskellDepends = [
+        base binary bytestring containers ghc-prim ghci-ghcjs
+        template-haskell-ghcjs
+      ];
+      homepage = "http://github.com/ghcjs";
+      license = stdenv.lib.licenses.mit;
+    }) {};
+
+  haddock-api-ghcjs = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq
+    , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths
+    , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv
+    , transformers, xhtml
+    }:
+    mkDerivation {
+      pname = "haddock-api-ghcjs";
+      version = "2.18.1";
+      src = configuredSrc + /lib/haddock-api-ghcjs;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        array base bytestring Cabal containers deepseq directory filepath
+        ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers
+        xhtml
+      ];
+      testHaskellDepends = [
+        base containers ghc-api-ghcjs hspec QuickCheck
+      ];
+      testToolDepends = [ hspec-discover ];
+      homepage = "http://www.haskell.org/haddock/";
+      description = "A documentation-generation tool for Haskell libraries (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  haddock-library-ghcjs = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
+    , hspec-discover, QuickCheck, stdenv, transformers
+    }:
+    mkDerivation {
+      pname = "haddock-library-ghcjs";
+      version = "1.4.4";
+      src = configuredSrc + /lib/haddock-library-ghcjs;
+      libraryHaskellDepends = [ base bytestring deepseq transformers ];
+      testHaskellDepends = [
+        base base-compat bytestring deepseq hspec QuickCheck transformers
+      ];
+      testToolDepends = [ hspec-discover ];
+      homepage = "http://www.haskell.org/haddock/";
+      description = "Library exposing some functionality of Haddock";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  template-haskell-ghcjs = callPackage
+    ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }:
+    mkDerivation {
+      pname = "template-haskell-ghcjs";
+      version = "2.12.0.0";
+      src = configuredSrc + /lib/template-haskell-ghcjs;
+      libraryHaskellDepends = [ base ghc-boot-th pretty ];
+      description = "Support library for Template Haskell (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+}
diff --git a/pkgs/development/compilers/ghcjs-ng/README.md b/pkgs/development/compilers/ghcjs-ng/README.md
new file mode 100644
index 00000000000..3e1598c83b0
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/README.md
@@ -0,0 +1,20 @@
+New build system for GHCJS 8.2
+---
+
+`ghcjs-8.2` reworked the build system, and now comes with its own
+small package set of dependencies. This involves autogenerating
+several sources and cabal files, based on a GHC
+checkout. `callCabal2nix` is off limits, since we don't like "import
+from derivation" in nixpkgs. So there is a derivation that builds the
+nix expression that should be checked in whenever GHCJS is updated.
+
+Updating
+---
+
+```
+$ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.2 \
+  | jq '{ url, rev, fetchSubmodules, sha256 }' \
+  > 8.2/git.json
+$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.2/stage0.nix
+```
+
diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
new file mode 100644
index 00000000000..172a48a5a65
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
@@ -0,0 +1,8 @@
+{ haskellLib, alex, happy }:
+
+let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
+in self: super: {
+  ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
+  ghcjs = appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install";
+  haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
+}
diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
new file mode 100644
index 00000000000..b9435b31157
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
@@ -0,0 +1,44 @@
+{ perl
+, autoconf
+, automake
+, python3
+, gcc
+, cabal-install
+, gmp
+, runCommand
+
+, ghc
+, happy
+, alex
+
+, ghcjsSrc
+}:
+
+runCommand "configured-ghcjs-src" {
+  buildInputs = [
+    perl
+    autoconf
+    automake
+    python3
+    ghc
+    happy
+    alex
+    cabal-install
+  ];
+  inherit ghcjsSrc;
+} ''
+  export HOME=$(pwd)
+  cp -r "$ghcjsSrc" "$out"
+  chmod -R +w "$out"
+  cd "$out"
+
+  # TODO: Find a better way to avoid impure version numbers
+  sed -i 's/RELEASE=NO/RELEASE=YES/' ghc/configure.ac
+
+  # TODO: How to actually fix this?
+  # Seems to work fine and produce the right files.
+  touch ghc/includes/ghcautoconf.h
+
+  patchShebangs .
+  ./utils/makePackages.sh copy
+''
diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
new file mode 100644
index 00000000000..c2fb6a03c6b
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -0,0 +1,77 @@
+{ stdenv
+, callPackage
+, fetchgit
+, ghcjsSrcJson ? null
+, ghcjsSrc ? fetchgit (builtins.fromJSON (builtins.readFile ghcjsSrcJson))
+, bootPkgs
+, alex
+, happy
+, stage0
+, haskellLib
+, cabal-install
+, nodejs
+, makeWrapper
+, xorg
+, gmp
+, lib
+, ghcjsDepOverrides ? (_:_:{})
+}:
+
+let
+  passthru = {
+    configuredSrc = callPackage ./configured-ghcjs-src.nix {
+      inherit ghcjsSrc alex happy;
+      inherit (bootPkgs) ghc;
+    };
+    genStage0 = callPackage ./mk-stage0.nix { inherit (passthru) configuredSrc; };
+    bootPkgs = bootPkgs.extend (lib.foldr lib.composeExtensions (_:_:{}) [
+      (self: _: import stage0 {
+        inherit (passthru) configuredSrc;
+        inherit (self) callPackage;
+      })
+
+      (callPackage ./common-overrides.nix { inherit haskellLib alex happy; })
+      ghcjsDepOverrides
+    ]);
+
+    targetPrefix = "";
+    inherit (passthru.bootPkgs.ghcjs) version;
+    isGhcjs = true;
+
+    # Relics of the old GHCJS build system
+    stage1Packages = [];
+    mkStage2 = _: {};
+  };
+
+  libexec =
+    if builtins.compareVersions passthru.bootPkgs.ghcjs.version "8.3" <= 0
+      then "${passthru.bootPkgs.ghcjs}/bin"
+      else "${passthru.bootPkgs.ghcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${passthru.bootPkgs.ghcjs.name}";
+
+in stdenv.mkDerivation {
+    name = "ghcjs";
+    src = passthru.configuredSrc;
+    nativeBuildInputs = [passthru.bootPkgs.ghcjs passthru.bootPkgs.ghc cabal-install nodejs makeWrapper xorg.lndir gmp];
+    phases = ["unpackPhase" "buildPhase"];
+    buildPhase = ''
+      export HOME=$TMP
+      cd lib/boot
+
+      mkdir -p $out/bin
+      mkdir -p $out/libexec
+      lndir ${libexec} $out/bin
+
+      wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec"
+      wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec"
+      wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d"
+
+      env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j $NIX_BUILD_CORES --with-ghcjs-bin $out/bin
+    '';
+
+    enableParallelBuilding = true;
+
+    inherit passthru;
+
+    meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
+  }
+
diff --git a/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix b/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix
new file mode 100644
index 00000000000..f45ebb4511d
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix
@@ -0,0 +1,25 @@
+{ configuredSrc
+, runCommand
+, cabal2nix
+, yq
+}:
+
+runCommand "stage0.nix" {
+  buildInputs = [cabal2nix yq];
+} ''
+  (
+    printf '{ callPackage, configuredSrc }:\n\n{\n\n'
+    yq '.packages | .[]' ${configuredSrc}/stack.yaml -r | sed 's|^\.$|./.|' | sed 's|^\.||' | while read f; do
+      printf '  %s = callPackage\n' \
+        "$(find ${configuredSrc}/$f -name "*.cabal" -maxdepth 1 \
+          | xargs basename \
+          | sed 's/.cabal$//')"
+      printf '(%s) {};' \
+        "$(cabal2nix ${configuredSrc}/$f \
+          | sed 's|${configuredSrc}/|configuredSrc + |g')" \
+        | sed 's/^/    /'
+      printf '\n\n'
+    done
+    printf '}\n'
+  ) > $out
+''
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8a395fbec18..837f8eb794d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -10,7 +10,10 @@ let
     "ghc821Binary"
     "ghcCross"
     "ghcjs"
-    "ghcjsHEAD"
+    "ghcjs710"
+    "ghcjs80"
+    "ghcjs82"
+    "ghcjs84"
     "integer-simple"
   ];
 
@@ -76,14 +79,22 @@ in rec {
       buildLlvmPackages = buildPackages.llvmPackages_5;
       llvmPackages = pkgs.llvmPackages_5;
     };
-    ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
+    ghcjs = compiler.ghcjs82;
+    ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs {
       bootPkgs = packages.ghc7103;
       inherit (pkgs) cabal-install;
     };
-    ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix {
+    ghcjs80 = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix {
       bootPkgs = packages.ghc802;
       inherit (pkgs) cabal-install;
     };
+    ghcjs82 = callPackage ../development/compilers/ghcjs-ng rec {
+      bootPkgs = packages.ghc822;
+      inherit (bootPkgs) alex happy;
+      ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
+      stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
+      ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.2/dep-overrides.nix {};
+    };
 
     # The integer-simple attribute set contains all the GHC compilers
     # build with integer-simple instead of integer-gmp.
@@ -139,18 +150,25 @@ in rec {
       ghc = bh.compiler.ghcHEAD;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
     };
-    ghcjs = callPackage ../development/haskell-modules rec {
+    ghcjs = packages.ghcjs82;
+    ghcjs710 = callPackage ../development/haskell-modules rec {
       buildHaskellPackages = ghc.bootPkgs;
       ghc = bh.compiler.ghcjs;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
-    ghcjsHEAD = callPackage ../development/haskell-modules rec {
+    ghcjs80 = callPackage ../development/haskell-modules rec {
       buildHaskellPackages = ghc.bootPkgs;
       ghc = bh.compiler.ghcjsHEAD;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
+    ghcjs82 = callPackage ../development/haskell-modules rec {
+      buildHaskellPackages = ghc.bootPkgs;
+      ghc = bh.compiler.ghcjs82;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+    };
 
     # The integer-simple attribute set contains package sets for all the GHC compilers
     # using integer-simple instead of integer-gmp.
-- 
GitLab


From 69b584ac3ba7c816f865b8a21b31d013683b86ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 11 May 2018 19:39:37 +0200
Subject: [PATCH 0545/1085] home-assistant: 0.68.1 -> 0.69.0

---
 .../home-assistant/component-packages.nix     | 10 ++++---
 pkgs/servers/home-assistant/default.nix       | 27 ++++++++++++++-----
 pkgs/servers/home-assistant/frontend.nix      |  4 +--
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 1fc3a828603..c530301bbc9 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.68.1";
+  version = "0.69.0";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -165,6 +165,7 @@
     "lock.sesame" = ps: with ps; [  ];
     "lutron" = ps: with ps; [  ];
     "lutron_caseta" = ps: with ps; [  ];
+    "matrix" = ps: with ps; [ matrix-client ];
     "maxcube" = ps: with ps; [  ];
     "media_extractor" = ps: with ps; [  ];
     "media_player.anthemav" = ps: with ps; [  ];
@@ -239,7 +240,6 @@
     "notify.lametric" = ps: with ps; [  ];
     "notify.mailgun" = ps: with ps; [  ];
     "notify.mastodon" = ps: with ps; [  ];
-    "notify.matrix" = ps: with ps; [ matrix-client ];
     "notify.message_bird" = ps: with ps; [  ];
     "notify.pushbullet" = ps: with ps; [ pushbullet ];
     "notify.pushetta" = ps: with ps; [  ];
@@ -261,6 +261,7 @@
     "qwikswitch" = ps: with ps; [  ];
     "rainbird" = ps: with ps; [  ];
     "raincloud" = ps: with ps; [  ];
+    "rainmachine" = ps: with ps; [  ];
     "raspihats" = ps: with ps; [  ];
     "recorder" = ps: with ps; [ sqlalchemy ];
     "remember_the_milk" = ps: with ps; [ httplib2 ];
@@ -299,6 +300,7 @@
     "sensor.dsmr" = ps: with ps; [  ];
     "sensor.dweet" = ps: with ps; [  ];
     "sensor.eddystone_temperature" = ps: with ps; [ construct ];
+    "sensor.eliqonline" = ps: with ps; [  ];
     "sensor.envirophat" = ps: with ps; [  ];
     "sensor.etherscan" = ps: with ps; [  ];
     "sensor.fastdotcom" = ps: with ps; [  ];
@@ -333,6 +335,7 @@
     "sensor.mfi" = ps: with ps; [  ];
     "sensor.mhz19" = ps: with ps; [  ];
     "sensor.miflora" = ps: with ps; [  ];
+    "sensor.mitemp_bt" = ps: with ps; [  ];
     "sensor.modem_callerid" = ps: with ps; [  ];
     "sensor.mopar" = ps: with ps; [  ];
     "sensor.mvglive" = ps: with ps; [ PyMVGLive ];
@@ -345,6 +348,7 @@
     "sensor.plex" = ps: with ps; [  ];
     "sensor.pocketcasts" = ps: with ps; [  ];
     "sensor.pollen" = ps: with ps; [  ];
+    "sensor.postnl" = ps: with ps; [  ];
     "sensor.pushbullet" = ps: with ps; [ pushbullet ];
     "sensor.qnap" = ps: with ps; [  ];
     "sensor.ripple" = ps: with ps; [  ];
@@ -360,6 +364,7 @@
     "sensor.sma" = ps: with ps; [  ];
     "sensor.snmp" = ps: with ps; [ pysnmp ];
     "sensor.sochain" = ps: with ps; [  ];
+    "sensor.socialblade" = ps: with ps; [  ];
     "sensor.speedtest" = ps: with ps; [  ];
     "sensor.spotcrime" = ps: with ps; [  ];
     "sensor.sql" = ps: with ps; [ sqlalchemy ];
@@ -412,7 +417,6 @@
     "switch.netio" = ps: with ps; [  ];
     "switch.orvibo" = ps: with ps; [  ];
     "switch.rachio" = ps: with ps; [  ];
-    "switch.rainmachine" = ps: with ps; [  ];
     "switch.rpi_rf" = ps: with ps; [  ];
     "switch.snmp" = ps: with ps; [ pysnmp ];
     "switch.thinkingcleaner" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index a8091c70dfd..ab5125c035f 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -28,11 +28,18 @@ let
           sha256 = "af7315c9fa99e0bfd195a21106c82c81619b42f0bd9b6e287b797c6b6b6a9918";
         };
       });
+      attrs = super.attrs.overridePythonAttrs (oldAttrs: rec {
+        version = "18.1.0";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b";
+        };
+      });
       astral = super.astral.overridePythonAttrs (oldAttrs: rec {
-        version = "1.6";
+        version = "1.6.1";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083";
+          sha256 = "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d";
         };
       });
       async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec {
@@ -42,6 +49,15 @@ let
           sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0";
         };
       });
+      # used by check_config script
+      # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved
+      colorlog = super.colorlog.overridePythonAttrs (oldAttrs: rec {
+        version = "3.1.4";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d";
+        };
+      });
       hass-frontend = super.callPackage ./frontend.nix { };
     };
   };
@@ -58,7 +74,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.68.1";
+  hassVersion = "0.69.0";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -73,7 +89,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "103py7hfdanr8zk3cl93rm7ngjz0n95kwjbphq7iy8l8hqpzs1m8";
+    sha256 = "05hagifi1338law2mwwik2gjjw1ckjdjh0lg9l8ldsz999dkc2zz";
   };
 
   propagatedBuildInputs = [
@@ -91,8 +107,7 @@ in with py.pkgs; buildPythonApplication rec {
     # The components' dependencies are not included, so they cannot be tested
     py.test --ignore tests/components
     # Some basic components should be tested however
-    # test_not_log_password fails because nothing is logged at all
-    py.test -k "not test_not_log_password" \
+    py.test \
       tests/components/{group,http} \
       tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py
   '';
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 678b5d3826c..168a1ec3b9d 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-frontend";
-  version = "20180426.0";
+  version = "20180509.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "60ff4e0b0c4538fa0be0db9407f95333546940e119a8d3edb9b0d7e1c86b1f3b";
+    sha256 = "11d9c4a07565358e6ee001f5c57c8393b4aaadac0d993a0a39a0387a33644fba";
   };
 
   propagatedBuildInputs = [ user-agents ];
-- 
GitLab


From a707c1365c4f0c43e352402fef5ffebbc93ad246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 12 May 2018 06:10:11 +0200
Subject: [PATCH 0546/1085] python: deluge-client: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix
index 0c06bc55c7a..cc991c7aeb4 100644
--- a/pkgs/development/python-modules/deluge-client/default.nix
+++ b/pkgs/development/python-modules/deluge-client/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "deluge-client";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "27a7f4c6da8f057e03171a493f17340f39f288199a21beb3226a188ab3c02cea";
+    sha256 = "86979ebcb9f1f991554308e88c7a57469cbf339958b44c71cbdcba128291b043";
   };
 
   # it will try to connect to a running instance
-- 
GitLab


From 4ee37b7421fccf01ed6e124ea586736fe2aa5456 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 12 May 2018 10:30:48 +0200
Subject: [PATCH 0547/1085] python.pkgs.ply: move expression

---
 .../python-modules/ply/default.nix            | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 41 +-----------------
 2 files changed, 43 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/development/python-modules/ply/default.nix

diff --git a/pkgs/development/python-modules/ply/default.nix b/pkgs/development/python-modules/ply/default.nix
new file mode 100644
index 00000000000..463468a9b40
--- /dev/null
+++ b/pkgs/development/python-modules/ply/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "ply";
+  version = "3.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} test/testlex.py
+    ${python.interpreter} test/testyacc.py
+  '';
+
+  # Test suite appears broken
+  doCheck = false;
+
+  meta = {
+    homepage = http://www.dabeaz.com/ply/;
+    description = "PLY (Python Lex-Yacc), an implementation of the lex and yacc parsing tools for Python";
+    longDescription = ''
+      PLY is an implementation of lex and yacc parsing tools for Python.
+      In a nutshell, PLY is nothing more than a straightforward lex/yacc
+      implementation.  Here is a list of its essential features: It's
+      implemented entirely in Python; It uses LR-parsing which is
+      reasonably efficient and well suited for larger grammars; PLY
+      provides most of the standard lex/yacc features including support for
+      empty productions, precedence rules, error recovery, and support for
+      ambiguous grammars; PLY is straightforward to use and provides very
+      extensive error checking; PLY doesn't try to do anything more or less
+      than provide the basic lex/yacc functionality.  In other words, it's
+      not a large parsing framework or a component of some larger system.
+    '';
+    license = lib.licenses.bsd3;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a4717ea6a7..c9033c3d825 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9099,46 +9099,7 @@ in {
 
   plone-testing = callPackage ../development/python-modules/plone-testing { };
 
-  ply = buildPythonPackage (rec {
-    name = "ply-3.8";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/ply/${name}.tar.gz";
-      sha256 = "e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8";
-    };
-
-    checkPhase = ''
-      ${python.interpreter} test/testlex.py
-      ${python.interpreter} test/testyacc.py
-    '';
-
-    # Test suite appears broken
-    doCheck = false;
-
-    meta = {
-      homepage = http://www.dabeaz.com/ply/;
-
-      description = "PLY (Python Lex-Yacc), an implementation of the lex and yacc parsing tools for Python";
-
-      longDescription = ''
-        PLY is an implementation of lex and yacc parsing tools for Python.
-        In a nutshell, PLY is nothing more than a straightforward lex/yacc
-        implementation.  Here is a list of its essential features: It's
-        implemented entirely in Python; It uses LR-parsing which is
-        reasonably efficient and well suited for larger grammars; PLY
-        provides most of the standard lex/yacc features including support for
-        empty productions, precedence rules, error recovery, and support for
-        ambiguous grammars; PLY is straightforward to use and provides very
-        extensive error checking; PLY doesn't try to do anything more or less
-        than provide the basic lex/yacc functionality.  In other words, it's
-        not a large parsing framework or a component of some larger system.
-      '';
-
-      license = licenses.bsd3;
-
-      maintainers = [ ];
-    };
-  });
+  ply = callPackage ../development/python-modules/ply { };
 
   plyvel = buildPythonPackage (rec {
     name = "plyvel-0.9";
-- 
GitLab


From 1d43798d250403ea866ade067c5f4afca31abc2a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 12 May 2018 10:32:53 +0200
Subject: [PATCH 0548/1085] python.pkgs.ply: 3.8 -> 3.11

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

diff --git a/pkgs/development/python-modules/ply/default.nix b/pkgs/development/python-modules/ply/default.nix
index 463468a9b40..ae55cac642f 100644
--- a/pkgs/development/python-modules/ply/default.nix
+++ b/pkgs/development/python-modules/ply/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "ply";
-  version = "3.8";
+  version = "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8";
+    sha256 = "00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3";
   };
 
   checkPhase = ''
-- 
GitLab


From af46398f2be1b7f96d54b01c7334d0c5a8dea973 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 02:00:03 -0700
Subject: [PATCH 0549/1085] ibus-engines.table: 1.9.18 -> 1.9.20 (#40100)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/k3qfsk06xxrm7sp4fwv7h5shdq7j1msk-ibus-table-1.9.20/bin/ibus-table-createdb -h’ got 0 exit code
- ran ‘/nix/store/k3qfsk06xxrm7sp4fwv7h5shdq7j1msk-ibus-table-1.9.20/bin/ibus-table-createdb --help’ got 0 exit code
- found 1.9.20 with grep in /nix/store/k3qfsk06xxrm7sp4fwv7h5shdq7j1msk-ibus-table-1.9.20
- directory tree listing: https://gist.github.com/ace63b0dd5941c9f17222549a08ee23c
---
 pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 04a0a1e36db..0d467a6875b 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-table-${version}";
-  version = "1.9.18";
+  version = "1.9.20";
 
   src = fetchFromGitHub {
     owner  = "kaio";
     repo   = "ibus-table";
     rev    = version;
-    sha256 = "0isxgz7f6xhrcv5qrdd6gm3ysmqp3mi5ngnbqz08f7pclllaridp";
+    sha256 = "12rsbg8pfh567bd0n376qciclq5jr63h5gwcm54cs796bxls4w2j";
   };
 
   postPatch = ''
-- 
GitLab


From 23d902a90ffe10b90c3b77f2b9e0a707e143a232 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 02:04:27 -0700
Subject: [PATCH 0550/1085] tsearch_extras: 0.2 -> 0.3 (#40057)

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/4cc503c3c6f22711358d01e0ae7f7d76
---
 pkgs/servers/sql/postgresql/tsearch_extras/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
index c3a452132f2..5140ae1a228 100644
--- a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
+++ b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "tsearch-extras-${version}";
-  version = "0.2";
+  version = "0.3";
 
   src = fetchFromGitHub {
     owner = "zulip";
     repo = "tsearch_extras";
     rev = version;
-    sha256 = "1ivg9zn7f1ks31ixxwywifwhzxn6py8s5ky1djyxnb0s60zckfjg";
+    sha256 = "0i3i99lw80jwd4xflgdqabxmn1dnm1gm7dzf1mqv2drllxcy3yix";
   };
 
   nativenativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From d9aa9e950b2a9d68a06a0c42aa34f848421e2a9f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 02:14:56 -0700
Subject: [PATCH 0551/1085] sakura: 3.5.0 -> 3.6.0 (#40064)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/pzgl7k3a4c92m6jc7mka9jy9xrhjijdq-sakura-3.6.0/bin/sakura --help’ got 0 exit code
- ran ‘/nix/store/pzgl7k3a4c92m6jc7mka9jy9xrhjijdq-sakura-3.6.0/bin/.sakura-wrapped --help’ got 0 exit code
- found 3.6.0 with grep in /nix/store/pzgl7k3a4c92m6jc7mka9jy9xrhjijdq-sakura-3.6.0
- directory tree listing: https://gist.github.com/cc68e1af204099f1847caeb61afaf03d
---
 pkgs/applications/misc/sakura/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 7c74bb6cd45..94782bdd860 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sakura-${version}";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchurl {
     url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
-    sha256 = "0fhcn3540iw22l5zg3njh5z8cj0g2n9p6fvagjqa5zc323jfsc7b";
+    sha256 = "1q463qm41ym7jb3kbzjz7b6x549vmgkb70arpkhsf86yxly1y5m1";
   };
 
   nativeBuildInputs = [ cmake perl pkgconfig ];
-- 
GitLab


From 14720761763a06e98508f31bcba6626a95fd7518 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 02:17:32 -0700
Subject: [PATCH 0552/1085] nnn: 1.7 -> 1.8 (#40083)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/ry70cgfhdagmk70n6wn6968mqg8h3js8-nnn-1.8/bin/nlay -h’ got 0 exit code
- ran ‘/nix/store/ry70cgfhdagmk70n6wn6968mqg8h3js8-nnn-1.8/bin/nlay --help’ got 0 exit code
- ran ‘/nix/store/ry70cgfhdagmk70n6wn6968mqg8h3js8-nnn-1.8/bin/nlay help’ got 0 exit code
- found 1.8 with grep in /nix/store/ry70cgfhdagmk70n6wn6968mqg8h3js8-nnn-1.8
- directory tree listing: https://gist.github.com/261e9182ffd2085e4d82ca4daefdcee6
---
 pkgs/applications/misc/nnn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index ae1c178e571..b4832a72c2b 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nnn-${version}";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "nnn";
     rev = "v${version}";
-    sha256 = "03cgsdj4l19gla5fx9d1ydqirpsah9d7gx9jaik73x38zqsabr89";
+    sha256 = "0sd8djig56163k0b0y4a7kg3malxlg08gayjw4zmvqaihvbbkc6v";
   };
 
   configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
-- 
GitLab


From a19cc36e1a2f55767a7413effd02598278c6003f Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 12 May 2018 11:37:35 +0200
Subject: [PATCH 0553/1085] nixos/tests/mysql-backup: fix non-deterministic
 failure (#40258)

Sometimes failed because of delayed creation of the backup file.
---
 nixos/tests/mysql-backup.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix
index f5bcc460cba..ff365098883 100644
--- a/nixos/tests/mysql-backup.nix
+++ b/nixos/tests/mysql-backup.nix
@@ -23,17 +23,25 @@ import ./make-test.nix ({ pkgs, ... } : {
   testScript =
     '' startAll;
 
+       # Delete backup file that may be left over from a previous test run.
+       # This is not needed on Hydra but useful for repeated local test runs.
+       $master->execute("rm -f /var/backup/mysql/testdb.gz");
+
        # Need to have mysql started so that it can be populated with data.
        $master->waitForUnit("mysql.service");
 
-       # Wait for testdb to be populated.
-       $master->sleep(10);
+       # Wait for testdb to be fully populated (5 rows).
+       $master->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
 
-       # Do a backup and wait for it to finish.
+       # Do a backup and wait for it to start
        $master->startJob("mysql-backup.service");
        $master->waitForJob("mysql-backup.service");
 
-       # Check that data appears in backup
+       # wait for backup to fail, because of database 'doesnotexist'
+       $master->waitUntilFails("systemctl is-active -q mysql-backup.service");
+
+       # wait for backup file and check that data appears in backup
+       $master->waitForFile("/var/backup/mysql/testdb.gz");
        $master->succeed("${pkgs.gzip}/bin/zcat /var/backup/mysql/testdb.gz | grep hello");
 
        # Check that a failed backup is logged
-- 
GitLab


From ec95930b20936e01d1bf1718a86af08472617f8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 06:36:01 -0700
Subject: [PATCH 0554/1085] jackett: 0.8.929 -> 0.8.953
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/n7k1adzjashxif5k4m84ywij7bh2ck14-jackett-0.8.953/bin/Jackett -h’ got 0 exit code
- ran ‘/nix/store/n7k1adzjashxif5k4m84ywij7bh2ck14-jackett-0.8.953/bin/Jackett help’ got 0 exit code
- found 0.8.953 with grep in /nix/store/n7k1adzjashxif5k4m84ywij7bh2ck14-jackett-0.8.953
- directory tree listing: https://gist.github.com/32e346c875f3b936a083c815724f8a9f
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 8324af8b3d0..2bbb4674440 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.929";
+  version = "0.8.953";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "1dq69734f6x8iw1jpvln5lq7bykpwky6iiwz8iwwamwg8143f20p";
+    sha256 = "0jc7c0z315wh73b75fxz1ad2qy1z5nsvpr7iml4998k15sl7w7mi";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 18f09e43e3b04310f08312a1c7aada259babfb95 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 06:15:23 -0700
Subject: [PATCH 0555/1085] libfilezilla: 0.12.1 -> 0.12.2

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.12.2 with grep in /nix/store/1a0qm1j932zsiysy0hjhs8fvg3hsq6cf-libfilezilla-0.12.2
- directory tree listing: https://gist.github.com/13640dfb6e0ad1f3a5005c8c75cbc6c1
---
 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 3b27ffc6d38..f3a6983acae 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.12.1";
+  version = "0.12.2";
 
   src = fetchurl {
     url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
-    sha256 = "1gbqm42dd0m3fvqz3bk53889479dvn8679zp6ba8a9q2br2wkvv0";
+    sha256 = "1v461hwdk74whp89s490dj1z18gfqf9bz9140m5f11rsvrpid33p";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 9572c5415fb9ee0f9bc27955b3ba0756fcc0fa3c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 06:14:45 -0700
Subject: [PATCH 0556/1085] libraw: 0.18.10 -> 0.18.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/raw-identify -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/raw-identify --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/raw-identify help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/unprocessed_raw -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/unprocessed_raw --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/unprocessed_raw help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/4channels -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/4channels --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/4channels help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/simple_dcraw -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/simple_dcraw --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/simple_dcraw help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/mem_image -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/mem_image --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/mem_image help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_half -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_half --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_half help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/half_mt -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/half_mt --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/half_mt help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/multirender_test -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/multirender_test --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/multirender_test help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/postprocessing_benchmark -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/postprocessing_benchmark help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_emu -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_emu help’ got 0 exit code
- found 0.18.11 with grep in /nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11
- directory tree listing: https://gist.github.com/237be4ff577316cefd0205ca6699ea88
---
 pkgs/development/libraries/libraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 1213f93112f..d70a9fc29f5 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.18.10";
+  version = "0.18.11";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "0klrzg1cn8ksxqbhx52dldi5bbmad190npnhhgkyr2jzpgrbpj88";
+    sha256 = "07a7k83hx7icahh6jaxfbd7pw5jjm5i11xcqjj31b28d1aj29xvw";
   };
 
   outputs = [ "out" "lib" "dev" "doc" ];
-- 
GitLab


From af8ddc3db770e41705fe81ea1a9768fa7c206c13 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 06:12:17 -0700
Subject: [PATCH 0557/1085] libpqxx: 6.2.2 -> 6.2.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/6mshwwzcsvpxxwn4hw9msm5ffwyy5wv3-libpqxx-6.2.3/bin/pqxx-config -h’ got 0 exit code
- ran ‘/nix/store/6mshwwzcsvpxxwn4hw9msm5ffwyy5wv3-libpqxx-6.2.3/bin/pqxx-config --help’ got 0 exit code
- ran ‘/nix/store/6mshwwzcsvpxxwn4hw9msm5ffwyy5wv3-libpqxx-6.2.3/bin/pqxx-config help’ got 0 exit code
- found 6.2.3 with grep in /nix/store/6mshwwzcsvpxxwn4hw9msm5ffwyy5wv3-libpqxx-6.2.3
- directory tree listing: https://gist.github.com/509fd3c73bc4d5401153a2eb6e21a804
---
 pkgs/development/libraries/libpqxx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index a6dd719a381..f027b767db6 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libpqxx-${version}";
-  version = "6.2.2";
+  version = "6.2.3";
 
   src = fetchFromGitHub {
     owner = "jtv";
     repo = "libpqxx";
     rev = version;
-    sha256 = "0f7mkl29v6d47kkdpl2gkb9xc5lnih2pq9pk3cq6nc2j6w758yp5";
+    sha256 = "130mkkq46l23aaxfc2bnlf9mi3qxfn5465ziz0048bxymbxa7b58";
   };
 
   nativeBuildInputs = [ gnused python2 ];
-- 
GitLab


From cbfde5e8f278c4a75efbcaf161faf73fd5135e11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 05:58:09 -0700
Subject: [PATCH 0558/1085] krita: 4.0.1 -> 4.0.2

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.0.2 with grep in /nix/store/frfrgq3pkda5hjpgjzm6bw9b1zp8c575-krita-4.0.2
- directory tree listing: https://gist.github.com/dc5ab15c03d296eeef4134cf33666c30
---
 pkgs/applications/graphics/krita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 5af0e627d7d..f86694ebc6c 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -9,11 +9,11 @@
 
 mkDerivation rec {
   name = "krita-${version}";
-  version = "4.0.1";
+  version = "4.0.2";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "0k55ybvna40dx4fqygnix7bnhjaanak3ckb108hny2k7sspy62pc";
+    sha256 = "136nia6z8l9czk3ls2c9dpk617cvfilfhx0s838g5nrqxh4kn0cf";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
-- 
GitLab


From 578d3a81aca532fd45f07ac24e6a7cfa1f5ec31a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 04:45:54 -0700
Subject: [PATCH 0559/1085] miniupnpd: 2.0.20180503 -> 2.1

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.1 with grep in /nix/store/1gdrqzzksdxk4vnbgaa2zlsvyx1qdn7h-miniupnpd-2.1
- directory tree listing: https://gist.github.com/033415d078a1ec6d4641ed723b27e29b
---
 pkgs/tools/networking/miniupnpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 2f907df8dca..07112d1497a 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, iptables, libuuid, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-2.0.20180503";
+  name = "miniupnpd-2.1";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "031aw66b09ij2yv640xjbp302vkwr8ima5cz7a0951jzhqbfs6xn";
+    sha256 = "1hg0zzvvzfgpnmngmd3ffnsk9x18lwlxlpw5jgh7y6b1jrvr824m";
     name = "${name}.tar.gz";
   };
 
-- 
GitLab


From 5f41c98f89855d69c838e26f1e2effdb0d43973d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 04:21:19 -0700
Subject: [PATCH 0560/1085] libwebsockets: 2.4.2 -> 3.0.0

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.0.0 with grep in /nix/store/m8jcyxq9zxn19vzwmvy8jld4kmjcwnmj-libwebsockets-3.0.0
- directory tree listing: https://gist.github.com/3fda3b4331b75bec575d1a71ba21e84a
---
 pkgs/development/libraries/libwebsockets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 3bc04f9ae3d..1147c9606ad 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libwebsockets-${version}";
-  version = "2.4.2";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "warmcat";
     repo = "libwebsockets";
     rev = "v${version}";
-    sha256 = "0gbprzsi054f9gr31ihcf0cq7zfkybrmdp6894pmzb5hcv4wnh9i";
+    sha256 = "0cz4f05qd9b2bm27h5pkwym2cl7ff73lgirzwjppwf9b18if58yv";
   };
 
   buildInputs = [ cmake openssl zlib libuv ];
-- 
GitLab


From 5d402612d5f01d2ecb3218a996f2ee4f9a9cbcf0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 23:49:53 -0700
Subject: [PATCH 0561/1085] streamlink: 0.10.0 -> 0.12.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/.streamlink-wrapped -h’ got 0 exit code
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/.streamlink-wrapped --help’ got 0 exit code
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/.streamlink-wrapped -V’ and found version 0.12.1
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/.streamlink-wrapped --version’ and found version 0.12.1
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/streamlink -h’ got 0 exit code
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/streamlink --help’ got 0 exit code
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/streamlink -V’ and found version 0.12.1
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/streamlink --version’ and found version 0.12.1
- found 0.12.1 with grep in /nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1
- directory tree listing: https://gist.github.com/09fbfb8c035d471bd38a592acf455d9a
---
 pkgs/applications/video/streamlink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index 9ff54bd681f..3f5f0c05c30 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,14 +1,14 @@
 { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.10.0";
+  version = "0.12.1";
   name = "streamlink-${version}";
 
   src = fetchFromGitHub {
     owner = "streamlink";
     repo = "streamlink";
     rev = "${version}";
-    sha256 = "1p9gkwcvqlnv09ihqh71nh82nnmq9ybp1v8d8kd2vhkg1vm5ximn";
+    sha256 = "0r63fjp5qhnbp5kr4w2nn3gnj0wr0ik1pw1gyry8jl9rp2jq9db5";
   };
 
   checkInputs = with pythonPackages; [ pytest mock requests-mock ];
-- 
GitLab


From 66186deea3a6495393987a8b2ec40a70e93a3e55 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 04:14:40 -0700
Subject: [PATCH 0562/1085] mediainfo-gui: 18.03.1 -> 18.05

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/c27b5456712218aff8abefa573efd9d6
---
 pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 4fa3b4ee435..b6ec3305cb3 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
 , desktop-file-utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "18.03.1";
+  version = "18.05";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1mpwbqvw6awni5jq7i5yqvf6wgwjc37sl42q20rdq2agdlslqrkr";
+    sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From c10c977e00c4bae28215460b73432eed27cd360a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 04:10:04 -0700
Subject: [PATCH 0563/1085] mediainfo: 18.03.1 -> 18.05
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/5ckclh9xvqkrp4a329s8w294ggv0mm48-mediainfo-18.05/bin/mediainfo -h’ got 0 exit code
- ran ‘/nix/store/5ckclh9xvqkrp4a329s8w294ggv0mm48-mediainfo-18.05/bin/mediainfo --help’ got 0 exit code
- directory tree listing: https://gist.github.com/5fa8e019ba53a84987e3b8d9e47a91af
---
 pkgs/applications/misc/mediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index dcc2a1bf43c..5b2f8125f72 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "18.03.1";
+  version = "18.05";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1mpwbqvw6awni5jq7i5yqvf6wgwjc37sl42q20rdq2agdlslqrkr";
+    sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From d35604d9107844db233976c41ccbdb3138f37bf4 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Fri, 11 May 2018 23:53:10 +0900
Subject: [PATCH 0564/1085] rPackages: fix binutils path on Darwin

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 6c00e58d9e7..451fc1dc6fe 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -392,7 +392,7 @@ let
     nat = [ pkgs.which ];
     nat_nblast = [ pkgs.which ];
     nat_templatebrains = [ pkgs.which ];
-    pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ];
+    pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
     RMark = [ pkgs.which ];
     RPushbullet = [ pkgs.which ];
     qtpaint = [ pkgs.cmake ];
@@ -409,7 +409,7 @@ let
     fftw = [ pkgs.pkgconfig ];
     geoCount = [ pkgs.pkgconfig ];
     gdtools = [ pkgs.pkgconfig ];
-    JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ];
+    JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
     kza = [ pkgs.pkgconfig ];
     magick = [ pkgs.pkgconfig ];
     mwaved = [ pkgs.pkgconfig ];
@@ -759,7 +759,7 @@ let
     JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: {
       postPatch = ''
         for file in {R,src}/*.R; do
-            sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file
+            sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file
         done
       '';
       preConfigure = ''
@@ -774,7 +774,7 @@ let
     pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: {
       postPatch = lib.optionalString stdenv.isDarwin ''
         for file in R/*.{r,r.in}; do
-            sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file
+            sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file
         done
       '';
     });
-- 
GitLab


From 1bf84200473ab95fe983b9b15731d693f205d1bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 04:07:39 -0700
Subject: [PATCH 0565/1085] mopidy-iris: 3.17.5 -> 3.18.0

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.18.0 with grep in /nix/store/nldsjybf1v0fbjnbfgcknykr4q6fjq9c-Mopidy-Iris-3.18.0
- directory tree listing: https://gist.github.com/0ad20de473538813e443e421603c7997
---
 pkgs/applications/audio/mopidy/iris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index cfd2a4173da..eb4dce81416 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.17.5";
+  version = "3.18.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "011bccvjy1rdrc43576hgfb7md404ziqmkam6na2z6v9km1b9gwr";
+    sha256 = "0j56pj7cqymdk22bjw33c9rz4n36k693gs3w6kg6y68as8l6qpvb";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 32558af970435de96be7fea08e3eabce96334ddb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 03:51:40 -0700
Subject: [PATCH 0566/1085] opendht: 1.7.1 -> 1.7.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtnode -h’ got 0 exit code
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtnode --help’ got 0 exit code
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtnode help’ got 0 exit code
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtchat -h’ got 0 exit code
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtchat --help’ got 0 exit code
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtscanner -h’ got 0 exit code
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtscanner --help’ got 0 exit code
- found 1.7.2 with grep in /nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2
- directory tree listing: https://gist.github.com/bae66cd16ade0c7ae0789b34e0528267
---
 pkgs/development/libraries/opendht/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index 4265f1ee98a..19d3d4f888f 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   name = "opendht-${version}";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "savoirfairelinux";
     repo = "opendht";
     rev = "${version}";
-    sha256 = "1702abnsaf473c56pz18xjgvc2pjhba8dyfryir5dg34zw1c94sc";
+    sha256 = "0nia3gkn5jqs7lf0v6jkhh1c0czdx9743imgi77kcvn98k2n6sjc";
   };
 
   buildInputs = [
-- 
GitLab


From 35ba9e780653c8d010f4c71edeed331ae45652a1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 03:39:36 -0700
Subject: [PATCH 0567/1085] palemoon: 27.9.0 -> 27.9.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/zcw80dly8ka0wa1afkl8wb01mg4aqdhx-palemoon-27.9.1/bin/palemoon -h’ got 0 exit code
- ran ‘/nix/store/zcw80dly8ka0wa1afkl8wb01mg4aqdhx-palemoon-27.9.1/bin/palemoon --help’ got 0 exit code
- ran ‘/nix/store/zcw80dly8ka0wa1afkl8wb01mg4aqdhx-palemoon-27.9.1/bin/palemoon -V’ and found version 27.9.1
- ran ‘/nix/store/zcw80dly8ka0wa1afkl8wb01mg4aqdhx-palemoon-27.9.1/bin/palemoon -v’ and found version 27.9.1
- ran ‘/nix/store/zcw80dly8ka0wa1afkl8wb01mg4aqdhx-palemoon-27.9.1/bin/palemoon --version’ and found version 27.9.1
- found 27.9.1 with grep in /nix/store/zcw80dly8ka0wa1afkl8wb01mg4aqdhx-palemoon-27.9.1
- directory tree listing: https://gist.github.com/5f0a5b316dd9c9cc0a59be36561c1b66
---
 pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index aa77f084734..3f44d157660 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   name = "palemoon-${version}";
-  version = "27.9.0";
+  version = "27.9.1";
 
   src = fetchFromGitHub {
     name   = "palemoon-src";
     owner  = "MoonchildProductions";
     repo   = "Pale-Moon";
     rev    = version + "_Release";
-    sha256 = "181g1hy4k9xr6nlrw8jamp541gr5znny4mmpwwaa1lzq5v1w1sw6";
+    sha256 = "1cjd0liy3x7iqx8g8mbwdrr0f2aiqjiaifzzkngcvx3vfmphj97k";
   };
 
   desktopItem = makeDesktopItem {
-- 
GitLab


From d6d6b1e6960cf6c21591615dc6c4228023dbf6df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 02:00:26 -0700
Subject: [PATCH 0568/1085] pdfpc: 4.1.1 -> 4.1.2

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.1.2 with grep in /nix/store/5mwaxcqfbb807ywds98xl27rrwb51nv1-pdfpc-4.1.2
- directory tree listing: https://gist.github.com/5767dc3e3f368aaecb0c729b053b9209
---
 pkgs/applications/misc/pdfpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index f3fd091363f..e61613a4b30 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "pdfpc";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     repo = "pdfpc";
     owner = "pdfpc";
     rev = "v${version}";
-    sha256 = "1yjh9rx49d24wlwg44r2a6b5scybp8l1fi9wyf05sig6zfziw1mm";
+    sha256 = "01c2bswvxqk4biidpfj3hzf0kdk69i56ibk2wfi8v50qm105psli";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 47c672b4b1fc512e8b5f0fb2e4566f41402d60f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 01:48:31 -0700
Subject: [PATCH 0569/1085] picard-tools: 2.18.3 -> 2.18.4

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.18.4 with grep in /nix/store/k62ym9i08d0w9sgmdjjfyy4lf2n9ig7p-picard-tools-2.18.4
- directory tree listing: https://gist.github.com/4d9e3062e701681d9b53033dc9511663
---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index ed90ed5aa04..e215b6f3862 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.18.3";
+  version = "2.18.4";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0w4v30vnyr549hd9lhj1sm69whssabqvhfrbavxfjbl2k9fw83qf";
+    sha256 = "0qwalb49g8s6dswhhk12ny33xzzj38xa2rj6p6ar0hrwh7aijlqc";
   };
 
   buildInputs = [ jre makeWrapper ];
-- 
GitLab


From d7a71b3003e5eadba3756a35ef3b4c9f3fd8e3d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 01:45:55 -0700
Subject: [PATCH 0570/1085] powerdns: 4.1.1 -> 4.1.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdns_control -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdns_control --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdnsutil -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdnsutil --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdnsutil help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdnsutil --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/zone2sql --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/zone2sql --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/zone2json --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/zone2json --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsgram -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsgram --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsgram help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsgram --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsreplay -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsreplay --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsreplay help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsreplay --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscan -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscan --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscan help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscan --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscope -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscope --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscope help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscope --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnswasher --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnswasher --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dumresp --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dumresp --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdns_notify --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdns_notify --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/nproxy -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/nproxy --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/nproxy --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/nsec3dig --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/nsec3dig --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/stubquery -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/stubquery --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/stubquery help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/stubquery --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/ixplore --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/ixplore --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/sdig --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/sdig --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/calidns -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/calidns --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/calidns --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsbulktest -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsbulktest --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsbulktest --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnstcpbench -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnstcpbench --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnstcpbench --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/zone2ldap --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/zone2ldap --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnspcap2protobuf --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnspcap2protobuf --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdns_server --help’ got 0 exit code
- found 4.1.2 with grep in /nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2
- directory tree listing: https://gist.github.com/35d763a9dcfb4d88e41f300f06f27168
---
 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 cde2fe1a426..0ef24a97f88 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "powerdns-${version}";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchurl {
     url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
-    sha256 = "1fh4zgj0gxgcnnhnih8k6fbw18hb9brkkrfpx3mj8b4a3hr8ilq8";
+    sha256 = "15anf9x4h3acf7rhvaim4595v2hrz7mn4va9qv18bfnif40vxn46";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From da1eb254b0e36fbb65416e9ad084ec99f7248279 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 05:00:03 -0700
Subject: [PATCH 0571/1085] syslogng: 3.14.1 -> 3.15.1 (#40062)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/loggen -h’ got 0 exit code
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/loggen --help’ got 0 exit code
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/loggen -V’ and found version 3.15.1
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/loggen --version’ and found version 3.15.1
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/syslog-ng -h’ got 0 exit code
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/syslog-ng --help’ got 0 exit code
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/syslog-ng-ctl --help’ got 0 exit code
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/syslog-ng-debun -h’ got 0 exit code
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/syslog-ng-debun help’ got 0 exit code
- found 3.15.1 with grep in /nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1
- directory tree listing: https://gist.github.com/e99978b52b48e592a7c12121b246128c
---
 pkgs/tools/system/syslog-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index b356cd1d484..b47f5c98c4d 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -11,11 +11,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "3.14.1";
+  version = "3.15.1";
 
   src = fetchurl {
     url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
-    sha256 = "0i79qib47cwg6kd5h4w277h942d6ahb1aj09243rlallr46jci82";
+    sha256 = "1vzrg6s30wc2as2s42h7a1qvyxqx26nq895r9y75aasfcwlbvnm2";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
-- 
GitLab


From ae587fcd422cfe10be5af9934ab8be6c2a1ccd48 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:58:11 -0700
Subject: [PATCH 0572/1085] skrooge: 2.12.0 -> 2.13.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/l83qij463yvk1nqxahdcm9amfnp7zdm8-skrooge-2.13.0/bin/skroogeconvert -h’ got 0 exit code
- ran ‘/nix/store/l83qij463yvk1nqxahdcm9amfnp7zdm8-skrooge-2.13.0/bin/skroogeconvert --help’ got 0 exit code
- found 2.13.0 with grep in /nix/store/l83qij463yvk1nqxahdcm9amfnp7zdm8-skrooge-2.13.0
- directory tree listing: https://gist.github.com/699ec87fffb73399c86ad11632ed9b17
---
 pkgs/applications/office/skrooge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index cd83205172b..e2abba26ff7 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -7,11 +7,11 @@
 
 mkDerivation rec {
   name = "skrooge-${version}";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "0f7jwl05y4gjwasjcbsx2rrva81abyf0hgdbkh7h3dl7nxz9h6g1";
+    sha256 = "1f1k0fkfhism1jyx3yxi8rdf1jrmp2vaphmz7fgh9hk18ndvss7d";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 21ac09ebdf075b84cb04770ad9ee32fbe61c57f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:21:28 -0700
Subject: [PATCH 0573/1085] sfml: 2.4.2 -> 2.5.0

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.5.0 with grep in /nix/store/j708rilms5fpihj454xv4m8yph07v3y5-sfml-2.5.0
- directory tree listing: https://gist.github.com/2efaabd811738a49adb17b7c96980837
---
 pkgs/development/libraries/sfml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index d34280c1624..f52b7905c6e 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -3,14 +3,14 @@
 }:
 
 let
-  version = "2.4.2";
+  version = "2.5.0";
 in
 
 stdenv.mkDerivation rec {
   name = "sfml-${version}";
   src = fetchurl {
     url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";
-    sha256 = "cf268fb487e4048c85e5b2f53d62596854762c98cba1c1b61ccd91f78253ef4b";
+    sha256 = "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab";
   };
   buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew
                   libXrandr libXrender udev xcbutilimage
-- 
GitLab


From bb950e22e1cfbca677e09deb56342aed6294b752 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:19:40 -0700
Subject: [PATCH 0574/1085] rabbitmq-c: 0.8.0 -> 0.9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/4k9n5w1zcpnx1qq6rvdy2nc7zl7pkb7i-rabbitmq-c-0.9.0/bin/amqp-publish --help’ got 0 exit code
- ran ‘/nix/store/4k9n5w1zcpnx1qq6rvdy2nc7zl7pkb7i-rabbitmq-c-0.9.0/bin/amqp-get --help’ got 0 exit code
- ran ‘/nix/store/4k9n5w1zcpnx1qq6rvdy2nc7zl7pkb7i-rabbitmq-c-0.9.0/bin/amqp-consume --help’ got 0 exit code
- ran ‘/nix/store/4k9n5w1zcpnx1qq6rvdy2nc7zl7pkb7i-rabbitmq-c-0.9.0/bin/amqp-declare-queue --help’ got 0 exit code
- ran ‘/nix/store/4k9n5w1zcpnx1qq6rvdy2nc7zl7pkb7i-rabbitmq-c-0.9.0/bin/amqp-delete-queue --help’ got 0 exit code
- found 0.9.0 with grep in /nix/store/4k9n5w1zcpnx1qq6rvdy2nc7zl7pkb7i-rabbitmq-c-0.9.0
- directory tree listing: https://gist.github.com/15d9dcbdbc027933140607d48794a9a3
---
 pkgs/development/libraries/rabbitmq-c/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix
index c841d82ccce..2a0125de01f 100644
--- a/pkgs/development/libraries/rabbitmq-c/default.nix
+++ b/pkgs/development/libraries/rabbitmq-c/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rabbitmq-c-${version}";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "alanxz";
     repo = "rabbitmq-c";
     rev = "v${version}";
-    sha256 = "0vjh1q3hyzrq1iiddy28vvwpwwn4px00mjc2hqp4zgfpis2xlqbj";
+    sha256 = "1mhzxyh9pmpxjjbyy8hd34gm39sxf73r1ldk8zjfsfbs26ggrppz";
   };
 
   buildInputs = [ cmake openssl popt xmlto ];
-- 
GitLab


From 366b16d8e10f9a700d45d5f2d95fc906f6257292 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:17:23 -0700
Subject: [PATCH 0575/1085] rust-bindgen: 0.36.0 -> 0.36.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/vpn165c8nv09k30dsl7gx0crzbdzw4im-rust-bindgen-0.36.1/bin/bindgen -h’ got 0 exit code
- ran ‘/nix/store/vpn165c8nv09k30dsl7gx0crzbdzw4im-rust-bindgen-0.36.1/bin/bindgen --help’ got 0 exit code
- ran ‘/nix/store/vpn165c8nv09k30dsl7gx0crzbdzw4im-rust-bindgen-0.36.1/bin/bindgen -V’ and found version 0.36.1
- ran ‘/nix/store/vpn165c8nv09k30dsl7gx0crzbdzw4im-rust-bindgen-0.36.1/bin/bindgen --version’ and found version 0.36.1
- found 0.36.1 with grep in /nix/store/vpn165c8nv09k30dsl7gx0crzbdzw4im-rust-bindgen-0.36.1
- directory tree listing: https://gist.github.com/6731d17415819fe988768028fda0e150
---
 pkgs/development/tools/rust/bindgen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 2f4c89ab43b..36fa1019705 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.36.0";
+  version = "0.36.1";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rust-bindgen";
     rev = "v${version}";
-    sha256 = "1bpya490qh2jvq99mdlcifj6mgn3yxr0sqas6y5xw842b46g6hi6";
+    sha256 = "0y99dvkbkd4vhac26dmc3bwf6z2m85p2il7mndvv8liam012pkbz";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 0ad25d6ae2a4a4bb6f64c129f2f25bfd77a20b0b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:09:54 -0700
Subject: [PATCH 0576/1085] remarshal: 0.7.0 -> 0.8.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2json-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2json-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2json-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2json-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2json -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2json --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2json -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2json --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2toml-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2toml-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2toml-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2toml-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2toml -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2toml --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2toml -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2toml --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2yaml-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2yaml-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2yaml-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2yaml-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2yaml -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2yaml --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2yaml -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2yaml --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.remarshal-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.remarshal-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.remarshal-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.remarshal-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/remarshal -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/remarshal --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/remarshal -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/remarshal --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2json-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2json-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2json-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2json-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2json -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2json --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2json -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2json --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2toml-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2toml-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2toml-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2toml-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2toml -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2toml --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2toml -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2toml --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2yaml-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2yaml-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2yaml-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2yaml-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2yaml -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2yaml --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2yaml -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2yaml --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2json-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2json-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2json-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2json-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2json -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2json --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2json -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2json --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2toml-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2toml-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2toml-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2toml-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2toml -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2toml --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2toml -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2toml --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2yaml-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2yaml-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2yaml-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2yaml-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2yaml -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2yaml --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2yaml -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2yaml --version’ and found version 0.8.0
- found 0.8.0 with grep in /nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0
- directory tree listing: https://gist.github.com/8dc1ba1b525a1d9d051b9cbbbf7fbe08
---
 pkgs/development/tools/remarshal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix
index 23c9768f7e0..79cca444a1e 100644
--- a/pkgs/development/tools/remarshal/default.nix
+++ b/pkgs/development/tools/remarshal/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "remarshal";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner  = "dbohdan";
     repo   = "remarshal";
     rev    = "v${version}";
-    sha256 = "1wsgvzfp40lvly7nyyhv9prip4vi32rfc8kdji587jpw28zc1dfb";
+    sha256 = "192r1mfd5yj6kg6fqmkjngdlgn25g5rkvm0p6xaflpvavnhvhnsj";
   };
 
   propagatedBuildInputs = with python3Packages; [
-- 
GitLab


From 6557ea2b454b9d720487e5a56c5ab1e065f30abd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 23:35:24 -0700
Subject: [PATCH 0577/1085] sundials: 3.1.0 -> 3.1.1

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.1.1 with grep in /nix/store/fkdjdcj8ydq78an3dxgg2ppalahccla5-sundials-3.1.1
- directory tree listing: https://gist.github.com/bc116dd93142b639fe041213e8223715
---
 pkgs/development/libraries/sundials/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index 41f7267fdca..7bf31499743 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
 
   pname = "sundials";
-  version = "3.1.0";
+  version = "3.1.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
   url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
-  sha256 = "0fnlrpj6qjamxahd70r4vsgv85kxbgh93gxqk5xzf9ln6a7jzm8q";
+  sha256 = "090s8ymhd0g1s1d44fa73r5yi32hb4biwahhbfi327zd64yn8kd2";
   };
 
   preConfigure = ''
-- 
GitLab


From 5956939f352a31b2ce749d0570f38896574a856b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 23:32:51 -0700
Subject: [PATCH 0578/1085] wireless-regdb: 2017.12.23 -> 2018.05.09

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/6eb5b27b95c943023d5aa76dab9d870e
---
 pkgs/data/misc/wireless-regdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index 70f217f1b7e..0805a62b15e 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "wireless-regdb-${version}";
-  version = "2017.12.23";
+  version = "2018.05.09";
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz";
-    sha256 = "1faa394frq0126h2z28kp4dwknx6zqm5nar4552g7rwqvl2yclqf";
+    sha256 = "0db4p8m194cjydrv9q7ygx62v202sighb9pizbn8a29anvm0cmzd";
   };
 
   dontBuild = true;
-- 
GitLab


From 4feaaf68fbed9d1607d3029958c38bd15544c805 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 05:04:41 -0700
Subject: [PATCH 0579/1085] urh: 2.0.2 -> 2.0.4 (#40059)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/g2bnnh1shkjhn7jyvjfrjyfv7li4wrld-urh-2.0.4/bin/.urh-wrapped --version’ and found version 2.0.4
- ran ‘/nix/store/g2bnnh1shkjhn7jyvjfrjyfv7li4wrld-urh-2.0.4/bin/urh --version’ and found version 2.0.4
- found 2.0.4 with grep in /nix/store/g2bnnh1shkjhn7jyvjfrjyfv7li4wrld-urh-2.0.4
- directory tree listing: https://gist.github.com/f984d6b54a7cfcf840ab5c9a24c0ac95
---
 pkgs/applications/misc/urh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index fa2f1616644..b1966539f2c 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "2.0.2";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "1qqb31y65rd85rf3gvxxxy06hm89ary00km1ac84qz5bwm6n5fyb";
+    sha256 = "1b796lfwasp02q1340g43z0gmza5y6jn1ga6nb22vfas0yvqpz6p";
   };
 
   buildInputs = [ hackrf rtl-sdr ];
-- 
GitLab


From 058e10f24171fa20d0ef536281812b65b347c44c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 23:31:50 -0700
Subject: [PATCH 0580/1085] gnome3.webkitgtk: 2.20.1 -> 2.20.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2/bin/WebKitWebDriver -h’ got 0 exit code
- ran ‘/nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2/bin/WebKitWebDriver --help’ got 0 exit code
- found 2.20.2 with grep in /nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2
- directory tree listing: https://gist.github.com/e3496e2d8a6b933a107141f5caecb92d

(cherry picked from commit 926dc3881eb4e69dab6000c4bff473c658608a7e)

Note from @obadz: merged #40315 to staging accidentally but this should go to
master due to CVE hence this cherry-pick.
---
 pkgs/development/libraries/webkitgtk/2.20.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix
index 3cc26b512c8..8b25a20d8eb 100644
--- a/pkgs/development/libraries/webkitgtk/2.20.nix
+++ b/pkgs/development/libraries/webkitgtk/2.20.nix
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.20.1";
+  version = "2.20.2";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0nc9dj05dbk31ciip08b3rdsfja7ckc5mgagrj030fafza2k5r23";
+    sha256 = "1qi6nnj4qidzija1am9xscwjxwfqwhiy7x39ndriqgzh86i97znz";
   };
 
   patches = optionals stdenv.isDarwin [
-- 
GitLab


From 032c04ebd7ba9f45ea0ce402ee00deb055653029 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 05:14:34 -0700
Subject: [PATCH 0581/1085] znc: 1.6.6 -> 1.7.0 (#40055)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/kkf4gxgjxcq0j8cm6yv5mnv6b8klbgrf-znc-1.7.0/bin/znc -h’ got 0 exit code
- ran ‘/nix/store/kkf4gxgjxcq0j8cm6yv5mnv6b8klbgrf-znc-1.7.0/bin/znc --help’ got 0 exit code
- found 1.7.0 with grep in /nix/store/kkf4gxgjxcq0j8cm6yv5mnv6b8klbgrf-znc-1.7.0
- directory tree listing: https://gist.github.com/766f104f22de520d85cc6b31c46cd5db
---
 pkgs/applications/networking/znc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index b1e2258271b..d1b333587a6 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "znc-${version}";
-  version = "1.6.6";
+  version = "1.7.0";
 
   src = fetchurl {
     url = "http://znc.in/releases/archive/${name}.tar.gz";
-    sha256 = "09cmsnxvi7jg9a0dicf60fxnxdff4aprw7h8vjqlj5ywf6y43f3z";
+    sha256 = "0vxra50418bsjfdpf8vl70fijv8syvasjqdxfyjliff6k91k2zn0";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From b6708a4c9a7f7779e9288d33a09f1dcb2e701be7 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 11 May 2018 14:11:52 +0200
Subject: [PATCH 0582/1085] virtualbox: update extpack and guest additions
 checksums

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

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 6a3781d58ee..4a4204f06c0 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -21,8 +21,8 @@ let
   buildType = "release";
   # Manually sha256sum the extensionPack file, must be hex!
   # Do not forget to update the hash in ./guest-additions/default.nix!
-  extpack = "5eef217dbe0a8e8caf383ea8db83344517af0f9093041b5345c8468a427b327b";
-  extpackRev = "122406";
+  extpack = "4c36d129f17dcab2bb37292022f1b1adfefa5f32a3161b0d5d40784bc8acf4d0";
+  extpackRev = "122591";
   main = "0n1lip8lkz4qqq5ml47xldsx41919ncfh060i7yj51bhas604q6s";
   version = "5.2.12";
 
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index b15eed09fde..6ea0333936b 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 = "78a4f18eb0968c7d14dbfe9decf96759c3f85d28f7e3e7ae339266f4a0b22bd1";
+    sha256 = "b81d283d9ef88a44e7ac8983422bead0823c825cbfe80417423bd12de91b8046";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-- 
GitLab


From d4ec02fa7bb79ca1765a6220206b2f633cc080ef Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 12 May 2018 13:16:03 +0100
Subject: [PATCH 0583/1085] Revert "Fix pci_get_bus_and_slot removed in kernel
 4.17"

This reverts commit d25607c79db9fca7f1c8696b792e376b42fb2ecb.

Reverted as part of #40313 based on commit author's comment:
https://github.com/NixOS/nixpkgs/pull/40313#issuecomment-388409185
---
 .../virtualization/virtualbox/default.nix      |  4 +++-
 .../virtualization/virtualbox/kernpcidev.patch | 18 ------------------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/virtualbox/kernpcidev.patch

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 4a4204f06c0..71c9c8fa644 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -94,7 +94,9 @@ in stdenv.mkDerivation {
 
   patches =
      optional enableHardening ./hardened.patch
-  ++ [ ./qtx11extras.patch ./kernpcidev.patch ];
+  ++ [ ./qtx11extras.patch ];
+
+
 
   postPatch = ''
     sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
diff --git a/pkgs/applications/virtualization/virtualbox/kernpcidev.patch b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch
deleted file mode 100644
index 5192227d7d0..00000000000
--- a/pkgs/applications/virtualization/virtualbox/kernpcidev.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-index b8019f7..b7d2e39 100644
---- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-+++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-@@ -73,8 +73,11 @@ MODULE_LICENSE("GPL");
- MODULE_VERSION(VBOX_VERSION_STRING);
- #endif
- 
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
-+# define PCI_DEV_GET(v,d,p)            pci_get_device(v,d,p)
-+# define PCI_DEV_PUT(x)                pci_dev_put(x)
-+# define PCI_DEV_GET_SLOT(bus, devfn)  pci_get_domain_bus_and_slot(0, bus, devfn)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
- # define PCI_DEV_GET(v,d,p)            pci_get_device(v,d,p)
- # define PCI_DEV_PUT(x)                pci_dev_put(x)
- # define PCI_DEV_GET_SLOT(bus, devfn)  pci_get_bus_and_slot(bus, devfn)
-- 
GitLab


From 99fa3c8d67c7e682b1037d57fd8ee50cf30bf12b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 07:46:58 -0700
Subject: [PATCH 0584/1085] flow: 0.71.0 -> 0.72.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/sxq54vh13q17bn31lsz9gszx4abr8qcc-flow-0.72.0/bin/flow --help’ got 0 exit code
- ran ‘/nix/store/sxq54vh13q17bn31lsz9gszx4abr8qcc-flow-0.72.0/bin/flow version’ and found version 0.72.0
- found 0.72.0 with grep in /nix/store/sxq54vh13q17bn31lsz9gszx4abr8qcc-flow-0.72.0
- directory tree listing: https://gist.github.com/cf04036cc5756f0589397f496e3e5e87
---
 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 31bc1848d58..7ba4bbf25d1 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -4,14 +4,14 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.71.0";
+  version = "0.72.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "1z9qf3kahaincy3i3ynqx7gr1sf470ym8h690a0kc7ah5fwsyr5w";
+    sha256 = "1lfnl1crwkygzbv3l85n30dqsfz627xrnmn4z3zxh7lazir5h8b8";
   };
 
   installPhase = ''
-- 
GitLab


From f7532666073252367b4483509ec558957f65b142 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 17:53:08 -0700
Subject: [PATCH 0585/1085] xmrig: 2.6.1 -> 2.6.2

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.6.2 with grep in /nix/store/fql94ka6winbdld6zs5y34f2y0fbzavg-xmrig-2.6.2
- directory tree listing: https://gist.github.com/109bef229b0b8564b89f489b69f6f0b5
---
 pkgs/applications/misc/xmrig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 5b389d99da7..91fdb37432e 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "xmrig-${version}";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "05gd3jl8nvj2b73l4x72rfbbxrkw3r8q1h761ly4z35v4f3lahk8";
+    sha256 = "09dcjvnm74j1d26mvdiz0sl1qwns5xfkdwx46nqd4xlgvg9x4rpx";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From f25e118432bf391706a401d048462fc4c6ba6f6d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 08:14:35 -0700
Subject: [PATCH 0586/1085] dunst: 1.3.1 -> 1.3.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/41nqz94x6682ylch4vhg5pca977ffsd0-dunst-1.3.2/bin/dunst -h’ got 0 exit code
- ran ‘/nix/store/41nqz94x6682ylch4vhg5pca977ffsd0-dunst-1.3.2/bin/dunst --help’ got 0 exit code
- ran ‘/nix/store/41nqz94x6682ylch4vhg5pca977ffsd0-dunst-1.3.2/bin/dunst -v’ and found version 1.3.2
- ran ‘/nix/store/41nqz94x6682ylch4vhg5pca977ffsd0-dunst-1.3.2/bin/dunst --version’ and found version 1.3.2
- found 1.3.2 with grep in /nix/store/41nqz94x6682ylch4vhg5pca977ffsd0-dunst-1.3.2
- directory tree listing: https://gist.github.com/e6f68836d92d5855b650ece5004da126
---
 pkgs/applications/misc/dunst/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 5396299943c..75640b2c54e 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "dunst-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "dunst-project";
     repo = "dunst";
     rev = "v${version}";
-    sha256 = "0i518v2z9fklzl5w60gkwwmg30yz3bd0k4rxjrxjabx73pvxm1mz";
+    sha256 = "1kqlshaflp306yrjjmc28pghi1y5p24vdx4bxf8i4n9khdawb514";
   };
 
   nativeBuildInputs = [ perl pkgconfig which systemd ];
-- 
GitLab


From eb8bc80998d2c391b11049fa04977ff46b735a80 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:39:43 -0700
Subject: [PATCH 0587/1085] ldb: 1.1.31 -> 1.3.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3/bin/ldbadd --help’ got 0 exit code
- ran ‘/nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3/bin/ldbsearch --help’ got 0 exit code
- ran ‘/nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3/bin/ldbdel --help’ got 0 exit code
- ran ‘/nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3/bin/ldbmodify --help’ got 0 exit code
- ran ‘/nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3/bin/ldbedit --help’ got 0 exit code
- ran ‘/nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3/bin/ldbrename --help’ got 0 exit code
- found 1.3.3 with grep in /nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3
- directory tree listing: https://gist.github.com/c6a5cda289b4f02fa7a87af2345baf74
---
 pkgs/development/libraries/ldb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index c178f2f76a4..356433b54eb 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ldb-1.1.31";
+  name = "ldb-1.3.3";
 
   src = fetchurl {
     url = "mirror://samba/ldb/${name}.tar.gz";
-    sha256 = "04d53e2ab5b35688f5ed7a4471f5b273da121016e1af0630b36a36506afaeb46"                                                                                                                                                             ;
+    sha256 = "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b"                                                                                                                                                             ;
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 408563d055e7043ecdf9571bafeb4ad1208e63af Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 12 May 2018 14:47:44 +0200
Subject: [PATCH 0588/1085] rtl-sdr: 0.5.3 -> 0.5.4

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

diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix
index f1c3cbc5557..92e96a7fb5e 100644
--- a/pkgs/applications/misc/rtl-sdr/default.nix
+++ b/pkgs/applications/misc/rtl-sdr/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "rtl-sdr-${version}";
-  version = "0.5.3";
+  version = "0.5.4";
 
   src = fetchgit {
     url = "git://git.osmocom.org/rtl-sdr.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1dh52xcvxkjb3mj80wlm20grz8cqf5wipx2ksi91ascz12b5pym6";
+    sha256 = "0c56a9dhlqgs6y15ns0mn4r5giz0x6y7x151jcq755f711pc3y01";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From da45c8278c670eef69cb9f51f1a5456fe1b9cb11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 22:51:31 -0700
Subject: [PATCH 0589/1085] pmd: 6.2.0 -> 6.3.0

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 6.3.0 with grep in /nix/store/12qshljzfqb92vr12gm03p641ljmzasb-pmd-6.3.0
- directory tree listing: https://gist.github.com/3172d5a09b7c81f7fa86a30c71e4fd4d
---
 pkgs/development/tools/analysis/pmd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index 83da9926170..6f908128e59 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pmd-${version}";
-  version = "6.2.0";
+  version = "6.3.0";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
-    sha256 = "12j6m6lhp4xw27x0x8jcy0vlwbanjwks7w6zl56xihv6r8cm40fz";
+    sha256 = "09x6mpqz4z583lvliipkmvlv3qmmwi7zjzgfjhwyp27faf2pz1ym";
   };
 
   installPhase = ''
-- 
GitLab


From 899bb981664b43d939480325ff3efccab9abdf75 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 21:06:23 -0700
Subject: [PATCH 0590/1085] salt: 2017.7.4 -> 2018.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-proxy-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-proxy-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-proxy -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-proxy --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-run-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-run-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-run -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-run --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-minion-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-minion-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-minion -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-minion --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-master-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-master-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-master -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-master --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-key-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-key-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-key-wrapped help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-key -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-key --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-key help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-call-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-call-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-call -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-call --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-api-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-api-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-api -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-api --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-cp-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-cp-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-cp -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-cp --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-syndic-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-syndic-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-syndic -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-syndic --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-ssh-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-ssh-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-ssh -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-ssh --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-cloud-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-cloud-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-cloud -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-cloud --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.spm-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.spm-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/spm -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/spm --help’ got 0 exit code
- found 2018.3.0 with grep in /nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0
- directory tree listing: https://gist.github.com/e33aa60ebbbc7b62d8ac84faff16ce6d
---
 pkgs/tools/admin/salt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 3bef6659735..eaae8f40bfa 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -19,11 +19,11 @@ let
 in
 python2Packages.buildPythonApplication rec {
   pname = "salt";
-  version = "2017.7.4";
+  version = "2018.3.0";
 
   src = python2Packages.fetchPypi {
     inherit pname version;
-    sha256 = "15xfvclk3ns8vk17j7bfy4alq7ab5x3y3jnpqzp5583bfyak0mqx";
+    sha256 = "0cbbnmaynnpfknmppzlz04mqw4d3d2ay1dqrli11b5pnzli5v950";
   };
 
   propagatedBuildInputs = with python2Packages; [
-- 
GitLab


From 1b3abbbd7445462706d2917eb9785077b24097c0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 06:02:16 -0700
Subject: [PATCH 0591/1085] mkvtoolnix: 22.0.0 -> 23.0.0 (#40081)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvmerge -h’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvmerge --help’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvinfo -h’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvinfo --help’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvextract -h’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvextract --help’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvpropedit -h’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvpropedit --help’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvtoolnix-gui -h’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvtoolnix-gui --help’ got 0 exit code
- found 23.0.0 with grep in /nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0
- directory tree listing: https://gist.github.com/659909909b82ce86f9ec71f713bc7c6b
---
 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 3a3a009d18f..544e4917f45 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "22.0.0";
+  version = "23.0.0";
 
   src = fetchFromGitLab {
     owner  = "mbunkus";
     repo   = "mkvtoolnix";
     rev    = "release-${version}";
-    sha256 = "07nggqkpl6dkfcqli8y9dn0jbznldz03nqj2l3fgj3vhqa0phlab";
+    sha256 = "13n2jvwws87bws483dncvhf9vqsjy3l0lxh7x741g71075299w73";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 204049763b8fe80c383457976a0c9957308a11e2 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 12 May 2018 14:03:05 +0100
Subject: [PATCH 0592/1085] citrix-receiver: 13.9.0 -> 13.9.1

---
 .../networking/remote/citrix-receiver/default.nix     | 11 +++++++++++
 pkgs/top-level/all-packages.nix                       |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index d5982f33e78..e1fee1bd78b 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -91,6 +91,17 @@ let
       x86hash   = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag";
       x64suffix = "102";
       x86suffix = "102";
+      homepage  = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # This version has disappeared from Citrix's website... *sigh*
+    };
+
+    "13.9.1" = {
+      major     = "13";
+      minor     = "9";
+      patch     = "1";
+      x64hash   = "A9A9157CE8C287E8AA11447A0E3C3AB7C227330E9D8882C6F7B938A4DD5925BC";
+      x86hash   = "A93E9770FD10FDD3586A2D47448559EA037265717A7000B9BD2B1DCCE7B0A483";
+      x64suffix = "6";
+      x86suffix = "6";
       homepage  = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
     };
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4766030f04..9195f1e7c89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1636,7 +1636,8 @@ with pkgs;
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 
-  citrix_receiver        = hiPrio citrix_receiver_13_9_0;
+  citrix_receiver        = hiPrio citrix_receiver_13_9_1;
+  citrix_receiver_13_9_1 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.1"; };
   citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.0"; };
   citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.8.0"; };
   citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; };
-- 
GitLab


From efbbd8196248fe571ff096d9c5e5eaa276e2408f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 12:40:30 -0700
Subject: [PATCH 0593/1085] opencpn: 4.8.2 -> 4.8.4

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.8.4 with grep in /nix/store/jlmxcb41bg1v2blsl2vgbjszaafkcvgv-opencpn-4.8.4
- directory tree listing: https://gist.github.com/8becdf1d24e33d05a2f0afdac7c9d764
---
 pkgs/applications/misc/opencpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index 1c5fde9353a..7713b5256bf 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "opencpn-${version}";
-  version = "4.8.2";
+  version = "4.8.4";
 
   src = fetchFromGitHub {
     owner = "OpenCPN";
     repo = "OpenCPN";
     rev = "v${version}";
-    sha256 = "0r6a279xhhf4jrmjb2xi5arxb4xd5wvqbs4hyyildlgpr1x7bd09";
+    sha256 = "0v4klprzddmpq7w8h2pm69sgbshirdmjrlzhz62b606gbr58fazf";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 9cf4d541def0a38cb3008af33593b750d2c81bdd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 08:20:55 -0700
Subject: [PATCH 0594/1085] closurecompiler: 20180402 -> 20180506
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/qh5lv1f6c84mvndiivba30y3n3whw82j-closure-compiler-20180506/bin/closure-compiler --help’ got 0 exit code
- found 20180506 with grep in /nix/store/qh5lv1f6c84mvndiivba30y3n3whw82j-closure-compiler-20180506
- directory tree listing: https://gist.github.com/9013b4a27653c964fee876223f0b579b
---
 pkgs/development/compilers/closure/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index e73871fcb09..0dfa10f28a1 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20180402";
+  version = "20180506";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "1xbr2wvppzhq189z9m70zqry2a3hh6cdydwbc1jm2z7imsg1i6c1";
+    sha256 = "10w9vs61fs14k8g3wlng0ifj0knfm0xfc4rsnd2c75464hkdxvr9";
   };
 
   sourceRoot = ".";
-- 
GitLab


From 2da3d7551fde6ad2c2d348585f84a717fe502b53 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 08:47:38 -0700
Subject: [PATCH 0595/1085] acpica-tools: 20180427 -> 20180508
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpibin help’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpidump -h’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpidump --help’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpiexec -h’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpiexec --help’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpihelp help’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpinames -h’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpinames --help’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpixtract -h’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpixtract --help’ got 0 exit code
- directory tree listing: https://gist.github.com/e4b9d9cff7b7db6da524b3560e3405b0
---
 pkgs/tools/system/acpica-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
index f26142260fe..edb7828f95b 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "acpica-tools-${version}";
-  version = "20180427";
+  version = "20180508";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "05hczn82dpn7irh8zy9m17hm8r3ngwrbmk69zsldr4k1w3cv40df";
+    sha256 = "1n7lqmv77kg28drahvxzybwl9v4hzwi8i7xkpgliclfcp5ff909b";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";
-- 
GitLab


From c24d8363879de3dc2a36eb38d0be694ea4dd5002 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 09:13:58 -0700
Subject: [PATCH 0596/1085] bobcat: 4.07.00 -> 4.08.03

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.08.03 with grep in /nix/store/dqhrp35b4vijwd6k77is0ma96vq9arwj-bobcat-4.08.03
- directory tree listing: https://gist.github.com/d768d97dc8cf8403bf62c2981e533bed
---
 pkgs/development/libraries/bobcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index dd7d6a34867..812ad546f86 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "bobcat-${version}";
-  version = "4.07.00";
+  version = "4.08.03";
 
   src = fetchFromGitHub {
-    sha256 = "0ja6rgdw4ng10acp2c0cv9k72i5sgng03i3xi2yshlm2811lgxcs";
+    sha256 = "163mdl8hxids7123bjxmqhcaqyc1dv7hv8k33s713ac6lzawarq2";
     rev = version;
     repo = "bobcat";
     owner = "fbb-git";
-- 
GitLab


From 90dfae3267421697eaf4e2d1da02a918d1500a54 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 09:36:32 -0700
Subject: [PATCH 0597/1085] cava: 0.6.0 -> 0.6.1

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.6.1 with grep in /nix/store/vgyd88qajn21azx58dlgz6yqkkxdrjg2-cava-0.6.1
- directory tree listing: https://gist.github.com/53f8a5084fe5a35d7a946122d848491f
---
 pkgs/applications/audio/cava/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index 1420627c02a..439175b090a 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   name = "cava-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
 
   buildInputs = [
     alsaLib
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "karlstav";
     repo = "cava";
     rev = version;
-    sha256 = "01maaq5pfd4a7zilgarwr1nl7jbqyrvir6w7ikchggsckrlk23wr";
+    sha256 = "1kvhqgijs29909w3sq9m0bslx2zxxn4b3i07kdz4hb0dqkppxpjy";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From 6a0ec8d8ccac1d58347ebad8d6efe6c994544eab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 09:31:17 -0700
Subject: [PATCH 0598/1085] adapta-gtk-theme: 3.93.1.1 -> 3.93.1.14

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

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/0aedec168a2b1c219c86840c99bb541f
---
 pkgs/misc/themes/adapta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index f524c7d9579..c8e7d860bcf 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.93.1.1";
+  version = "3.93.1.14";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "00k67qpq62swz7p6dk4g8ak31h97lxyddpyr6xii1jpbygwkk9zc";
+    sha256 = "11iviw9gj4jwp6v32a3y1n6hq8m9pf14drfqxhp3dnygylvxxdr2";
   };
 
   preferLocalBuild = true;
-- 
GitLab


From fbe7ebca5fc0f26acee161c45d075bdbdff4204b Mon Sep 17 00:00:00 2001
From: Artem Kazakov <kazakov@gmail.com>
Date: Fri, 11 May 2018 13:07:15 -0400
Subject: [PATCH 0599/1085] Update pants to 1.6.0

Also fixing the missing dependency (wheel). Not sure when this
got broken, but 1.5.0 did not work either.
---
 pkgs/development/tools/build-managers/pants/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index 54e6d38f716..b99bc4f6b75 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -4,7 +4,7 @@ with stdenv.lib;
 with pythonPackages;
 
 let
-  version = "1.5.0";
+  version = "1.6.0";
 in buildPythonApplication rec {
   inherit version;
   pname = "pantsbuild.pants";
@@ -12,7 +12,7 @@ in buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7c0a1206594c615fce0a7f6daa4ea1028645bc20afa5599c2cf0ad7c06223fa7";
+    sha256 = "0ahvcj33xribypgyh515mb3ack1djr0cq27nlyk0qhwgwv6acfnj";
   };
 
   prePatch = ''
@@ -27,7 +27,7 @@ in buildPythonApplication rec {
     twitter-common-collections setproctitle ansicolors packaging pathspec
     scandir twitter-common-dirutil psutil requests pystache pex docutils
     markdown pygments twitter-common-confluence fasteners pywatchman
-    futures cffi subprocess32 contextlib2 faulthandler pyopenssl
+    futures cffi subprocess32 contextlib2 faulthandler pyopenssl wheel
   ];
 
   meta = {
-- 
GitLab


From 22cd5eb643b7f992c5195e0373f9d6a3b0ddcaf2 Mon Sep 17 00:00:00 2001
From: Philipp <philipp+github@xndr.de>
Date: Sat, 12 May 2018 17:35:53 +0200
Subject: [PATCH 0600/1085] gnunet-svn: remove outdated package (#40401)

Gnunet switched develpoment from svn to git and removed the svn repositories.
---
 .../networking/p2p/gnunet/svn.nix             | 93 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 95 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/gnunet/svn.nix

diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix
deleted file mode 100644
index 688bb11acd0..00000000000
--- a/pkgs/applications/networking/p2p/gnunet/svn.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt
-, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
-, libxml2, ncurses, gettext, libunistring, libidn
-, makeWrapper, autoconf, automake
-, withVerbose ? false }:
-
-let
-  rev = "27840";
-in
-stdenv.mkDerivation rec {
-  name = "gnunet-svn-${rev}";
-
-  src = fetchsvn {
-    url =  https://gnunet.org/svn/gnunet;
-    inherit rev;
-    sha256 = "0zhxvvj5rbhca2ykfx3g93dv94xyhqsnj011a6gql7zd5vfhaf6v";
-  };
-
-  buildInputs = [
-    libextractor libmicrohttpd libgcrypt gmp curl libtool
-    zlib adns sqlite libxml2 ncurses libidn
-    pkgconfig gettext libunistring makeWrapper
-    autoconf automake
-  ];
-
-  configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose ";
-
-  preConfigure = ''
-    # Brute force: since nix-worker chroots don't provide
-    # /etc/{resolv.conf,hosts}, replace all references to `localhost'
-    # by their IPv4 equivalent.
-    for i in $(find . \( -name \*.c -or -name \*.conf \) \
-                    -exec grep -l '\<localhost\>' {} \;)
-    do
-      echo "$i: substituting \`127.0.0.1' to \`localhost'..."
-      sed -i "$i" -e's/\<localhost\>/127.0.0.1/g'
-    done
-
-    # Make sure the tests don't rely on `/tmp', for the sake of chroot
-    # builds.
-    for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
-                    -exec grep -l /tmp {} \;)
-    do
-      echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
-      substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
-    done
-
-    # Ensure NSS installation works fine
-    configureFlags="$configureFlags --with-nssdir=$out/lib"
-    patchShebangs src/gns/nss/install-nss-plugin.sh
-
-    sh contrib/pogen.sh
-    sh bootstrap
-  '';
-
-  doCheck = false;
-
-  /* FIXME: Tests must be run this way, but there are still a couple of
-     failures.
-
-  postInstall =
-    '' export GNUNET_PREFIX="$out"
-       export PATH="$out/bin:$PATH"
-       make -k check
-    '';
-  */
-
-  meta = {
-    description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
-
-    longDescription = ''
-      GNUnet is a framework for secure peer-to-peer networking that
-      does not use any centralized or otherwise trusted services.  A
-      first service implemented on top of the networking layer
-      allows anonymous censorship-resistant file-sharing.  Anonymity
-      is provided by making messages originating from a peer
-      indistinguishable from messages that the peer is routing.  All
-      peers act as routers and use link-encrypted connections with
-      stable bandwidth utilization to communicate with each other.
-      GNUnet uses a simple, excess-based economic model to allocate
-      resources.  Peers in GNUnet monitor each others behavior with
-      respect to resource usage; peers that contribute to the
-      network are rewarded with better service.
-    '';
-
-    homepage = https://gnunet.org/;
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9195f1e7c89..5497a0356e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16101,8 +16101,6 @@ with pkgs;
 
   gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { });
 
-  gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix { });
-
   gocr = callPackage ../applications/graphics/gocr { };
 
   gobby5 = callPackage ../applications/editors/gobby {
-- 
GitLab


From 0c321443d54570148f780cd402cdd72afb6a27d7 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sat, 12 May 2018 10:43:05 -0500
Subject: [PATCH 0601/1085] unibilium: add ncurses as build input

unibilium expects to use the `ncursesw6-config` command to find terminfo dirs. Before that would fail & default to some nonexistant TERMINFO_DIRS value (on pure systems at least). This will add `ncurses.out` which is a little bit unfortunate because unibilium is meant as a replacement for ncurses. In the future, we should add a `terminfo` output to ncurses so that other things can use its db without pulling in its libraries & binaries.

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

diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix
index 7c92e7224f9..717edda18a2 100644
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/pkgs/development/libraries/unibilium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl }:
+{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "unibilium-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
   nativeBuildInputs = [ pkgconfig perl ];
-  buildInputs = [ libtool ];
+  buildInputs = [ libtool ncurses ];
 
   meta = with lib; {
     description = "A very basic terminfo library";
-- 
GitLab


From 7f79a4fe118943b0d8dcc3aa475079ad3cfd7986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 12 May 2018 17:44:57 +0200
Subject: [PATCH 0602/1085] manual: Clarify that limits.conf doesn't apply to
 systemd services. (#40267)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Say how systemd services can be set instead.

Sources:

* https://bugzilla.redhat.com/show_bug.cgi?id=754285
* https://ro-che.info/articles/2017-03-26-increase-open-files-limit

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
---
 nixos/modules/security/pam.nix         | 4 ++++
 nixos/modules/system/boot/coredump.nix | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 48998285d89..bef10b4fe61 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -449,6 +449,10 @@ in
           <varname>item</varname>, and <varname>value</varname>
           attribute.  The syntax and semantics of these attributes
           must be that described in the limits.conf(5) man page.
+
+          Note that these limits do not apply to systemd services,
+          whose limits can be changed via <option>systemd.extraConfig</option>
+          instead.
        '';
     };
 
diff --git a/nixos/modules/system/boot/coredump.nix b/nixos/modules/system/boot/coredump.nix
index b27a35b6257..30f367da766 100644
--- a/nixos/modules/system/boot/coredump.nix
+++ b/nixos/modules/system/boot/coredump.nix
@@ -15,8 +15,11 @@ with lib;
           Enables storing core dumps in systemd.
           Note that this alone is not enough to enable core dumps. The maximum
           file size for core dumps must be specified in limits.conf as well. See
-          <option>security.pam.loginLimits</option> as well as the limits.conf(5)
-          man page.
+          <option>security.pam.loginLimits</option> and the limits.conf(5)
+          man page (these specify the core dump limits for user login sessions)
+          and <option>systemd.extraConfig</option> (where e.g.
+          <literal>DefaultLimitCORE=1000000</literal> can be specified to set
+          the core dump limit for systemd system-level services).
         '';
       };
 
-- 
GitLab


From d7e49cfc5605828db27d2511c1a9f2e3fd1ef01f Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sun, 6 May 2018 11:19:59 +0200
Subject: [PATCH 0603/1085] vala-panel-appmenu: init at 0.6.94

---
 pkgs/desktops/xfce/default.nix                |  2 +
 .../appmenu-gtk-module.nix                    | 31 ++++++++++++
 .../default.nix                               | 49 +++++++++++++++++++
 .../fix-bamf-dependency.patch                 | 12 +++++
 4 files changed, 94 insertions(+)
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index d83e51a676c..67580c53072 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -97,6 +97,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   #### PANEL PLUGINS
 
+  xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { };
+
   xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { };
 
   xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { };
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
new file mode 100644
index 00000000000..4db9e03ae72
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, substituteAll, cmake, vala, glib, gtk2, gtk3 }:
+stdenv.mkDerivation rec {
+  name = "vala-panel-appmenu-xfce-${version}";
+  version = "0.6.94";
+
+  src = "${fetchFromGitHub {
+    owner = "rilian-la-te";
+    repo = "vala-panel-appmenu";
+    rev = version;
+    fetchSubmodules = true;
+
+    sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p";
+  }}/subprojects/appmenu-gtk-module";
+
+  nativeBuildInputs = [ cmake vala ];
+  buildInputs = [ glib gtk2 gtk3 ];
+
+  configurePhase = ''
+    cmake . -DGTK3_INCLUDE_GDK=
+  '';
+  installPhase = ''
+    make DESTDIR=output install
+    cp -r output/var/empty/* "$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Port of the Unity GTK+ Module";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ jD91mZM2 ];
+  };
+}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
new file mode 100644
index 00000000000..e1825d21ca7
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2,
+  glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf,
+  xfce, libwnck3, libdbusmenu-glib, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-vala-panel-appmenu-plugin-${version}";
+  version = "0.6.94";
+
+  src = fetchFromGitHub {
+    owner = "rilian-la-te";
+    repo = "vala-panel-appmenu";
+    rev = version;
+    fetchSubmodules = true;
+
+    sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p";
+  };
+
+  nativeBuildInputs = [ pkgconfig cmake vala libxml2.bin ];
+  buildInputs = [ (callPackage ./appmenu-gtk-module.nix {})
+                  glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy
+                  at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf
+                  libwnck3 libdbusmenu-glib gobjectIntrospection ];
+
+  patches = [
+    (substituteAll {
+      src = ./fix-bamf-dependency.patch;
+      bamf = bamf;
+    })
+  ];
+
+  cmakeFlags = [
+      "-DENABLE_XFCE=ON"
+      "-DENABLE_BUDGIE=OFF"
+      "-DENABLE_VALAPANEL=OFF"
+      "-DENABLE_MATE=OFF"
+      "-DENABLE_JAYATANA=OFF"
+      "-DENABLE_APPMENU_GTK_MODULE=OFF"
+  ];
+
+  preConfigure = ''
+    mv cmake/FallbackVersion.cmake.in cmake/FallbackVersion.cmake
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Global Menu applet for XFCE4";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ jD91mZM2 ];
+  };
+}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
new file mode 100644
index 00000000000..1ed86a67f72
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
@@ -0,0 +1,12 @@
++++ source/cmake/FindBAMF.cmake	2018-05-11 17:03:44.385917811 +0200
+@@ -80,9 +80,7 @@
+ 
+ find_program(BAMF_DAEMON_EXECUTABLE
+ 	bamfdaemon
+-	HINTS ${CMAKE_INSTALL_FULL_LIBDIR}
+-		  ${CMAKE_INSTALL_FULL_LIBEXECDIR}
+-		  ${BAMF_LIBDIR}
++	HINTS "@bamf@/libexec/bamf/"
+ 	PATH_SUFFIXES bamf
+ )
+ 
-- 
GitLab


From f245f537a8fcbf73ae959792a552b43fbc1c8d71 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Sat, 12 May 2018 12:51:28 -0400
Subject: [PATCH 0604/1085] netperf: cleanup

* netperf: fix build

* maintainers: add myself

* netperf: add myself as maintainer

* netperf: update to current git master to get bugfixes

* netperf: enable-demo mode

* fixup! netperf: fix build

* fixup! netperf: update to current git master to get bugfixes
---
 maintainers/maintainer-list.nix                |  5 +++++
 .../networking/netperf/default.nix             | 18 +++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1960e3efc85..0ff1d9efb57 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2491,6 +2491,11 @@
     github = "mmahut";
     name = "Marek Mahut";
   };
+  mmlb = {
+    email = "me.mmlb@mmlb.me";
+    github = "mmlb";
+    name = "Manuel Mendez";
+  };
   moaxcp = {
     email = "moaxcp@gmail.com";
     github = "moaxcp";
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
index fe58b1d3e28..421a3cfbe3b 100644
--- a/pkgs/applications/networking/netperf/default.nix
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -1,21 +1,29 @@
-{ stdenv, fetchFromGitHub }:
+{ libsmbios, stdenv, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "netperf-2.7.0";
+  name = "netperf-20180504";
 
   src = fetchFromGitHub {
     owner = "HewlettPackard";
     repo = "netperf";
-    rev = name;
-    sha256 = "034indn3hicwbvyzgw9f32bv2i7c5iv8b4a11imyn03pw97jzh10";
+    rev = "c0a0d9f31f9940abf375a41b43a343cdbf87caab";
+    sha256 = "0wfj9kkhar6jb5639f5wxpwsraxw4v9yzg71rsdidvj5fyncjjq2";
   };
 
+  buildInputs = [ libsmbios ];
+  nativeBuildInputs = [ autoreconfHook ];
+  autoreconfPhase = ''
+    autoreconf -i -I src/missing/m4
+  '';
+  configureFlags = [ "--enable-demo" ];
+  enableParallelBuilding = true;
+
   meta = {
     description = "Benchmark to measure the performance of many different types of networking";
     homepage = http://www.netperf.org/netperf/;
     license = "Hewlett-Packard BSD-like license";
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [];
+    maintainers = [ stdenv.lib.maintainers.mmlb ];
   };
 }
-- 
GitLab


From 37af5704f91c7c908e2866b51b4dfbc5b598537e Mon Sep 17 00:00:00 2001
From: Unknown <iulian.meghea@gmail.com>
Date: Wed, 9 May 2018 22:02:47 +0300
Subject: [PATCH 0605/1085] distrobuilder: init at HEAD

Implement feedback
---
 maintainers/maintainer-list.nix               |  5 ++
 .../virtualization/distrobuilder/default.nix  | 36 ++++++++++
 .../virtualization/distrobuilder/deps.nix     | 67 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 110 insertions(+)
 create mode 100644 pkgs/tools/virtualization/distrobuilder/default.nix
 create mode 100644 pkgs/tools/virtualization/distrobuilder/deps.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0ff1d9efb57..b60d5643434 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2378,6 +2378,11 @@
     github = "meditans";
     name = "Carlo Nucera";
   };
+  megheaiulian  = {
+    email = "iulian.meghea@gmail.com";
+    github = "megheaiulian";
+    name = "Meghea Iulian";
+  };
   mehandes = {
     email = "niewskici@gmail.com";
     github = "mehandes";
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
new file mode 100644
index 00000000000..55a8352fe77
--- /dev/null
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, pkgconfig, buildGoPackage, fetchFromGitHub
+, makeWrapper, coreutils, gnupg, gnutar, squashfsTools}:
+
+buildGoPackage rec {
+  name = "distrobuilder-${version}";
+  version = "2018_04_28";
+  rev = "406fd5fe7dec4a969ec08bdf799c8ae483d37489";
+
+  goPackagePath = "github.com/lxc/distrobuilder";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "lxc";
+    repo = "distrobuilder";
+    sha256 = "11bd600g36pf89vza9jl7fp7cjy5h67nfvhxlnwghb3z40pq9lnc";
+  };
+
+  goDeps = ./deps.nix;
+
+  postInstall = ''
+    wrapProgram $bin/bin/distrobuilder --prefix PATH ":" ${stdenv.lib.makeBinPath [
+      coreutils gnupg gnutar squashfsTools
+    ]}
+  '';
+
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "System container image builder for LXC and LXD";
+    homepage = "https://github.com/lxc/distrobuilder";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ megheaiulian ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/tools/virtualization/distrobuilder/deps.nix b/pkgs/tools/virtualization/distrobuilder/deps.nix
new file mode 100644
index 00000000000..56ff3c0cc12
--- /dev/null
+++ b/pkgs/tools/virtualization/distrobuilder/deps.nix
@@ -0,0 +1,67 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785";
+      sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy";
+    };
+  }
+  {
+    goPackagePath = "github.com/lxc/lxd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lxc/lxd";
+      rev = "a81aac803bc22dcb14982b80dce005444e2b22f1";
+      sha256 = "1pjwgh6551mjzkdzmvxx065sxxn8ixb3vdq2i6g1pyb56h5hnayi";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
+      sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
+      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/flosch/pongo2.v3";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/flosch/pongo2.v3";
+      rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";
+      sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+]
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01a60be8716..c04fb6bf6d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1133,6 +1133,8 @@ with pkgs;
 
   dislocker = callPackage ../tools/filesystems/dislocker { };
 
+  distrobuilder = callPackage ../tools/virtualization/distrobuilder { };
+
   ditaa = callPackage ../tools/graphics/ditaa { };
 
   dino = callPackage ../applications/networking/instant-messengers/dino { };
-- 
GitLab


From 6f40d18d4432858199e14d2323b4f8503ee47a7e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 27 Feb 2018 18:36:48 -0500
Subject: [PATCH 0606/1085] prebuilt android cc: Edit wrapper to pass the right
 -m flags for armv7a

(cherry picked from commit 827ef0914089e1a2bba140b49e1311eff28cc156)
---
 lib/systems/examples.nix                      |  3 ++
 .../mobile/androidenv/androidndk-pkgs.nix     | 33 ++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 87da31f3137..4b1a3c8ebf4 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -31,18 +31,21 @@ rec {
 
   armv5te-android-prebuilt = rec {
     config = "armv5tel-unknown-linux-androideabi";
+    sdkVer = "21";
     platform = platforms.armv5te-android;
     useAndroidPrebuilt = true;
   };
 
   armv7a-android-prebuilt = rec {
     config = "armv7a-unknown-linux-androideabi";
+    sdkVer = "21";
     platform = platforms.armv7a-android;
     useAndroidPrebuilt = true;
   };
 
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
+    sdkVer = "21";
     platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index 19fc0dc812d..1413e35e904 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -15,7 +15,12 @@ let
     "x86_64-unknown-linux-gnu" = {
       double = "linux-x86_64";
     };
-    "arm-unknown-linux-androideabi" = {
+    "armv5tel-unknown-linux-androideabi" = {
+      arch = "arm";
+      triple = "arm-linux-androideabi";
+      gccVer = "4.8";
+    };
+    "armv7a-unknown-linux-androideabi" = {
       arch = "arm";
       triple = "arm-linux-androideabi";
       gccVer = "4.8";
@@ -59,9 +64,29 @@ rec {
     cc = binaries;
     bintools = binutils;
     libc = targetAndroidndkPkgs.libraries;
-    extraBuildCommands =
+    extraBuildCommands = lib.optionalString targetPlatform.isAarch32 (let
+        p = targetPlatform.platform.gcc or {};
+        float = p.float or (targetPlatform.parsed.abi.float or null);
+        flags = lib.concatLists [
+          (lib.optional (p ? arch) "-march=${p.arch}")
+          (lib.optional (p ? cpu) "-mcpu=${p.cpu}")
+          (lib.optional (p ? abi) "-mabi=${p.abi}")
+          (lib.optional (p ? fpu) "-mfpu=${p.fpu}")
+          (lib.optional (float != null) "-mfloat=${float}")
+          (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}")
+          (lib.optional (p ? mode) "-mmode=${p.mode}")
+        ];
+      in ''
+        sed -E -i \
+          $out/bin/${targetPlatform.config}-cc \
+          $out/bin/${targetPlatform.config}-c++ \
+          $out/bin/${targetPlatform.config}-gcc \
+          $out/bin/${targetPlatform.config}-g++ \
+          -e '130i    extraBefore+=(-Wl,--fix-cortex-a8)' \
+          -e 's|^(extraBefore=)\(\)$|\1(${builtins.toString flags})|'
+      '')
       # GCC 4.9 is the first relase with "-fstack-protector"
-      lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''
+      + lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''
         sed -E \
         -i $out/nix-support/add-hardening.sh \
         -e 's|(-fstack-protector)-strong|\1|g'
@@ -76,7 +101,7 @@ rec {
   libraries = {
     name = "bionic-prebuilt";
     type = "derivation";
-    outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-21/arch-${hostInfo.arch}/usr/";
+    outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/";
     drvPath = throw "fake derivation, build ${buildAndroidndk} to use";
   };
 }
-- 
GitLab


From f2004e62870aa6b21dd52612295da973194c7c73 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sat, 12 May 2018 15:07:31 -0400
Subject: [PATCH 0607/1085] lib: Fix float handling for Aarch32

Forgot to adjust default so abi with explicit float attr would be used.
---
 lib/systems/parse.nix                         | 29 +++++++++++--------
 lib/systems/platforms.nix                     |  1 -
 .../compilers/gcc/common/platform-flags.nix   |  6 ++--
 .../mobile/androidenv/androidndk-pkgs.nix     |  6 ++--
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 33daf079164..856ab297d5b 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -68,17 +68,17 @@ rec {
 
   cpuTypes = with significantBytes; setTypes types.openCpuType {
     arm      = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv6m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv6l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv7a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv7r   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv7m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv7l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv8a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv8r   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv8m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; };
+    armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; version = "5"; };
+    armv6m   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; };
+    armv6l   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; };
+    armv7a   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; };
+    armv7r   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; };
+    armv7m   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; };
+    armv7l   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; };
+    armv8a   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
+    armv8r   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
+    armv8m   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
+    aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; };
 
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
@@ -271,7 +271,12 @@ rec {
       kernel = getKernel args.kernel;
       abi =
         /**/ if args ? abi       then getAbi args.abi
-        else if isLinux   parsed then abis.gnu
+        else if isLinux   parsed then
+          if isAarch32 parsed then
+            if lib.versionAtLeast (parsed.cpu.version or "0") "6"
+            then abis.gnueabihf
+            else abis.gnueabi
+          else abis.gnu
         else if isWindows parsed then abis.gnu
         else                     abis.unknown;
     };
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 5becaf581a4..32f055b6b1c 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -245,7 +245,6 @@ rec {
     gcc = {
       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.
       #
diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix
index e261f54f582..9a6d3f8f620 100644
--- a/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -1,13 +1,13 @@
 { lib, targetPlatform }:
 
 let
-  p = targetPlatform.platform.gcc or {};
-  float = p.float or (targetPlatform.parsed.abi.float or null);
+  p =  targetPlatform.platform.gcc or {}
+    // targetPlatform.parsed.abi;
 in lib.concatLists [
   (lib.optional (p ? arch) "--with-arch=${p.arch}")
   (lib.optional (p ? cpu) "--with-cpu=${p.cpu}")
   (lib.optional (p ? abi) "--with-abi=${p.abi}")
   (lib.optional (p ? fpu) "--with-fpu=${p.fpu}")
-  (lib.optional (float != null) "--with-float=${float}")
+  (lib.optional (p ? float) "--with-float=${p.float}")
   (lib.optional (p ? mode) "--with-mode=${p.mode}")
 ]
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index 1413e35e904..663a1f1ee8f 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -65,14 +65,14 @@ rec {
     bintools = binutils;
     libc = targetAndroidndkPkgs.libraries;
     extraBuildCommands = lib.optionalString targetPlatform.isAarch32 (let
-        p = targetPlatform.platform.gcc or {};
-        float = p.float or (targetPlatform.parsed.abi.float or null);
+        p =  targetPlatform.platform.gcc or {}
+          // targetPlatform.parsed.abi;
         flags = lib.concatLists [
           (lib.optional (p ? arch) "-march=${p.arch}")
           (lib.optional (p ? cpu) "-mcpu=${p.cpu}")
           (lib.optional (p ? abi) "-mabi=${p.abi}")
           (lib.optional (p ? fpu) "-mfpu=${p.fpu}")
-          (lib.optional (float != null) "-mfloat=${float}")
+          (lib.optional (p ? float) "-mfloat=${p.float}")
           (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}")
           (lib.optional (p ? mode) "-mmode=${p.mode}")
         ];
-- 
GitLab


From 095fe5b43def40279a243e663c662b02caac5318 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 6 Apr 2018 01:19:06 +0000
Subject: [PATCH 0608/1085] nixos: rename system.{stateVersion,defaultChannel}
 -> system.nixos.\1

---
 nixos/doc/manual/development/releases.xml            |  2 +-
 nixos/doc/manual/release-notes/rl-1509.xml           |  4 ++--
 .../modules/installer/tools/nixos-generate-config.pl |  2 +-
 nixos/modules/misc/version.nix                       | 12 ++++++------
 nixos/modules/programs/shell.nix                     |  2 +-
 nixos/modules/rename.nix                             |  2 ++
 nixos/modules/services/databases/mysql.nix           |  2 +-
 nixos/modules/services/databases/postgresql.nix      | 10 +++++-----
 nixos/modules/services/misc/matrix-synapse.nix       |  2 +-
 nixos/modules/services/network-filesystems/ipfs.nix  |  2 +-
 nixos/modules/services/networking/radicale.nix       |  4 ++--
 nixos/modules/services/web-servers/caddy.nix         |  2 +-
 nixos/modules/virtualisation/amazon-options.nix      |  2 +-
 nixos/modules/virtualisation/containers.nix          |  4 ++--
 nixos/tests/radicale.nix                             |  4 ++--
 15 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index d4e5ff3f431..863110a1c7c 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -70,7 +70,7 @@
     <listitem>
      <para>
       <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790">
-      Bump the <literal>system.defaultChannel</literal> attribute in
+      Bump the <literal>system.nixos.defaultChannel</literal> attribute in
       <literal>nixos/modules/misc/version.nix</literal> </link>
      </para>
     </listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index e500c9d6342..734bc076b85 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -433,9 +433,9 @@ system.autoUpgrade.enable = true;
      default. If you have existing systems with such host keys and want to
      continue to use them, please set
 <programlisting>
-system.stateVersion = "14.12";
+system.nixos.stateVersion = "14.12";
 </programlisting>
-     The new option <option>system.stateVersion</option> ensures that certain
+     The new option <option>system.nixos.stateVersion</option> ensures that certain
      configuration changes that could break existing systems (such as the
      <command>sshd</command> host key setting) will maintain compatibility with
      the specified NixOS release. NixOps sets the state version of existing
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 74b61a64667..a198c2d49b5 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -628,7 +628,7 @@ $bootLoaderConfig
   # compatible, in order to avoid breaking some software such as database
   # servers. You should change this only after NixOS release notes say you
   # should.
-  system.stateVersion = "${\(qw(@release@))}"; # Did you read the comment?
+  system.nixos.stateVersion = "${\(qw(@release@))}"; # Did you read the comment?
 
 }
 EOF
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 74c86443ab9..c45d5b07748 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -12,29 +12,29 @@ in
 
 {
 
-  options.system = {
+  options.system.nixos = {
 
-    nixos.version = mkOption {
+    version = mkOption {
       internal = true;
       type = types.str;
       description = "The full NixOS version (e.g. <literal>16.03.1160.f2d4ee1</literal>).";
     };
 
-    nixos.release = mkOption {
+    release = mkOption {
       readOnly = true;
       type = types.str;
       default = trivial.release;
       description = "The NixOS release (e.g. <literal>16.03</literal>).";
     };
 
-    nixos.versionSuffix = mkOption {
+    versionSuffix = mkOption {
       internal = true;
       type = types.str;
       default = trivial.versionSuffix;
       description = "The NixOS version suffix (e.g. <literal>1160.f2d4ee1</literal>).";
     };
 
-    nixos.revision = mkOption {
+    revision = mkOption {
       internal = true;
       type = types.str;
       default = if pathIsDirectory gitRepo then commitIdFromGitRepo gitRepo
@@ -43,7 +43,7 @@ in
       description = "The Git revision from which this NixOS configuration was built.";
     };
 
-    nixos.codeName = mkOption {
+    codeName = mkOption {
       readOnly = true;
       type = types.str;
       description = "The NixOS release code name (e.g. <literal>Emu</literal>).";
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index d8845fd8f44..3504a8a924b 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -40,7 +40,7 @@ in
 
           # Subscribe the root user to the NixOS channel by default.
           if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
-              echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels
+              echo "${config.system.nixos.defaultChannel} nixos" > $HOME/.nix-channels
           fi
 
           # Create the per-user garbage collector roots directory.
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 56b7bf00448..8820a6da8c0 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -204,6 +204,8 @@ with lib;
     (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ])
     (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ])
     (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ])
+    (mkRenamedOptionModule [ "system" "stateVersion" ] [ "system" "nixos" "stateVersion" ])
+    (mkRenamedOptionModule [ "system" "defaultChannel" ] [ "system" "nixos" "defaultChannel" ])
 
     # Users
     (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 21a131b90a8..66c9330c355 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -218,7 +218,7 @@ in
   config = mkIf config.services.mysql.enable {
 
     services.mysql.dataDir =
-      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql"
+      mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/mysql"
                  else "/var/mysql");
 
     users.extraUsers.mysql = {
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index f022e0863df..4ad4728ccda 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -147,7 +147,7 @@ in
       };
       superUser = mkOption {
         type = types.str;
-        default= if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root";
+        default= if versionAtLeast config.system.nixos.stateVersion "17.09" then "postgres" else "root";
         internal = true;
         description = ''
           NixOS traditionally used 'root' as superuser, most other distros use 'postgres'.
@@ -166,14 +166,14 @@ in
 
     services.postgresql.package =
       # Note: when changing the default, make it conditional on
-      # ‘system.stateVersion’ to maintain compatibility with existing
+      # ‘system.nixos.stateVersion’ to maintain compatibility with existing
       # systems!
-      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96
-            else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95
+      mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then pkgs.postgresql96
+            else if versionAtLeast config.system.nixos.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}"
+      mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
                  else "/var/db/postgresql");
 
     services.postgresql.authentication = mkAfter
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 10901e10222..f7441988b27 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -342,7 +342,7 @@ in {
       };
       database_type = mkOption {
         type = types.enum [ "sqlite3" "psycopg2" ];
-        default = if versionAtLeast config.system.stateVersion "18.03"
+        default = if versionAtLeast config.system.nixos.stateVersion "18.03"
           then "psycopg2"
           else "sqlite3";
         description = ''
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 39a4fd6beff..e2122ddb8ed 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -14,7 +14,7 @@ let
     (optionalString (cfg.defaultMode == "norouting") "--routing=none")
   ] ++ cfg.extraFlags);
 
-  defaultDataDir = if versionAtLeast config.system.stateVersion "17.09" then
+  defaultDataDir = if versionAtLeast config.system.nixos.stateVersion "17.09" then
     "/var/lib/ipfs" else
     "/var/lib/ipfs/.ipfs";
 
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index 391f4bdebba..97ee05046ff 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -9,7 +9,7 @@ let
   confFile = pkgs.writeText "radicale.conf" cfg.config;
 
   # This enables us to default to version 2 while still not breaking configurations of people with version 1
-  defaultPackage = if versionAtLeast config.system.stateVersion "17.09" then {
+  defaultPackage = if versionAtLeast config.system.nixos.stateVersion "17.09" then {
     pkg = pkgs.radicale2;
     text = "pkgs.radicale2";
   } else {
@@ -35,7 +35,7 @@ in
       defaultText = defaultPackage.text;
       description = ''
         Radicale package to use. This defaults to version 1.x if
-        <literal>system.stateVersion &lt; 17.09</literal> and version 2.x
+        <literal>system.nixos.stateVersion &lt; 17.09</literal> and version 2.x
         otherwise.
       '';
     };
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index 2124a42f01a..fe65fba42a4 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -66,7 +66,7 @@ in {
       description = "Caddy web server";
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment = mkIf (versionAtLeast config.system.stateVersion "17.09")
+      environment = mkIf (versionAtLeast config.system.nixos.stateVersion "17.09")
         { CADDYPATH = cfg.dataDir; };
       serviceConfig = {
         ExecStart = ''
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix
index 349fd3adfc9..9ecdcf23e5f 100644
--- a/nixos/modules/virtualisation/amazon-options.nix
+++ b/nixos/modules/virtualisation/amazon-options.nix
@@ -3,7 +3,7 @@
   options = {
     ec2 = {
       hvm = lib.mkOption {
-        default = lib.versionAtLeast config.system.stateVersion "17.03";
+        default = lib.versionAtLeast config.system.nixos.stateVersion "17.03";
         internal = true;
         description = ''
           Whether the EC2 instance is a HVM instance.
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 248c2fc1fb2..c3044ea124c 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -606,8 +606,8 @@ in
                   { config, pkgs, ... }:
                   { services.postgresql.enable = true;
                     services.postgresql.package = pkgs.postgresql96;
-                    
-                    system.stateVersion = "17.03";
+
+                    system.nixos.stateVersion = "17.03";
                   };
               };
           }
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index 8ac0639c6a8..e3843038541 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -43,7 +43,7 @@ in
             });
           })
         ];
-        system.stateVersion = "17.03";
+        system.nixos.stateVersion = "17.03";
       };
       radicale1_export = lib.recursiveUpdate radicale1 {
         services.radicale.extraArgs = [
@@ -54,7 +54,7 @@ in
         services.radicale.extraArgs = [ "--verify-storage" ];
       };
       radicale2 = lib.recursiveUpdate (common args) {
-        system.stateVersion = "17.09";
+        system.nixos.stateVersion = "17.09";
       };
     };
 
-- 
GitLab


From 4017fdcafdd4a1a2063b74bc46c744c85ffcc22e Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 22 Feb 2018 21:31:38 +0000
Subject: [PATCH 0609/1085] lib: modules: propagate `highestPrio`

Yeah, it's ugly. But it's the minimal change that doesn't break anything
else.
---
 lib/modules.nix | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 6c8033322a5..41a5fb89fde 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -310,6 +310,7 @@ rec {
 
     in opt //
       { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;
+        inherit (res.defsFinal') highestPrio;
         definitions = map (def: def.value) res.defsFinal;
         files = map (def: def.file) res.defsFinal;
         inherit (res) isDefined;
@@ -317,7 +318,7 @@ rec {
 
   # Merge definitions of a value of a given type.
   mergeDefinitions = loc: type: defs: rec {
-    defsFinal =
+    defsFinal' =
       let
         # Process mkMerge and mkIf properties.
         defs' = concatMap (m:
@@ -325,15 +326,20 @@ rec {
         ) defs;
 
         # Process mkOverride properties.
-        defs'' = filterOverrides defs';
+        defs'' = filterOverrides' defs';
 
         # Sort mkOrder properties.
         defs''' =
           # Avoid sorting if we don't have to.
-          if any (def: def.value._type or "" == "order") defs''
-          then sortProperties defs''
-          else defs'';
-      in defs''';
+          if any (def: def.value._type or "" == "order") defs''.values
+          then sortProperties defs''.values
+          else defs''.values;
+      in {
+        values = defs''';
+        inherit (defs'') highestPrio;
+      };
+
+    defsFinal = defsFinal'.values;
 
     # Type-check the remaining definitions, and merge them.
     mergedValue = foldl' (res: def:
@@ -416,13 +422,18 @@ rec {
 
      Note that "z" has the default priority 100.
   */
-  filterOverrides = defs:
+  filterOverrides = defs: (filterOverrides' defs).values;
+
+  filterOverrides' = defs:
     let
       defaultPrio = 100;
       getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPrio;
       highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs;
       strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def;
-    in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs;
+    in {
+      values = concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs;
+      inherit highestPrio;
+    };
 
   /* Sort a list of properties.  The sort priority of a property is
      1000 by default, but can be overridden by wrapping the property
-- 
GitLab


From 1f0b6922d3c2de3da235a7075d0d3cb9255b7cd7 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 22 Feb 2018 21:31:57 +0000
Subject: [PATCH 0610/1085] nixos: version: produce a warning when no
 `system.nixos.stateVersion` is explicitly set

---
 nixos/modules/misc/version.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index c45d5b07748..33d8a786169 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ options, config, lib, pkgs, ... }:
 
 with lib;
 
@@ -76,6 +76,9 @@ in
 
   config = {
 
+    warnings = lib.optional (options.system.nixos.stateVersion.highestPrio > 1000)
+      "You don't have `system.nixos.stateVersion` explicitly set. Expect things to break.";
+
     system.nixos = {
       # These defaults are set here rather than up there so that
       # changing them would not rebuild the manual
-- 
GitLab


From 8e7f0bc862300e8d9b59f7c603faa330b8efcd1c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sat, 12 May 2018 21:44:47 +0200
Subject: [PATCH 0611/1085] youtube-dl: Disable phantomjs support by default

This caused a massive increase in closure size (217 -> 530 MiB).
---
 pkgs/tools/misc/youtube-dl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 19173de41e5..b7e3116b672 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -8,7 +8,7 @@
 , generateManPage ? false
 , ffmpegSupport ? true
 , rtmpSupport ? true
-, phantomjsSupport ? !targetPlatform.isDarwin # phantomjs2 is broken on darwin
+, phantomjsSupport ? false
 , hlsEncryptedSupport ? true
 , makeWrapper }:
 
-- 
GitLab


From 3eabf15f9b10d6b4ea67e787697802c263ae7994 Mon Sep 17 00:00:00 2001
From: Tmplt <tmplt@dragons.rocks>
Date: Tue, 8 May 2018 00:40:10 +0200
Subject: [PATCH 0612/1085] soxt: init at 1.3.0

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

diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix
new file mode 100644
index 00000000000..13f037960b0
--- /dev/null
+++ b/pkgs/development/libraries/soxt/default.nix
@@ -0,0 +1,21 @@
+{ fetchurl, stdenv, coin3d, motif, xlibsWrapper, libGLU_combined }:
+
+stdenv.mkDerivation rec {
+  name = "soxt-${version}";
+  version = "1.3.0";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/Coin3D/coin/downloads/SoXt-${version}.tar.gz";
+    sha256= "f5443aadafe8e2222b9b5a23d1f228bb0f3e7d98949b8ea8676171b7ea5bf013";
+  };
+
+  buildInputs = [ coin3d motif xlibsWrapper libGLU_combined ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.coin3d.org/;
+    license = licenses.bsd3;
+    description = "A GUI binding for using Open Inventor with Xt/Motif";
+    maintainers = with maintainers; [ tmplt ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fea7117310..f50bc1d027d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8623,6 +8623,8 @@ with pkgs;
 
   coin3d = callPackage ../development/libraries/coin3d { };
 
+  soxt = callPackage ../development/libraries/soxt { };
+
   CoinMP = callPackage ../development/libraries/CoinMP { };
 
   commoncpp2 = callPackage ../development/libraries/commoncpp2 { };
-- 
GitLab


From 024efc950923730bc3e7e05a87b90c157324e912 Mon Sep 17 00:00:00 2001
From: Tmplt <tmplt@dragons.rocks>
Date: Thu, 26 Apr 2018 01:39:11 +0200
Subject: [PATCH 0613/1085] geant4: v10.0.2 -> v10.4.1, define datasets
 seperately, add deps for enableInventor

By seperating the datasets, geant4 now builds in a sandbox.

Resolves #39766
---
 maintainers/maintainer-list.nix               |   5 +
 .../libraries/physics/geant4/datasets-hook.sh |   5 +
 .../libraries/physics/geant4/datasets.nix     | 103 ++++++++++++++++++
 .../libraries/physics/geant4/default.nix      |  88 ++++++---------
 .../libraries/physics/geant4/fetch.nix        |  12 +-
 .../geant4/{setup-hook.sh => geant4-hook.sh}  |   0
 6 files changed, 157 insertions(+), 56 deletions(-)
 create mode 100644 pkgs/development/libraries/physics/geant4/datasets-hook.sh
 create mode 100644 pkgs/development/libraries/physics/geant4/datasets.nix
 rename pkgs/development/libraries/physics/geant4/{setup-hook.sh => geant4-hook.sh} (100%)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index aec6f67a919..5352d4027bb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3726,6 +3726,11 @@
     github = "titanous";
     name = "Jonathan Rudenberg";
   };
+  tmplt = {
+    email = "tmplt@dragons.rocks";
+    github = "tmplt";
+    name = "Viktor";
+  };
   tnias = {
     email = "phil@grmr.de";
     github = "tnias";
diff --git a/pkgs/development/libraries/physics/geant4/datasets-hook.sh b/pkgs/development/libraries/physics/geant4/datasets-hook.sh
new file mode 100644
index 00000000000..14e3b8f2fc3
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/datasets-hook.sh
@@ -0,0 +1,5 @@
+@name@ () {
+    export G4@envvar@DATA="@out@/data"
+}
+
+postHooks+=(@name@)
diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix
new file mode 100644
index 00000000000..88f2dc2cd6d
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/datasets.nix
@@ -0,0 +1,103 @@
+{ stdenv, fetchurl, }:
+
+let
+  mkDataset = { name, version, sha256, envvar}:
+    stdenv.mkDerivation {
+      inherit name version;
+
+      src = fetchurl {
+        url = "https://geant4-data.web.cern.ch/geant4-data/datasets/${name}.${version}.tar.gz";
+        inherit sha256;
+      };
+
+      preferLocalBuild = true;
+      dontBuild = true;
+      dontConfigure = true;
+
+      installPhase = ''
+        mkdir -p $out/data
+        mv ./* $out/data
+      '';
+
+      inherit envvar;
+      setupHook = ./datasets-hook.sh;
+
+      meta = with stdenv.lib; {
+        description = "Data files for the Geant4 toolkit";
+        homepage = "https://geant4.web.cern.ch/support/download";
+        license = licenses.g4sl;
+        platforms = platforms.all;
+      };
+    };
+in
+  builtins.listToAttrs (map (a: { inherit (a) name; value = mkDataset a; }) [
+    {
+      name = "G4NDL";
+      version = "4.5";
+      sha256 = "cba928a520a788f2bc8229c7ef57f83d0934bb0c6a18c31ef05ef4865edcdf8e";
+      envvar = "NEUTRONHP";
+    }
+
+    {
+      name = "G4EMLOW";
+      version = "7.3";
+      sha256 = "583aa7f34f67b09db7d566f904c54b21e95a9ac05b60e2bfb794efb569dba14e";
+      envvar = "LE";
+    }
+
+    {
+      name = "G4PhotonEvaporation";
+      version = "5.2";
+      sha256 = "83607f8d36827b2a7fca19c9c336caffbebf61a359d0ef7cee44a8bcf3fc2d1f";
+      envvar = "LEVELGAMMA";
+    }
+
+    {
+      name = "G4RadioactiveDecay";
+      version = "5.2";
+      sha256 = "99c038d89d70281316be15c3c98a66c5d0ca01ef575127b6a094063003e2af5d";
+      envvar = "RADIOACTIVE";
+    }
+
+    {
+      name = "G4SAIDDATA";
+      version = "1.1";
+      sha256 = "a38cd9a83db62311922850fe609ecd250d36adf264a88e88c82ba82b7da0ed7f";
+      envvar = "SAIDXS";
+    }
+
+    {
+      name = "G4NEUTRONXS";
+      version = "1.4";
+      sha256 = "57b38868d7eb060ddd65b26283402d4f161db76ed2169437c266105cca73a8fd";
+      envvar = "NEUTRONXS";
+    }
+
+    {
+      name = "G4ABLA";
+      version = "3.1";
+      sha256 = "7698b052b58bf1b9886beacdbd6af607adc1e099fc730ab6b21cf7f090c027ed";
+      envvar = "ABLA";
+    }
+
+    {
+      name = "G4PII";
+      version = "1.3";
+      sha256 = "6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926";
+      envvar = "PII";
+    }
+
+    {
+      name = "G4ENSDFSTATE";
+      version = "2.2";
+      sha256 = "dd7e27ef62070734a4a709601f5b3bada6641b111eb7069344e4f99a01d6e0a6";
+      envvar = "ENSDFSTATE";
+    }
+
+    {
+      name = "G4RealSurface";
+      version = "2.1";
+      sha256 = "2a287adbda1c0292571edeae2082a65b7f7bd6cf2bf088432d1d6f889426dcf3";
+      envvar = "REALSURFACE";
+    }
+  ])
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 794d0b24c77..87af069c18a 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -24,9 +24,14 @@
 # For enableXM.
 , motif ? null # motif or lesstif
 
+# For enableInventor
+, coin3d
+, soxt
+, libXpm ? null
+
 # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
-, libGLU_combined   ? null
-, xlibsWrapper    ? null
+, libGLU_combined ? null
+, xlibsWrapper ? null
 , libXmu ? null
 }:
 
@@ -43,6 +48,7 @@ assert enableXM -> motif != null;
 assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined   != null;
 assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper    != null;
 assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
+assert enableInventor -> libXpm != null;
 
 let
   buildGeant4 =
@@ -52,18 +58,11 @@ let
       inherit version src;
       name = "geant4-${version}";
 
-      # The data directory holds not just interaction cross section data, but other
-      # files which the installer needs to write, so we link to the previously installed
-      # data instead. This assumes the default data installation location of $out/share.
-      preConfigure = ''
-        mkdir -p $out/share/Geant4-${version}
-        ln -s ${g4data}/Geant4-${version}/data $out/share/Geant4-${version}/data
-      '';
-
       multiThreadingFlag = if multiThreadingCapable then "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" else "";
 
       cmakeFlags = ''
         ${multiThreadingFlag}
+        -DGEANT4_INSTALL_DATA=OFF
         -DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}
         -DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}
         -DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}
@@ -74,24 +73,31 @@ let
         -DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}
         -DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}
         -DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}
+        -DINVENTOR_INCLUDE_DIR=${coin3d}/include
+        -DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so
       '';
 
-      g4data = installData {
-        inherit version src;
-      };
-
       enableParallelBuilding = true;
-      buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu ];
-      propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu ];
+      buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];
+      propagatedBuildInputs = [ clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];
+
+      postFixup = ''
+        # Don't try to export invalid environment variables.
+        sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
+      '';
 
-      setupHook = ./setup-hook.sh;
+      setupHook = ./geant4-hook.sh;
+
+      passthru = {
+        data = import ./datasets.nix { inherit stdenv fetchurl; };
+      };
 
       # Set the myriad of envars required by Geant4 if we use a nix-shell.
       shellHook = ''
         source $out/nix-support/setup-hook
       '';
 
-      meta = {
+      meta = with stdenv.lib; {
         description = "A toolkit for the simulation of the passage of particles through matter";
         longDescription = ''
           Geant4 is a toolkit for the simulation of the passage of particles through matter.
@@ -99,44 +105,12 @@ let
           The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
         '';
         homepage = http://www.geant4.org;
-        license = stdenv.lib.licenses.g4sl;
-        maintainers = [ ];
-        platforms = stdenv.lib.platforms.all;
+        license = licenses.g4sl;
+        maintainers = with maintainers; [ tmplt ];
+        platforms = platforms.all;
       };
     };
 
-  installData = 
-    { version, src }:
- 
-    stdenv.mkDerivation rec {
-      inherit version src;
-      name = "g4data-${version}";
-
-      cmakeFlags = ''
-        -DGEANT4_INSTALL_DATA="ON"
-      '';
-
-      buildInputs = [ cmake expat ];
-
-      enableParallelBuilding = true;
-      buildPhase = ''
-        make G4EMLOW G4NDL G4NEUTRONXS G4PII G4SAIDDATA PhotonEvaporation RadioactiveDecay RealSurface
-      '';
-
-      installPhase = ''
-        mkdir -p $out/Geant4-${version}
-        cp -R data/ $out/Geant4-${version}
-      '';
-
-      meta = {
-        description = "Data files for the Geant4 toolkit";
-        homepage = http://www.geant4.org;
-        license = stdenv.lib.licenses.g4sl;
-        maintainers = [ ];
-        platforms = stdenv.lib.platforms.all;
-      };
-    }; 
-
   fetchGeant4 = import ./fetch.nix {
     inherit stdenv fetchurl;
   };
@@ -146,5 +120,9 @@ in {
     inherit (fetchGeant4.v10_0_2) version src;
     multiThreadingCapable = true;
   };
-} 
- 
+
+  v10_4_1 = buildGeant4 {
+    inherit (fetchGeant4.v10_4_1) version src;
+    multiThreadingCapable = true;
+  };
+}
diff --git a/pkgs/development/libraries/physics/geant4/fetch.nix b/pkgs/development/libraries/physics/geant4/fetch.nix
index 0e5dd54c6ae..7dc4c865627 100644
--- a/pkgs/development/libraries/physics/geant4/fetch.nix
+++ b/pkgs/development/libraries/physics/geant4/fetch.nix
@@ -13,7 +13,17 @@ in {
     src = fetchurl{
       url = "http://geant4.cern.ch/support/source/geant4.10.00.p02.tar.gz";
       sha256 = "9d615200901f1a5760970e8f5970625ea146253e4f7c5ad9df2a9cf84549e848";
-    };  
+    };
   };
+
+  v10_4_1 = fetch {
+    version = "10.4.1";
+
+    src = fetchurl{
+      url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
+      sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
+    };
+  };
+
 }
 
diff --git a/pkgs/development/libraries/physics/geant4/setup-hook.sh b/pkgs/development/libraries/physics/geant4/geant4-hook.sh
similarity index 100%
rename from pkgs/development/libraries/physics/geant4/setup-hook.sh
rename to pkgs/development/libraries/physics/geant4/geant4-hook.sh
-- 
GitLab


From 59844d7a6e1a1fce86f7c9f5e0dada4a447e8f6e Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sat, 12 May 2018 23:02:52 +0300
Subject: [PATCH 0614/1085] xsv: 0.12.2 -> 0.13.0

---
 pkgs/tools/text/xsv/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
index 23f172f4ebe..960449cd022 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/pkgs/tools/text/xsv/default.nix
@@ -1,24 +1,22 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   name = "xsv-${version}";
-  version = "0.12.2";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "xsv";
-    rev = "${version}";
-    sha256 = "0z1z3b6nzaid510jaikkawvpmv4kjphzz84p0hppq6vcp5jy00s2";
+    rev = version;
+    sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045";
   };
 
-  cargoSha256 = "0pdzh2xr40dgwravh3i58g602bpszj6c8inggzgmq2kfk8ck6rgj";
+  cargoSha256 = "1qk5wkjm3d4dz5fldlq7rjlm602v0l04hxrbar2j6vhcz9w2r4n6";
 
   meta = with stdenv.lib; {
     description = "A fast CSV toolkit written in Rust";
     homepage = https://github.com/BurntSushi/xsv;
-    license = with licenses; [ unlicense ];
+    license = with licenses; [ unlicense /* or */ mit ];
     maintainers = [ maintainers.jgertm ];
     platforms = platforms.all;
   };
-- 
GitLab


From 0e57b81b2dd69a9fdf2166cdf2d2c129176081de Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 12 May 2018 22:57:05 +0200
Subject: [PATCH 0615/1085] gnome3.gnome-shell: fix libgnomekdb path

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix    |  1 +
 .../desktops/gnome-3/core/gnome-shell/fix-paths.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 6b1e15bbc99..ae9aa047ba0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -59,6 +59,7 @@ in stdenv.mkDerivation rec {
     })
     (substituteAll {
       src = ./fix-paths.patch;
+      inherit (gnome3) libgnomekbd;
       inherit unzip;
     })
   ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
index 7b7ff85a7c8..32a0cc476da 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
@@ -9,3 +9,14 @@
                                            null,
                                            GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
                                            null);
+--- a/js/ui/status/keyboard.js
++++ b/js/ui/status/keyboard.js
+@@ -1019,7 +1019,7 @@
+         if (xkbVariant.length > 0)
+             description = description + '\t' + xkbVariant;
+ 
+-        Util.spawn(['gkbd-keyboard-display', '-l', description]);
++        Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
+     },
+ 
+     _containerGetPreferredWidth: function(container, for_height, alloc) {
-- 
GitLab


From ea8a62add90c7f8704a31c8c28a59e2873a978ae Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 12 May 2018 23:17:03 +0200
Subject: [PATCH 0616/1085] pythonPackages.sasmodels: fix build (#40381)

* The revision checksum changed, so it's safer to pin the package
  against an explicit `git` tag (https://github.com/NixOS/nixpkgs/pull/40381#issuecomment-388484695)

* Repaired `checkPhase` to run `py.test` properly on Python {2,3}

* Bumped to latest revision (unstable-2018-04-27) as it supports the entire test suite
  properly.
---
 .../python-modules/sasmodels/default.nix      | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix
index d33de9c2a73..d84e8329903 100644
--- a/pkgs/development/python-modules/sasmodels/default.nix
+++ b/pkgs/development/python-modules/sasmodels/default.nix
@@ -1,19 +1,25 @@
-{lib, fetchgit, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils}:
+{ lib, fetchFromGitHub, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils
+, pyopencl, opencl-headers
+}:
 
 buildPythonPackage rec {
-  pname = "sasmodels";
-  version = "0.96";
+  pname = "sasmodels-unstable";
+  version = "2018-04-27";
 
-  buildInputs = [pytest];
-  propagatedBuildInputs = [docutils matplotlib numpy scipy];
+  src = fetchFromGitHub {
+    owner = "SasView";
+    repo = "sasmodels";
+    rev = "33969b656596e8b6cc8ce934cd1f8062f7b11cf2";
+    sha256 = "00rvhafg08qvx0k9mzn1ppdkc9i5yfn2gr3hidrf416srf8zgb85";
+  };
 
-  preCheck = ''export HOME=$(mktemp -d)'';
+  buildInputs = [ opencl-headers ];
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ];
 
-  src = fetchgit {
-    url = "https://github.com/SasView/sasmodels.git";
-    rev = "v${version}";
-    sha256 = "11qaaqdc23qzb75zs48fkypksmcb332vl0pkjqr5bijxxymgm7nw";
-  };
+  checkPhase = ''
+    HOME=$(mktemp -d) py.test -c ./pytest.ini
+  '';
 
   meta = {
     description = "Library of small angle scattering models";
-- 
GitLab


From ba4b1d2beedeeb2a20a71d3685457d3f36f1813d Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Sun, 13 May 2018 07:21:34 +0900
Subject: [PATCH 0617/1085] neovim: fix gperf error on dev-version

[ 50%] Generating auto/api/private/dispatch_wrappers.c.generated.h, ../../include/api/private/dispatch_wrappers.h.generated.h
[ 50%] Generating auto/funcs.generated.h, ../../funcs_data.mpack
/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash: ../../../.deps/usr/bin/gperf: No such file or directory
---
 pkgs/applications/editors/neovim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 149f7804a79..480b749d201 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -75,6 +75,7 @@ let
 
     cmakeFlags = [
       "-DLUA_PRG=${luaPackages.lua}/bin/lua"
+      "-DGPERF_PRG=${gperf}/bin/gperf"
     ];
 
     # triggers on buffer overflow bug while running tests
-- 
GitLab


From 70ef1faa253d635b0d492406363ceb7f472041e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 12 May 2018 18:20:38 -0300
Subject: [PATCH 0618/1085] materia-theme: unset $name in install script

- install.sh uses a global environment variable called $name, if defined,
to name the theme. This is an issue because nix sets this variable to
the package name.

- Replace gnome-themes-standard to gnome-themes-extra.
---
 pkgs/misc/themes/materia-theme/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index 69a874d07c3..4b6d364a856 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gnome3.glib libxml2 bc ];
 
-  buildInputs = [ gnome3.gnome-themes-standard gdk_pixbuf librsvg ];
+  buildInputs = [ gnome3.gnome-themes-extra gdk_pixbuf librsvg ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
       -e "s|if .*which gnome-shell.*;|if true;|" \
       -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|"
     mkdir -p $out/share/themes
-    ./install.sh --dest $out/share/themes
+    # name is used internally by the package installation script
+    name= ./install.sh --dest $out/share/themes
     rm $out/share/themes/*/COPYING
   '';
 
-- 
GitLab


From 64df9b6b899fc734577f9b832f17ba3286db1634 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 12 May 2018 17:11:41 -0400
Subject: [PATCH 0619/1085] GHCJS 8.4

---
 .../compilers/ghcjs-ng/8.4/dep-overrides.nix  |   7 +
 .../compilers/ghcjs-ng/8.4/git.json           |   6 +
 .../compilers/ghcjs-ng/8.4/stage0.nix         | 175 ++++++++++++++++++
 .../configuration-ghc-8.4.x.nix               |   5 +-
 pkgs/top-level/haskell-packages.nix           |  13 ++
 5 files changed, 205 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
 create mode 100644 pkgs/development/compilers/ghcjs-ng/8.4/git.json
 create mode 100644 pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix

diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
new file mode 100644
index 00000000000..2d0ed55c6cd
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
@@ -0,0 +1,7 @@
+{ haskellLib }:
+
+let inherit (haskellLib) dontCheck doJailbreak;
+in self: super: {
+  haddock-library-ghcjs = dontCheck super.haddock-library-ghcjs;
+  haddock-api-ghcjs = doJailbreak super.haddock-api-ghcjs;
+}
diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
new file mode 100644
index 00000000000..2d4a7a42667
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
@@ -0,0 +1,6 @@
+{
+  "url": "https://github.com/ghcjs/ghcjs",
+  "rev": "c494a598d1e5b6d70ddcb97177dc4b6cc71f5bd0",
+  "sha256": "1gpn1y3m2gk2x4anfh11p4cp49blabj761wicawvkw0w9bfhcfhn",
+  "fetchSubmodules": true
+}
diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
new file mode 100644
index 00000000000..051b0a19b5b
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
@@ -0,0 +1,175 @@
+{ callPackage, configuredSrc }:
+
+{
+
+  ghcjs = callPackage
+    ({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring
+    , base64-bytestring, binary, bytestring, Cabal, containers
+    , cryptohash, data-default, deepseq, directory, executable-path
+    , filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs
+    , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts
+    , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl
+    , network, optparse-applicative, parallel, parsec, process, random
+    , regex-posix, safe, shelly, split, stdenv, stringsearch, syb
+    , system-fileio, system-filepath, tar, template-haskell
+    , template-haskell-ghcjs, terminfo, test-framework
+    , test-framework-hunit, text, time, transformers
+    , transformers-compat, unix, unix-compat, unordered-containers
+    , vector, wai, wai-app-static, wai-extra, wai-websockets, warp
+    , webdriver, websockets, wl-pprint-text, yaml
+    }:
+    mkDerivation {
+      pname = "ghcjs";
+      version = "8.4.0.1";
+      src = configuredSrc + /.;
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      setupHaskellDepends = [
+        base Cabal containers directory filepath process template-haskell
+        transformers
+      ];
+      libraryHaskellDepends = [
+        aeson array attoparsec base base16-bytestring base64-bytestring
+        binary bytestring Cabal containers cryptohash data-default deepseq
+        directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs
+        ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl
+        optparse-applicative parallel parsec process regex-posix safe split
+        stringsearch syb template-haskell template-haskell-ghcjs text time
+        transformers unordered-containers vector wl-pprint-text yaml
+      ];
+      executableHaskellDepends = [
+        aeson base binary bytestring Cabal containers directory
+        executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs
+        lens mtl optparse-applicative process shelly system-fileio
+        system-filepath tar terminfo text time transformers
+        transformers-compat unix unix-compat unordered-containers vector
+        yaml
+      ];
+      testHaskellDepends = [
+        aeson base bytestring data-default deepseq directory http-types
+        HUnit lens lifted-base network optparse-applicative process random
+        shelly system-fileio system-filepath test-framework
+        test-framework-hunit text time transformers unordered-containers
+        wai wai-app-static wai-extra wai-websockets warp webdriver
+        websockets yaml
+      ];
+      description = "Haskell to JavaScript compiler";
+      license = stdenv.lib.licenses.mit;
+    }) {};
+
+  ghc-api-ghcjs = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+    , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci-ghcjs
+    , hpc, process, stdenv, template-haskell-ghcjs, terminfo, time
+    , transformers, unix
+    }:
+    mkDerivation {
+      pname = "ghc-api-ghcjs";
+      version = "8.4.0";
+      src = configuredSrc + /lib/ghc-api-ghcjs;
+      libraryHaskellDepends = [
+        array base binary bytestring containers deepseq directory filepath
+        ghc-boot ghc-boot-th ghci-ghcjs hpc process template-haskell-ghcjs
+        terminfo time transformers unix
+      ];
+      homepage = "http://www.haskell.org/ghc/";
+      description = "The GHC API (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  ghci-ghcjs = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+    , deepseq, filepath, ghc-boot, ghc-boot-th, stdenv
+    , template-haskell-ghcjs, transformers, unix
+    }:
+    mkDerivation {
+      pname = "ghci-ghcjs";
+      version = "8.4.0";
+      src = configuredSrc + /lib/ghci-ghcjs;
+      libraryHaskellDepends = [
+        array base binary bytestring containers deepseq filepath ghc-boot
+        ghc-boot-th template-haskell-ghcjs transformers unix
+      ];
+      description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  ghcjs-th = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, ghc-prim
+    , ghci-ghcjs, stdenv, template-haskell-ghcjs
+    }:
+    mkDerivation {
+      pname = "ghcjs-th";
+      version = "0.1.0.0";
+      src = configuredSrc + /lib/ghcjs-th;
+      libraryHaskellDepends = [
+        base binary bytestring containers ghc-prim ghci-ghcjs
+        template-haskell-ghcjs
+      ];
+      homepage = "http://github.com/ghcjs";
+      license = stdenv.lib.licenses.mit;
+    }) {};
+
+  haddock-api-ghcjs = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq
+    , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths
+    , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv
+    , transformers, xhtml
+    }:
+    mkDerivation {
+      pname = "haddock-api-ghcjs";
+      version = "2.20.0";
+      src = configuredSrc + /lib/haddock-api-ghcjs;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        array base bytestring Cabal containers deepseq directory filepath
+        ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers
+        xhtml
+      ];
+      testHaskellDepends = [
+        array base bytestring Cabal containers deepseq directory filepath
+        ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs hspec
+        QuickCheck transformers xhtml
+      ];
+      testToolDepends = [ hspec-discover ];
+      homepage = "http://www.haskell.org/haddock/";
+      description = "A documentation-generation tool for Haskell libraries";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  haddock-library-ghcjs = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
+    , directory, filepath, haddock-library, hspec, hspec-discover
+    , optparse-applicative, QuickCheck, stdenv, transformers, tree-diff
+    }:
+    mkDerivation {
+      pname = "haddock-library-ghcjs";
+      version = "1.6.0";
+      src = configuredSrc + /lib/haddock-library-ghcjs;
+      libraryHaskellDepends = [
+        base bytestring containers deepseq transformers
+      ];
+      testHaskellDepends = [
+        base base-compat bytestring containers deepseq directory filepath
+        haddock-library hspec optparse-applicative QuickCheck transformers
+        tree-diff
+      ];
+      testToolDepends = [ hspec-discover ];
+      homepage = "http://www.haskell.org/haddock/";
+      description = "Library exposing some functionality of Haddock";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  template-haskell-ghcjs = callPackage
+    ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }:
+    mkDerivation {
+      pname = "template-haskell-ghcjs";
+      version = "2.13.0.0";
+      src = configuredSrc + /lib/template-haskell-ghcjs;
+      libraryHaskellDepends = [ base ghc-boot-th pretty ];
+      description = "Support library for Template Haskell (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 70624d1ed6a..12fd5974830 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -105,6 +105,9 @@ self: super: {
   ## hspec-discover ==2.4.8
   hspec-discover = super.hspec-discover_2_5_0;
 
+  # https://github.com/jcristovao/enclosed-exceptions/issues/12
+  enclosed-exceptions = dontCheck super.enclosed-exceptions;
+
   ## On Hackage:
 
   ## Upstreamed, awaiting a Hackage release
@@ -450,7 +453,7 @@ self: super: {
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_2;
   pandoc-types = self.pandoc-types_1_17_4_2;
-  wl-pprint-text = self.wl-pprint-text_1_1_1_1;
+  wl-pprint-text = self.wl-pprint-text_1_2_0_0;
   base-compat = self.base-compat_0_10_1;
 
   # https://github.com/xmonad/xmonad/issues/155
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 837f8eb794d..c00bce430c3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -95,6 +95,13 @@ in rec {
       stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
       ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.2/dep-overrides.nix {};
     };
+    ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec {
+      bootPkgs = packages.ghc842;
+      inherit (bootPkgs) alex happy;
+      ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
+      stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
+      ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};
+    };
 
     # The integer-simple attribute set contains all the GHC compilers
     # build with integer-simple instead of integer-gmp.
@@ -169,6 +176,12 @@ in rec {
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
+    ghcjs84 = callPackage ../development/haskell-modules rec {
+      buildHaskellPackages = ghc.bootPkgs;
+      ghc = bh.compiler.ghcjs84;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+    };
 
     # The integer-simple attribute set contains package sets for all the GHC compilers
     # using integer-simple instead of integer-gmp.
-- 
GitLab


From da0883134532ee35a4d7c477ae0a1fcb0380605b Mon Sep 17 00:00:00 2001
From: CrazedProgrammer <crazedprogrammer@gmail.com>
Date: Sun, 13 May 2018 00:10:36 +0200
Subject: [PATCH 0620/1085] compsize: init at 2018-04-07 (#40217)

---
 maintainers/maintainer-list.nix             |  5 ++++
 pkgs/os-specific/linux/compsize/default.nix | 30 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/os-specific/linux/compsize/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b8746b04283..fe9b45a6b22 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -43,6 +43,11 @@
     github = "ChengCat";
     name = "Yucheng Zhang";
   };
+  CrazedProgrammer = {
+    email = "crazedprogrammer@gmail.com";
+    github = "CrazedProgrammer";
+    name = "CrazedProgrammer";
+  };
   CrystalGamma = {
     email = "nixos@crystalgamma.de";
     github = "CrystalGamma";
diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/os-specific/linux/compsize/default.nix
new file mode 100644
index 00000000000..a18011836f9
--- /dev/null
+++ b/pkgs/os-specific/linux/compsize/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, btrfs-progs }:
+
+stdenv.mkDerivation rec {
+  name = "compsize-${version}";
+  version = "2018-04-07";
+
+  src = fetchFromGitHub {
+    owner = "kilobyte";
+    repo = "compsize";
+    rev = "903f772e37fc0ac6d6cf94ddbc98c691763c1e62";
+    sha256 = "0jps8n0xsdh4mcww5q29rzysbv50iq6rmihxrf99lzgrw0sw5m7k";
+  };
+
+  buildInputs = [ btrfs-progs ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man8
+    install -m 0755 compsize $out/bin
+    install -m 0444 compsize.8 $out/share/man/man8
+  '';
+
+  meta = with stdenv.lib; {
+    description = "btrfs: Find compression type/ratio on a file or set of files";
+    homepage    = https://github.com/kilobyte/compsize;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ CrazedProgrammer ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49bd8adaf33..a65dfde553c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1062,6 +1062,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation AddressBook;
   };
 
+  compsize = callPackage ../os-specific/linux/compsize { };
+
   coturn = callPackage ../servers/coturn { };
 
   coursier = callPackage ../development/tools/coursier {};
-- 
GitLab


From 03d4694e6110fa9c16e88ee74085ea2068c27494 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Sun, 13 May 2018 00:17:49 +0200
Subject: [PATCH 0621/1085] hwloc: 1.11.9 -> 1.11.10 (#40382)

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

diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index ad39a4fde31..90a16bcf7f9 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -7,11 +7,11 @@ assert x11Support -> libX11 != null && cairo != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "hwloc-1.11.9";
+  name = "hwloc-1.11.10";
 
   src = fetchurl {
     url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2";
-    sha256 = "0r2im1s5lp7zjwqalcqcnlxx0dsky1bnx5waf2r3rmj888c36hrr";
+    sha256 = "1ryibcng40xcq22lsj85fn2vcvrksdx9rr3wwxpq8dw37lw0is1b";
   };
 
   configureFlags = [
-- 
GitLab


From 3fd8dea3545e551c7e50bd9cc8c760001faf8b8a Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Sun, 29 Apr 2018 03:09:11 +0900
Subject: [PATCH 0622/1085] rounded-mgenplus: init at 20150602

---
 pkgs/data/fonts/rounded-mgenplus/default.nix | 37 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/data/fonts/rounded-mgenplus/default.nix

diff --git a/pkgs/data/fonts/rounded-mgenplus/default.nix b/pkgs/data/fonts/rounded-mgenplus/default.nix
new file mode 100644
index 00000000000..24a29b56bcc
--- /dev/null
+++ b/pkgs/data/fonts/rounded-mgenplus/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, p7zip }:
+
+let
+  pname = "rounded-mgenplus";
+  version = "20150602";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  inherit version;
+
+  src = fetchurl {
+    url = "https://osdn.jp/downloads/users/8/8598/${name}.7z";
+    sha256 = "1k15xvzd3s5ppp151wv31wrfq2ri8v96xh7i71i974rxjxj6gspc";
+  };
+
+  nativeBuildInputs = [ p7zip ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  unpackPhase = ''
+    7z x $src
+  '';
+
+  installPhase = ''
+    install -m 444 -D -t $out/share/fonts/${pname} ${pname}-*.ttf
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Japanese font based on Rounded M+ and Noto Sans Japanese";
+    homepage = http://jikasei.me/font/rounded-mgenplus/;
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a65dfde553c..1a386721feb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4712,6 +4712,8 @@ with pkgs;
 
   rnv = callPackage ../tools/text/xml/rnv { };
 
+  rounded-mgenplus = callPackage ../data/fonts/rounded-mgenplus { };
+
   roundup = callPackage ../tools/misc/roundup { };
 
   routino = callPackage ../tools/misc/routino { };
-- 
GitLab


From 50f5a417b229264937230a6628594bc2a978c91d Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Sun, 13 May 2018 07:13:46 +0900
Subject: [PATCH 0623/1085] rounded-mgenplus: add mnacamura as maintainer

---
 maintainers/maintainer-list.nix              | 5 +++++
 pkgs/data/fonts/rounded-mgenplus/default.nix | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe9b45a6b22..a2db508d4d2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2506,6 +2506,11 @@
     github = "mmlb";
     name = "Manuel Mendez";
   };
+  mnacamura = {
+    email = "m.nacamura@gmail.com";
+    github = "mnacamura";
+    name = "Mitsuhiro Nakamura";
+  };
   moaxcp = {
     email = "moaxcp@gmail.com";
     github = "moaxcp";
diff --git a/pkgs/data/fonts/rounded-mgenplus/default.nix b/pkgs/data/fonts/rounded-mgenplus/default.nix
index 24a29b56bcc..c6cb61b7bd1 100644
--- a/pkgs/data/fonts/rounded-mgenplus/default.nix
+++ b/pkgs/data/fonts/rounded-mgenplus/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     homepage = http://jikasei.me/font/rounded-mgenplus/;
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ mnacamura ];
   };
 }
-- 
GitLab


From 98ae4b46c3ee3329c3ae814f5bf54987ebcda07c Mon Sep 17 00:00:00 2001
From: James  Kay <twey@twey.co.uk>
Date: Sat, 12 May 2018 23:37:42 +0100
Subject: [PATCH 0624/1085] pythonPackages.plover.dev: 4.0.0.dev6 -> 4.0.0.dev8
 (#40345)

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

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 09558ff4c47..b9323ece1f4 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -24,7 +24,7 @@
 
   dev = with python36Packages; buildPythonPackage rec {
     name    = "plover-${version}";
-    version = "4.0.0.dev6";
+    version = "4.0.0.dev8";
 
     meta = with stdenv.lib; {
       description = "OpenSteno Plover stenography software";
@@ -34,14 +34,14 @@
 
     src = fetchurl {
       url    = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
-      sha256 = "067rkpqnjjxwyv9cwh9i925ndba6fvj6q0r56lizy0l26b4jc8rp";
+      sha256 = "1wxkmik1zyw5gqig5r0cas5v6f5408fbnximzw610rdisqy09rxp";
     };
 
     # I'm not sure why we don't find PyQt5 here but there's a similar
     # sed on many of the platforms Plover builds for
     postPatch = "sed -i /PyQt5/d setup.cfg";
 
-    buildInputs           = [ pytest mock ];
-    propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs ];
+    checkInputs           = [ pytest mock ];
+    propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth ];
   };
 }
-- 
GitLab


From 78fba374c47f487824dbd4c75ba7f0366f61608c Mon Sep 17 00:00:00 2001
From: pbogdan <ppbogdan@gmail.com>
Date: Sat, 12 May 2018 23:55:05 +0100
Subject: [PATCH 0625/1085] libsmbios: re-enable python utilities (#39022)

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

diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 62898675f2b..c61fa683c75 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext
-, libxml2, perl, doxygen }:
+, libxml2, perl, python3, doxygen }:
 
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ];
 
-  configureFlags = [ "--disable-python" "--disable-graphviz" ];
+  buildInputs = [ python3 ];
+
+  configureFlags = [ "--disable-graphviz" ];
 
   enableParallelBuilding = true;
 
-- 
GitLab


From 59edce641426242e510aa5dc7c16cf5d9da0d821 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sun, 13 May 2018 03:16:59 +0300
Subject: [PATCH 0626/1085] kernel: drop tuxOnIce patch (#40411)

Hasn't been updated since 3.14, abandoned by its author, not actually used despite being inside a let binding.
---
 pkgs/os-specific/linux/kernel/patches.nix | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 4ba182ea5a5..fb28bba1c32 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -1,26 +1,6 @@
 { stdenv, fetchurl, fetchpatch, pkgs }:
 
-let
-
-  makeTuxonicePatch = { version, kernelVersion, sha256,
-    url ? "http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-${kernelVersion}-${version}.patch.bz2" }:
-    { name = "tuxonice-${kernelVersion}";
-      patch = stdenv.mkDerivation {
-        name = "tuxonice-${version}-for-${kernelVersion}.patch";
-        src = fetchurl {
-          inherit url sha256;
-        };
-        phases = [ "installPhase" ];
-        installPhase = ''
-          source $stdenv/setup
-          bunzip2 -c $src > $out
-        '';
-      };
-    };
-in
-
 rec {
-
   bridge_stp_helper =
     { name = "bridge-stp-helper";
       patch = ./bridge-stp-helper.patch;
-- 
GitLab


From 261bc1dc3a90fe938018ee6bcdac86ee01d27cab Mon Sep 17 00:00:00 2001
From: Fahad Sadah <92872+fahadsadah@users.noreply.github.com>
Date: Sun, 6 May 2018 01:43:55 +0100
Subject: [PATCH 0627/1085] sunxi-tools: master20151216 -> master20171130

---
 pkgs/development/tools/sunxi-tools/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix
index 59252a93863..7e20d807e61 100644
--- a/pkgs/development/tools/sunxi-tools/default.nix
+++ b/pkgs/development/tools/sunxi-tools/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libusb }:
+{ stdenv, fetchFromGitHub, pkgconfig, libusb, zlib }:
 
 stdenv.mkDerivation {
-  name = "sunxi-tools-1.3";
+  name = "sunxi-tools-20171130";
 
   src = fetchFromGitHub {
     owner = "linux-sunxi";
     repo = "sunxi-tools";
-    rev = "be1b4c7400161b90437432076360c1f99970f54f";
-    sha256 = "02pqaaahra4wbv325264qh5i17mxwicmjx9nm33nw2dpmfmg9xhr";
+    rev = "5c1971040c6c44caefb98e371bfca9e18d511da9";
+    sha256 = "0qzm515i3dfn82a6sf7372080zb02d365z52bh0b1q711r4dvjgp";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libusb ];
+  buildInputs = [ libusb zlib ];
 
   buildPhase = ''
-    make all misc
+    make tools misc
   '';
 
   installPhase = ''
     mkdir -p $out/bin
-    cp bin2fex fex2bin phoenix_info sunxi-bootinfo sunxi-fel sunxi-fexc sunxi-nand-part sunxi-pio $out/bin
+    cp bin2fex fex2bin phoenix_info sunxi-bootinfo sunxi-fel sunxi-fexc sunxi-nand-image-builder sunxi-nand-part sunxi-pio $out/bin
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 714aff4004cbd8396624f798a485f2d724d1233c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 13 May 2018 03:53:26 +0300
Subject: [PATCH 0628/1085] sunxi-tools: Use upstream install rule

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

diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix
index 7e20d807e61..0bddd0d3e17 100644
--- a/pkgs/development/tools/sunxi-tools/default.nix
+++ b/pkgs/development/tools/sunxi-tools/default.nix
@@ -13,14 +13,11 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libusb zlib ];
 
-  buildPhase = ''
-    make tools misc
-  '';
+  makeFlags = [ "PREFIX=$(out)" ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin2fex fex2bin phoenix_info sunxi-bootinfo sunxi-fel sunxi-fexc sunxi-nand-image-builder sunxi-nand-part sunxi-pio $out/bin
-  '';
+  buildFlags = [ "tools" "misc" ];
+
+  installTargets = [ "install-tools" "install-misc" ];
 
   meta = with stdenv.lib; {
     description = "Tools for Allwinner A10 devices";
-- 
GitLab


From 44d612d6e5188cf6fcb3f2fefb0116e2c979e9c3 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 13 May 2018 01:15:23 +0000
Subject: [PATCH 0629/1085] nixos:
 services.xserver.desktopManager.xterm.enable: fix type

---
 nixos/modules/services/x11/desktop-managers/xterm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index 29752ff405e..6ff1ef0e4c9 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -12,6 +12,7 @@ in
   options = {
 
     services.xserver.desktopManager.xterm.enable = mkOption {
+      type = types.bool;
       default = true;
       description = "Enable a xterm terminal as a desktop manager.";
     };
-- 
GitLab


From fb2a8d66699c96d6a687eb71ebfcca08e3405037 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 13 May 2018 01:15:37 +0000
Subject: [PATCH 0630/1085] nixos: systemd.services.*.environment: fix type

---
 nixos/modules/system/boot/systemd-unit-options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 5255f1a1b97..2cff25a8c85 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -217,7 +217,7 @@ in rec {
 
     environment = mkOption {
       default = {};
-      type = with types; attrsOf (nullOr (either str package));
+      type = with types; attrsOf (nullOr (either str (either path package)));
       example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
       description = "Environment variables passed to the service's processes.";
     };
-- 
GitLab


From 1c3492f358f1073253823b76134e24f0d335647a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 12 May 2018 20:23:09 -0500
Subject: [PATCH 0631/1085] kde-gtk-config: Set path for GSettings schemas

Fixes: #38919

The KCModule is patched to set the appropriate environment variables in
the parent process when it is initialized.
---
 .../plasma-5/kde-gtk-config/default.nix       | 10 ++++--
 .../follow-symlinks.patch}                    | 35 +++++++++----------
 .../kde-gtk-config/patches/gsettings.patch    | 21 +++++++++++
 .../plasma-5/kde-gtk-config/patches/series    |  2 ++
 4 files changed, 46 insertions(+), 22 deletions(-)
 rename pkgs/desktops/plasma-5/kde-gtk-config/{0001-follow-symlinks.patch => patches/follow-symlinks.patch} (62%)
 create mode 100644 pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch
 create mode 100644 pkgs/desktops/plasma-5/kde-gtk-config/patches/series

diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index 35d90a246bc..8cfc947d30b 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -1,21 +1,25 @@
 {
   mkDerivation,
-  extra-cmake-modules,
+  extra-cmake-modules, wrapGAppsHook,
   glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
   knewstuff, gsettings-desktop-schemas
 }:
 
 mkDerivation {
   name = "kde-gtk-config";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
+  dontWrapGApps = true;  # There is nothing to wrap
   buildInputs = [
     ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff gsettings-desktop-schemas
   ];
-  patches = [ ./0001-follow-symlinks.patch ];
+  patches = [ ./patches/follow-symlinks.patch ./patches/gsettings.patch ];
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
     "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"
   ];
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\""
+  '';
 }
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch
similarity index 62%
rename from pkgs/desktops/plasma-5/kde-gtk-config/0001-follow-symlinks.patch
rename to pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch
index d610d19eedd..f30a0a4588f 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/0001-follow-symlinks.patch
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch
@@ -8,11 +8,11 @@ Subject: [PATCH] follow symlinks
  src/iconthemesmodel.cpp | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
-index b1e0b52..095cddc 100644
---- a/src/appearancegtk2.cpp
-+++ b/src/appearancegtk2.cpp
-@@ -73,7 +73,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
+Index: kde-gtk-config-5.12.4/src/appearancegtk2.cpp
+===================================================================
+--- kde-gtk-config-5.12.4.orig/src/appearancegtk2.cpp
++++ kde-gtk-config-5.12.4/src/appearancegtk2.cpp
+@@ -69,7 +69,7 @@ QString AppearanceGTK2::themesGtkrcFile(
      QStringList themes=installedThemes();
      themes=themes.filter(QRegExp("/"+themeName+"/?$"));
      if(themes.size()==1) {
@@ -21,12 +21,12 @@ index b1e0b52..095cddc 100644
          while(it.hasNext()) {
              it.next();
              if(it.fileName()=="gtkrc") {
-diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp
-index 07c7ad7..b04d978 100644
---- a/src/iconthemesmodel.cpp
-+++ b/src/iconthemesmodel.cpp
-@@ -46,7 +46,7 @@ QList<QDir> IconThemesModel::installedThemesPaths()
-     
+Index: kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
+===================================================================
+--- kde-gtk-config-5.12.4.orig/src/iconthemesmodel.cpp
++++ kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
+@@ -47,7 +47,7 @@ QList<QDir> IconThemesModel::installedTh
+ 
      foreach(const QString& dir, dirs) {
          QDir userIconsDir(dir);
 -        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
@@ -34,14 +34,11 @@ index 07c7ad7..b04d978 100644
          while(it.hasNext()) {
              QString currentPath = it.next();
              QDir dir(currentPath);
--- 
-2.6.2
-
-diff --git a/src/cursorthemesmodel.cpp b/src/cursorthemesmodel.cpp
-index 926a666..85b10f8 100644
---- a/src/cursorthemesmodel.cpp
-+++ b/src/cursorthemesmodel.cpp
-@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installedThemesPaths()
+Index: kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
+===================================================================
+--- kde-gtk-config-5.12.4.orig/src/cursorthemesmodel.cpp
++++ kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
+@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installed
  
      foreach(const QString& dir, dirs) {
          QDir userIconsDir(dir);
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch b/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch
new file mode 100644
index 00000000000..b4bc89d59e9
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch
@@ -0,0 +1,21 @@
+Index: kde-gtk-config-5.12.4/src/gtkconfigkcmodule.cpp
+===================================================================
+--- kde-gtk-config-5.12.4.orig/src/gtkconfigkcmodule.cpp
++++ kde-gtk-config-5.12.4/src/gtkconfigkcmodule.cpp
+@@ -78,6 +78,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWi
+     m_iconsModel = new IconThemesModel(false, this);
+     ui->cb_icon->setModel(m_iconsModel);
+     ui->cb_icon_fallback->setModel(m_iconsModel);
++
++    // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS.
++    // Normally this would be done by wrapGAppsHook, but this plugin
++    // (shared object) cannot be wrapped.
++    QByteArray xdgdata = qgetenv("XDG_DATA_DIRS");
++    if (!xdgdata.isEmpty()) {
++        xdgdata.push_front(":");
++    }
++    xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH));
++    qputenv("XDG_DATA_DIRS", xdgdata);
+     
+     m_tempGtk2Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/gtkrc-2.0";
+     m_tempGtk3Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/.config/gtk-3.0/settings.ini";
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/series b/pkgs/desktops/plasma-5/kde-gtk-config/patches/series
new file mode 100644
index 00000000000..7aad1acf6ac
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/patches/series
@@ -0,0 +1,2 @@
+follow-symlinks.patch
+gsettings.patch
-- 
GitLab


From a2981671523416ad5c9a49de8c16ac8fccb2306b Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sun, 13 May 2018 03:28:27 +0300
Subject: [PATCH 0632/1085] stage-1: remove tuxonice handling

---
 nixos/modules/system/boot/stage-1-init.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 1facf419ed0..92e68b72664 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -405,15 +405,6 @@ lustrateRoot () {
 
 
 
-
-# Try to resume - all modules are loaded now.
-if test -e /sys/power/tuxonice/resume; then
-    if test -n "$(cat /sys/power/tuxonice/resume)"; then
-        echo 0 > /sys/power/tuxonice/user_interface/enabled
-        echo 1 > /sys/power/tuxonice/do_resume || echo "failed to resume..."
-    fi
-fi
-
 if test -e /sys/power/resume -a -e /sys/power/disk; then
     if test -n "@resumeDevice@" && waitDevice "@resumeDevice@"; then
         resumeDev="@resumeDevice@"
-- 
GitLab


From e9ed8dd78ea0804d0cb5c6d27d5728f3c8dbd4dd Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 13 May 2018 12:17:05 +0200
Subject: [PATCH 0633/1085] sass: 3.4.22 -> 3.5.6

---
 pkgs/development/tools/sass/Gemfile.lock | 12 ++++++--
 pkgs/development/tools/sass/default.nix  | 11 +++----
 pkgs/development/tools/sass/gemset.nix   | 39 ++++++++++++++++++++++--
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/sass/Gemfile.lock b/pkgs/development/tools/sass/Gemfile.lock
index 82dcddb9ece..ecd1404e339 100644
--- a/pkgs/development/tools/sass/Gemfile.lock
+++ b/pkgs/development/tools/sass/Gemfile.lock
@@ -1,7 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    sass (3.4.22)
+    ffi (1.9.23)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    sass (3.5.6)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
 
 PLATFORMS
   ruby
@@ -10,4 +18,4 @@ DEPENDENCIES
   sass
 
 BUNDLED WITH
-   1.11.2
+   1.14.6
diff --git a/pkgs/development/tools/sass/default.nix b/pkgs/development/tools/sass/default.nix
index cfeb3ccc0f9..96354acaec4 100644
--- a/pkgs/development/tools/sass/default.nix
+++ b/pkgs/development/tools/sass/default.nix
@@ -1,14 +1,13 @@
-{ lib, bundlerEnv, ruby }:
+{ lib, bundlerApp }:
 
-bundlerEnv {
-  name = "sass-3.4.22";
-
-  inherit ruby;
+bundlerApp {
+  pname = "sass";
   gemdir = ./.;
+  exes = [ "sass" "sass-convert" "scss" ];
 
   meta = with lib; {
     description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS";
-    homepage    = http://sass-lang.com/;
+    homepage    = https://sass-lang.com;
     license     = licenses.mit;
     maintainers = [ maintainers.romildo ];
     platforms   = platforms.unix;
diff --git a/pkgs/development/tools/sass/gemset.nix b/pkgs/development/tools/sass/gemset.nix
index 31e4e6ab6d3..bd25281f14f 100644
--- a/pkgs/development/tools/sass/gemset.nix
+++ b/pkgs/development/tools/sass/gemset.nix
@@ -1,10 +1,45 @@
 {
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
+      type = "gem";
+    };
+    version = "1.9.23";
+  };
+  rb-fsevent = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
+      type = "gem";
+    };
+    version = "0.10.3";
+  };
+  rb-inotify = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
+      type = "gem";
+    };
+    version = "0.9.10";
+  };
   sass = {
+    dependencies = ["sass-listen"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
+      type = "gem";
+    };
+    version = "3.5.6";
+  };
+  sass-listen = {
+    dependencies = ["rb-fsevent" "rb-inotify"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy";
+      sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
       type = "gem";
     };
-    version = "3.4.22";
+    version = "4.0.0";
   };
 }
\ No newline at end of file
-- 
GitLab


From 6d8bf113bd9630c7671065871b5b60a4127ec985 Mon Sep 17 00:00:00 2001
From: Stefan Matting <stefan.matting@gmail.com>
Date: Sun, 13 May 2018 14:17:32 +0200
Subject: [PATCH 0634/1085] libgpuarray: add nvidia_x11 as dependency when
 cudaSupport

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

diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix
index 26fe33995ed..14e83584678 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -9,10 +9,13 @@
 , nose
 , Mako
 , python
-, cudaSupport ? false, cudatoolkit
+, cudaSupport ? false, cudatoolkit , nvidia_x11
 , openclSupport ? true, ocl-icd, clblas
 }:
 
+assert cudaSupport -> nvidia_x11 != null
+                   && cudatoolkit != null;
+
 buildPythonPackage rec {
   pname = "libgpuarray";
   version = "0.7.5";
@@ -32,7 +35,7 @@ buildPythonPackage rec {
 
   libraryPath = lib.makeLibraryPath (
     []
-    ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ]
+    ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out nvidia_x11 ]
     ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd)
   );
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9033c3d825..ce520ca7119 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7114,6 +7114,7 @@ in {
   libgpuarray = callPackage ../development/python-modules/libgpuarray {
     clblas = pkgs.clblas.override { boost = self.boost; };
     cudaSupport = pkgs.config.cudaSupport or false;
+    inherit (pkgs.linuxPackages) nvidia_x11;
   };
 
   librepo = toPythonModule (pkgs.librepo.override {
-- 
GitLab


From e0cf582493ad249acbf69267e1a2e35f08e37f47 Mon Sep 17 00:00:00 2001
From: Stefan Matting <stefan.matting@gmail.com>
Date: Sun, 13 May 2018 14:23:12 +0200
Subject: [PATCH 0635/1085] Theano: fix broken compiler; Add nvidia_x11 as
 dependency when cudaSupport

---
 pkgs/development/python-modules/Theano/default.nix | 9 ++++++++-
 pkgs/top-level/python-packages.nix                 | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix
index 03dc825218e..9eb04782d6f 100644
--- a/pkgs/development/python-modules/Theano/default.nix
+++ b/pkgs/development/python-modules/Theano/default.nix
@@ -15,17 +15,24 @@
 , libgpuarray
 , cudaSupport ? false, cudatoolkit
 , cudnnSupport ? false, cudnn
+, nvidia_x11
 }:
 
 assert cudnnSupport -> cudaSupport;
 
+assert cudaSupport -> nvidia_x11 != null
+                   && cudatoolkit != null
+                   && cudnn != null;
+
 let
   extraFlags =
     lib.optionals cudaSupport [ "-I ${cudatoolkit}/include" "-L ${cudatoolkit}/lib" ]
-    ++ lib.optionals cudnnSupport [ "-I ${cudnn}/include" "-L ${cudnn}/lib" ];
+    ++ lib.optionals cudnnSupport [ "-I ${cudnn}/include" "-L ${cudnn}/lib" ]
+    ++ lib.optionals cudaSupport [ "-I ${libgpuarray}/include" "-L ${libgpuarray}/lib" ];
 
   gcc_ = writeScriptBin "g++" ''
     #!${stdenv.shell}
+    export NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST=1
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${toString extraFlags}"
     exec ${gcc}/bin/g++ "$@"
   '';
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ce520ca7119..a5a24e42865 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12986,6 +12986,7 @@ in {
   Theano = callPackage ../development/python-modules/Theano rec {
     cudaSupport = pkgs.config.cudaSupport or false;
     cudnnSupport = cudaSupport;
+    inherit (pkgs.linuxPackages) nvidia_x11;
   };
 
   TheanoWithoutCuda = self.Theano.override {
-- 
GitLab


From 4371e5be0b5f5c45491915658dc20ed6b93e0469 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Sun, 13 May 2018 15:25:24 +0200
Subject: [PATCH 0636/1085] libressl_2_7: init at 2.7.3

---
 pkgs/development/libraries/libressl/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix                 | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 51162979e63..7e9f187b1f1 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -43,4 +43,9 @@ in {
     version = "2.6.4";
     sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3";
   };
+
+  libressl_2_7 = generic {
+    version = "2.7.3";
+    sha256 = "1597kj9jy3jyw52ys19sd4blg2gkam5q0rqdxbnrnvnyw67hviqn";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a386721feb..3a4357a6ec3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10947,7 +10947,8 @@ with pkgs;
 
   inherit (callPackages ../development/libraries/libressl { })
     libressl_2_5
-    libressl_2_6;
+    libressl_2_6
+    libressl_2_7;
 
   libressl = libressl_2_5;
 
-- 
GitLab


From 3e293b2dc3e80490c5275f9b9db69c1232ef757b Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Sun, 13 May 2018 15:26:34 +0200
Subject: [PATCH 0637/1085] libressl: use https url in metadata

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

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 7e9f187b1f1..5dfb61f172f 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -26,7 +26,7 @@ let
 
     meta = with lib; {
       description = "Free TLS/SSL implementation";
-      homepage    = "http://www.libressl.org";
+      homepage    = "https://www.libressl.org";
       platforms   = platforms.all;
       maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
     };
-- 
GitLab


From 991f8db51a6e2d75a4ec774f1de95fbe99a476ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 13 May 2018 14:41:31 +0100
Subject: [PATCH 0638/1085] xorgserver: add mesa_noglu for dri package

---
 pkgs/servers/x11/xorg/overrides.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index ce78eba4b43..23aae113483 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -476,8 +476,6 @@ in
         dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
         libXfont2
       ];
-      # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316
-      commonPatches = [ ];
       # XQuartz requires two compilations: the first to get X / XQuartz,
       # and the second to get Xvfb, Xnest, etc.
       darwinOtherX = overrideDerivation xorgserver (oldAttrs: {
@@ -494,11 +492,10 @@ in
       if (!isDarwin)
       then {
         outputs = [ "out" "dev" ];
-        buildInputs = [ makeWrapper args.libdrm ] ++ commonBuildInputs;
+        buildInputs = commonBuildInputs ++ [ makeWrapper args.libdrm args.mesa_noglu ];
         propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
           args.udev
         ];
-        patches = commonPatches;
         prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
           export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
         '';
@@ -515,6 +512,7 @@ in
         ] ++ lib.optionals stdenv.hostPlatform.isMusl [
           "--disable-tls"
         ];
+
         postInstall = ''
           rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it
           ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others
@@ -538,7 +536,7 @@ in
         ];
 
         # XQuartz patchset
-        patches = commonPatches ++ [
+        patches = [
           (args.fetchpatch {
             url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch";
             sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k";
-- 
GitLab


From 8712ea5ccf70fcd17234edae157ec6631d5dbbc0 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Sun, 13 May 2018 17:02:51 +0300
Subject: [PATCH 0639/1085] avocode: init at 2.26.0 (#40425)

---
 .../applications/graphics/avocode/default.nix | 99 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 101 insertions(+)
 create mode 100644 pkgs/applications/graphics/avocode/default.nix

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
new file mode 100644
index 00000000000..7bcbc8f2e40
--- /dev/null
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -0,0 +1,99 @@
+{ stdenv, lib, makeDesktopItem, fetchurl, unzip
+, gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2
+, xorg, mozjpeg
+}:
+
+stdenv.mkDerivation rec {
+  name = "avocode-${version}";
+  version = "2.26.0";
+
+  src = fetchurl {
+    url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
+    sha256 = "11d3nlshyzh5aqf5vsvnjwhr9qn8a2kd848x0ylv91y9p9njgsl5";
+  };
+
+  libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
+    stdenv.cc.cc.lib
+    gdk_pixbuf
+    glib
+    gtk2
+    atk
+    pango
+    cairo
+    freetype
+    fontconfig
+    dbus
+    nss
+    nspr
+    alsaLib
+    cups
+    expat
+    udev
+    GConf
+    libX11
+    libxcb
+    libXi
+    libXcursor
+    libXdamage
+    libXrandr
+    libXcomposite
+    libXext
+    libXfixes
+    libXrender
+    libXtst
+    libXScrnSaver
+  ]);
+
+  desktopItem = makeDesktopItem {
+    name = "Avocode";
+    exec = "avocode";
+    icon = "avocode";
+    desktopName = "Avocode";
+    genericName = "Design Inspector";
+    categories = "Application;Development;";
+    comment = "The bridge between designers and developers";
+  };
+
+  buildInputs = [ unzip ];
+
+  # src is producing multiple folder on unzip so we must
+  # override unpackCmd to extract it into newly created folder
+  unpackCmd = ''
+    mkdir out
+    unzip $curSrc -d out
+  '';
+
+  installPhase = ''
+    substituteInPlace avocode.desktop.in \
+      --replace /path/to/avocode-dir/Avocode $out/bin/avocode \
+      --replace /path/to/avocode-dir/avocode.png avocode
+
+    mkdir -p share/applications share/pixmaps
+    mv avocode.desktop.in share/applications/avocode.desktop
+    mv avocode.png share/pixmaps/
+
+    rm resources/cjpeg
+    cp -av . $out
+
+    mkdir $out/bin
+    ln -s $out/avocode $out/bin/avocode
+    ln -s ${mozjpeg}/bin/cjpeg $out/resources/cjpeg
+  '';
+
+  postFixup = ''
+    for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode
+        patchelf --set-rpath ${libPath}:$out/ $file
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://avocode.com/;
+    description = "The bridge between designers and developers";
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ megheaiulian ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a386721feb..774f2becdd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14880,6 +14880,8 @@ with pkgs;
 
   autotrace = callPackage ../applications/graphics/autotrace {};
 
+  avocode = callPackage ../applications/graphics/avocode {};
+
   milkytracker = callPackage ../applications/audio/milkytracker { };
 
   schismtracker = callPackage ../applications/audio/schismtracker { };
-- 
GitLab


From be53a0f2effc8933f7a6429da9692e469341bc4b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 13 May 2018 17:25:18 +0200
Subject: [PATCH 0640/1085] sasview: fix build (#40433)

The package breaks currently breaks with the following message:

```
fixed-output derivation produced path '/nix/store/5dh1mdj027ad8sprk12fqa5h5bpdxs5n-sasview' with sha256 hash '12k1w4yq1mzjxcp2cqb562c7cbwzhi54rsbmgi0fax0i1660q167' instead of the expected hash '05la54wwzzlkhmj8vkr0bvzagyib6z6mgwqbddzjs5y1wd48vpcx'
```

To fix the build the following changes were applied:

* Switched to latest master for now as the older releases have a broken
  `py.test` configuration and altering hashes.

* Added `checkPhase` which invokes `py.test` directly and drops
  duplicated files from `dist/tmpbuild`.

* Rebased the patches `pyparsing-fix.patch` and `local_config.patch` for
  the latest master revision.

Additionally refer to the discussion in #40381 for further reference.
---
 .../science/misc/sasview/default.nix          | 45 ++++++++++++-------
 .../science/misc/sasview/local_config.patch   | 20 +++++++--
 .../science/misc/sasview/pyparsing-fix.patch  | 15 ++++---
 3 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix
index d0a4f74924c..bad29df9dc8 100644
--- a/pkgs/applications/science/misc/sasview/default.nix
+++ b/pkgs/applications/science/misc/sasview/default.nix
@@ -1,7 +1,8 @@
-{lib, fetchgit, gcc, python}:
+{ lib, fetchFromGitHub, gcc, python }:
 
 let
-  xhtml2pdf = import ./xhtml2pdf.nix { inherit lib;
+  xhtml2pdf = import ./xhtml2pdf.nix {
+    inherit lib;
     fetchPypi = python.pkgs.fetchPypi;
     buildPythonPackage = python.pkgs.buildPythonPackage;
     html5lib = python.pkgs.html5lib;
@@ -10,17 +11,29 @@ let
     pillow = python.pkgs.pillow;
     pypdf2 = python.pkgs.pypdf2;
     reportlab = python.pkgs.reportlab;
-};
+  };
 
 in
 
 python.pkgs.buildPythonApplication rec {
   pname = "sasview";
-  version = "4.1.2";
+  version = "unstable-2018-05-05";
 
-  buildInputs = with python.pkgs; [
+  checkInputs = with python.pkgs; [
     pytest
-    unittest-xml-reporting];
+    unittest-xml-reporting
+  ];
+
+  checkPhase = ''
+    # fix the following error:
+    # imported module 'sas.sascalc.data_util.uncertainty' has this __file__ attribute:
+    #   /build/source/build/lib.linux-x86_64-2.7/sas/sascalc/data_util/uncertainty.py
+    # which is not the same as the test file we want to collect:
+    #   /build/source/dist/tmpbuild/sasview/sas/sascalc/data_util/uncertainty.py
+    rm -r dist/tmpbuild
+
+    HOME=$(mktemp -d) py.test
+  '';
 
   propagatedBuildInputs = with python.pkgs; [
     bumps
@@ -41,20 +54,22 @@ python.pkgs.buildPythonApplication rec {
     six
     sphinx
     wxPython
-    xhtml2pdf];
+    xhtml2pdf
+  ];
 
-  src = fetchgit {
-    url = "https://github.com/SasView/sasview.git";
-    rev = "v${version}";
-    sha256 ="05la54wwzzlkhmj8vkr0bvzagyib6z6mgwqbddzjs5y1wd48vpcx";
+  src = fetchFromGitHub {
+    owner = "SasView";
+    repo = "sasview";
+    rev = "de431924d0ddf73cfb952df88bd6661181947019";
+    sha256 = "01bk0i0g65yzyq16n1a61rgjna8rrc2i51x2ndf1z7khb1fl16vg";
   };
 
-  patches = [./pyparsing-fix.patch ./local_config.patch];
+  patches = [ ./pyparsing-fix.patch ./local_config.patch ];
 
-  meta = {
+  meta = with lib; {
     homepage = https://www.sasview.org;
     description = "Fitting and data analysis for small angle scattering data";
-    maintainers = with lib.maintainers; [ rprospero ];
-    license = lib.licenses.bsd3;
+    maintainers = with maintainers; [ rprospero ];
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/applications/science/misc/sasview/local_config.patch b/pkgs/applications/science/misc/sasview/local_config.patch
index 91972a913bc..5b6c3436494 100644
--- a/pkgs/applications/science/misc/sasview/local_config.patch
+++ b/pkgs/applications/science/misc/sasview/local_config.patch
@@ -1,10 +1,22 @@
+diff --git a/src/sas/_config.py b/src/sas/_config.py
+index ece08fd4c..926768593 100644
 --- a/src/sas/_config.py
 +++ b/src/sas/_config.py
-@@ -70,2 +70,2 @@
+@@ -67,8 +67,8 @@ def load_local_config(app_dir):
+         logger.info("GuiManager loaded %s", path)
+         return module
+     except Exception as exc:
 -        logger.critical("Error loading %s: %s", path, exc)
 -        sys.exit()
 +        import sas.sasview.local_config
 +        return sas.sasview.local_config
--- 
-2.15.0
-
+ 
+ def make_custom_config_path(user_dir):
+     """
+@@ -116,4 +116,4 @@ def load_custom_config(path):
+ 
+     from sas.sasview import custom_config
+     logger.info("GuiManager custom_config defaults to sas.sasview.custom_config")
+-    return custom_config
+\ No newline at end of file
++    return custom_config
diff --git a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch b/pkgs/applications/science/misc/sasview/pyparsing-fix.patch
index 7729292cb34..c3cd164a899 100644
--- a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch
+++ b/pkgs/applications/science/misc/sasview/pyparsing-fix.patch
@@ -1,8 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 866ab7e36..78727b276 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -5,1 +5,1 @@
--    'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing<2.0.0',
+@@ -401,7 +401,7 @@ package_data['sas.sasview'] = ['images/*',
+ packages.append("sas.sasview")
+ 
+ required = [
+-    'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing>=2.0.0',
 +    'bumps>=0.7.5.9', 'periodictable>=1.5.0',
--- 
-2.15.0
-
+ 
+     # 'lxml>=2.2.2',
+     'lxml', 'h5py',
-- 
GitLab


From 6131989a7d606c5a33a9a6a91ea55ac37cf0c95f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Sun, 13 May 2018 17:28:22 +0200
Subject: [PATCH 0641/1085] ocamlPackages.bitstring: 2.1.1 -> 3.0.0 (#40034)

---
 .../ocaml-modules/bitstring/camlp4-git.patch  | 44 -------------------
 .../ocaml-modules/bitstring/default.nix       | 31 +++++++------
 .../ocaml-modules/bitstring/srcdir.patch      | 11 -----
 3 files changed, 18 insertions(+), 68 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/bitstring/camlp4-git.patch
 delete mode 100644 pkgs/development/ocaml-modules/bitstring/srcdir.patch

diff --git a/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch b/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch
deleted file mode 100644
index 24d2e362dfa..00000000000
--- a/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index d040f4c..cc1a8f5 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -40,7 +40,7 @@ pkg_extlib	= @OCAML_PKG_extlib@
- enable_coverage = @enable_coverage@
- 
- OCAMLCFLAGS	= -g
--OCAMLCPACKAGES	=
-+OCAMLCPACKAGES	= -package camlp4
- OCAMLCLIBS	= -linkpkg
- OCAMLOPTFLAGS	= $(OCAMLCFLAGS)
- OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
-@@ -110,12 +110,13 @@ bitstring_persistent.cmi: bitstring_persistent.mli
- 	  -I +camlp4 -pp camlp4of -c $<
- 
- pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma
--	$(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-+	$(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \
-+          bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
- 	  -pp camlp4of -c $< -o $@
- 
- bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
- 	$(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \
--	  $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-+	  $(OCAMLCFLAGS) $(OCAMLCLIBS) $(OCAMLCPACKAGES) \
- 	  bitstring.cma bitstring_persistent.cma \
- 	  $< -o $@
- 
-@@ -158,12 +159,13 @@ tests/test.bmpp: create_test_pattern
- 
- create_test_pattern: create_test_pattern.cmo
- 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
--	  unix.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-+	  unix.cma -I `ocamlfind query camlp4` dynlink.cma camlp4lib.cma \
- 	  $(OCAMLCLIBS) \
- 	  -I . bitstring.cma bitstring_persistent.cma $< -o $@
- 
- create_test_pattern.cmo: create_test_pattern.ml
- 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
-+	  $(OCAMLCPACKAGES) \
- 	  unix.cma -I +camlp4 \
- 	  -I . -c $< -o $@
- 
diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index b13eda071f6..13424272bcf 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -1,26 +1,31 @@
-{ stdenv, fetchurl, buildOcaml, time, autoconf, automake }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+, ppx_tools_versioned
+, ounit
+}:
 
-buildOcaml rec {
-  name = "bitstring";
-  version = "2.1.1";
-  src = fetchurl {
-    url = http://github.com/xguerin/bitstring/archive/v2.1.1.tar.gz;
-    sha256 = "0vy8ibrxccii1jbsk5q6yh1kxjigqvi7lhhcmizvd5gfhf7mfyc8";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-bitstring-${version}";
+  version = "3.0.0";
+  src = fetchFromGitHub {
+    owner = "xguerin";
+    repo = "bitstring";
+    rev = "v${version}";
+    sha256 = "0r49qax7as48jgknzaq6p9rbpmrvnmlic713wzz5bj60j5h0396f";
   };
 
-  patches = [ ./camlp4-git.patch ./srcdir.patch ];
+  buildInputs = [ ocaml findlib jbuilder ppx_tools_versioned ounit ];
 
-  buildInputs = [time autoconf automake];
-  doCheck = true;
+  buildPhase = "jbuilder build";
 
-  createFindlibDestdir = true;
-  hasSharedObjects = true;
+  doCheck = true;
+  checkPhase = "jbuilder runtest";
 
-  preConfigure = "./bootstrap";
+  inherit (jbuilder) installPhase;
 
   meta = with stdenv.lib; {
     description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml";
     homepage = https://github.com/xguerin/bitstring;
+    inherit (ocaml.meta) platforms;
     license = licenses.lgpl21Plus;
     maintainers = [ maintainers.maurer ];
   };
diff --git a/pkgs/development/ocaml-modules/bitstring/srcdir.patch b/pkgs/development/ocaml-modules/bitstring/srcdir.patch
deleted file mode 100644
index d53760f1d6f..00000000000
--- a/pkgs/development/ocaml-modules/bitstring/srcdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2015-09-01 06:32:15.111441188 +0200
-+++ b/Makefile.in	2015-09-01 06:32:56.001084480 +0200
-@@ -125,7 +125,7 @@
- 
- byteswap.h: byteswap.in.h
- 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
--	  cat $(srcdir)/byteswap.in.h; \
-+	  cat $(top_srcdir)/byteswap.in.h; \
- 	} > $@-t
- 	mv -f $@-t $@
- 
-- 
GitLab


From db5ab167dfb3225339674835cfe4c7b1db3977aa Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 13 May 2018 17:31:54 +0200
Subject: [PATCH 0642/1085] nginxModules.ipscrub: init at 99230f6

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

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 0e53b35e06d..f482c92ed9f 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -15,6 +15,15 @@
     inputs = [ pkgs.brotli ];
   };
 
+  ipscrub = {
+    src = fetchFromGitHub {
+      owner = "masonicboom";
+      repo = "ipscrub";
+      rev = "99230f66d5afe1f929cf4ed217901acb6206f620";
+      sha256 = "0mfrwkg4srql38w713pg6qxi0h4hgy8inkvgc9cm80bwlv2ng9s1";
+    } + "/ipscrub";
+  };
+
   rtmp ={
     src = fetchFromGitHub {
       owner = "arut";
-- 
GitLab


From 68573a61a932050815f64a1150c417f903a3dd59 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 12 May 2018 10:38:11 -0400
Subject: [PATCH 0643/1085] smmap2: init at 2.0.3

This commit adds smmap2, which is a separate pypi package from the existing
smmap 0.9.0, though they both come from the same repo. It also moves smmap into
the new python modules location.
---
 .../python-modules/smmap/default.nix          | 19 ++++++++++++++++++
 .../python-modules/smmap2/default.nix         | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 13 ++----------
 3 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/python-modules/smmap/default.nix
 create mode 100644 pkgs/development/python-modules/smmap2/default.nix

diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix
new file mode 100644
index 00000000000..366897d3e19
--- /dev/null
+++ b/pkgs/development/python-modules/smmap/default.nix
@@ -0,0 +1,19 @@
+{ lib, fetchPypi, buildPythonPackage, nosexcover }:
+
+buildPythonPackage rec {
+  pname = "smmap";
+  version = "0.9.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qlx25f6n2n9ff37w9gg62f217fzj16xlbh0pkz0lpxxjys64aqf";
+  };
+
+  checkInputs = [ nosexcover ];
+
+  meta = {
+    description = "A pure python implementation of a sliding window memory map manager";
+    homepage = https://github.com/gitpython-developers/smmap;
+    maintainers = [ ];
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/smmap2/default.nix b/pkgs/development/python-modules/smmap2/default.nix
new file mode 100644
index 00000000000..ea0f0859bbd
--- /dev/null
+++ b/pkgs/development/python-modules/smmap2/default.nix
@@ -0,0 +1,20 @@
+{ lib, fetchPypi, buildPythonPackage, nosexcover }:
+
+buildPythonPackage rec {
+  pname = "smmap2";
+  version = "2.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1hvn28p3zvxa98sbi9lrqvv2ps4q284j4jq9a619zw0m7yv0sly7";
+  };
+
+  checkInputs = [ nosexcover ];
+
+  meta = {
+    description = "A pure python implementation of a sliding window memory map manager";
+    homepage = https://pypi.org/project/smmap2;
+    maintainers = [ ];
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a5a24e42865..7e1ece5c77c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14241,18 +14241,9 @@ in {
 
   tqdm = callPackage ../development/python-modules/tqdm { };
 
-  smmap = buildPythonPackage rec {
-    name = "smmap-0.9.0";
-    disabled = isPyPy;  # This fails the tests if built with pypy
-    meta.maintainers = with maintainers; [ ];
-
-    buildInputs = with self; [ nosexcover ];
+  smmap = callPackage ../development/python-modules/smmap { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/smmap/${name}.tar.gz";
-      sha256 = "0qlx25f6n2n9ff37w9gg62f217fzj16xlbh0pkz0lpxxjys64aqf";
-    };
-  };
+  smmap2 = callPackage ../development/python-modules/smmap2 { };
 
   traits = buildPythonPackage rec {
     name = "traits-${version}";
-- 
GitLab


From 318ce72a050a32ba2d0f5ce1192ae7c039e9c323 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 12 May 2018 10:46:59 -0400
Subject: [PATCH 0644/1085] gitdb2: init at 2.0.3

Also move gitdb and gitdb2 to the new python module structure.
---
 .../python-modules/gitdb/default.nix          | 23 ++++++++++++++++
 .../python-modules/gitdb2/default.nix         | 23 ++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 ++-----------------
 3 files changed, 48 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/gitdb/default.nix
 create mode 100644 pkgs/development/python-modules/gitdb2/default.nix

diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix
new file mode 100644
index 00000000000..ceca6e3719b
--- /dev/null
+++ b/pkgs/development/python-modules/gitdb/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, smmap }:
+
+buildPythonPackage rec {
+  pname = "gitdb";
+  version = "0.6.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0n4n2c7rxph9vs2l6xlafyda5x1mdr8xy16r9s3jwnh3pqkvrsx3";
+  };
+
+  propagatedBuildInputs = [ smmap ];
+
+  # Bunch of tests fail because they need an actual git repo
+  doCheck = false;
+
+  meta = {
+    description = "Git Object Database";
+    maintainers = [ ];
+    homepage = https://github.com/gitpython-developers/gitdb;
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/gitdb2/default.nix b/pkgs/development/python-modules/gitdb2/default.nix
new file mode 100644
index 00000000000..1ebbd3de785
--- /dev/null
+++ b/pkgs/development/python-modules/gitdb2/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, smmap2 }:
+
+buildPythonPackage rec {
+  pname = "gitdb2";
+  version = "2.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02azg62mr99b7cllyjrly77np3vw32y8nrxpa2xjapiyaga2j3mn";
+  };
+
+  propagatedBuildInputs = [ smmap2 ];
+
+  # Bunch of tests fail because they need an actual git repo
+  doCheck = false;
+
+  meta = {
+    description = "Git Object Database";
+    maintainers = [ ];
+    homepage = https://github.com/gitpython-developers/gitdb;
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7e1ece5c77c..f20b6d2f247 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2820,31 +2820,9 @@ in {
 
   gpy = callPackage ../development/python-modules/gpy { };
 
-  gitdb = buildPythonPackage rec {
-    name = "gitdb-0.6.4";
+  gitdb = callPackage ../development/python-modules/gitdb { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/gitdb/${name}.tar.gz";
-      sha256 = "0n4n2c7rxph9vs2l6xlafyda5x1mdr8xy16r9s3jwnh3pqkvrsx3";
-    };
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [ smmap ];
-
-    checkPhase = ''
-      nosetests
-    '';
-
-    doCheck = false; # Bunch of tests fail because they need an actual git repo
-
-    meta = {
-      description = "Git Object Database";
-      maintainers = with maintainers; [ ];
-      homepage = https://github.com/gitpython-developers/gitdb;
-      license = licenses.bsd3;
-    };
-
-  };
+  gitdb2 = callPackage ../development/python-modules/gitdb2 { };
 
   GitPython = buildPythonPackage rec {
     version = "2.0.8";
-- 
GitLab


From 5efce7c43d269c7e95a17c289ce6ca146341cfcf Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 12 May 2018 10:52:04 -0400
Subject: [PATCH 0645/1085] GitPython: 2.0.8 -> 2.1.9

Also moves GitPython into the newer python module folder structure.
---
 .../python-modules/GitPython/default.nix      | 24 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +------------------
 2 files changed, 25 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/GitPython/default.nix

diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix
new file mode 100644
index 00000000000..c2f3706923a
--- /dev/null
+++ b/pkgs/development/python-modules/GitPython/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, gitdb2, mock, nose, ddt }:
+
+buildPythonPackage rec {
+  version = "2.1.9";
+  pname = "GitPython";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0a9in1jfv9ssxhckl6sasw45bhm762y2r5ikgb2pk2g8yqdc6z64";
+  };
+
+  checkInputs = [ mock nose ddt ];
+  propagatedBuildInputs = [ gitdb2 ];
+
+  # Tests require a git repo
+  doCheck = false;
+
+  meta = {
+    description = "Python Git Library";
+    maintainers = [ ];
+    homepage = https://github.com/gitpython-developers/GitPython;
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f20b6d2f247..c3435520877 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2824,30 +2824,7 @@ in {
 
   gitdb2 = callPackage ../development/python-modules/gitdb2 { };
 
-  GitPython = buildPythonPackage rec {
-    version = "2.0.8";
-    name = "GitPython-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/G/GitPython/GitPython-${version}.tar.gz";
-      sha256 = "7c03d1130f903aafba6ae5b89ccf8eb433a995cd3120cbb781370e53fc4eb222";
-    };
-
-    buildInputs = with self; [ mock nose ];
-    propagatedBuildInputs = with self; [ gitdb ];
-
-    # All tests error with
-    # InvalidGitRepositoryError: /tmp/nix-build-python2.7-GitPython-1.0.1.drv-0/GitPython-1.0.1
-    # Maybe due to being in a chroot?
-    doCheck = false;
-
-    meta = {
-      description = "Python Git Library";
-      maintainers = with maintainers; [ ];
-      homepage = https://github.com/gitpython-developers/GitPython;
-      license = licenses.bsd3;
-    };
-  };
+  GitPython = callPackage ../development/python-modules/GitPython { };
 
   git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter {
     inherit (pkgs.gitAndTools) git-annex;
-- 
GitLab


From 0fcad047b9563f5b5ec4442d5337d8fc5f802397 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Feb 2018 20:36:43 -0500
Subject: [PATCH 0646/1085] Guile: Fix cross-compilation

(cherry picked from commit f79fa7794176c11530a3be3f05ffbc10f1e53003)
---
 pkgs/development/interpreters/guile/2.0.nix     | 10 +++++-----
 pkgs/development/interpreters/guile/default.nix | 10 +++++-----
 pkgs/development/interpreters/guile/riscv.patch | 13 +++++++++++++
 3 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/interpreters/guile/riscv.patch

diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 5746300fca0..ea8ff924064 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
 , libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
-, hostPlatform
+, hostPlatform, buildPackages
 }:
 
 # Do either a coverage analysis build or a standard build.
@@ -19,7 +19,9 @@
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ] ++
+    stdenv.lib.optional stdenv.isCross buildPackages.buildPackages.guile_2_0;
   buildInputs = [ readline libtool libunistring libffi ];
   propagatedBuildInputs = [ gmp boehmgc ]
 
@@ -29,9 +31,6 @@
     # see below.
     ++ [ libtool libunistring ];
 
-  # A native Guile 2.0 is needed to cross-build Guile.
-  selfNativeBuildInput = true;
-
   enableParallelBuilding = true;
 
   patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch
@@ -40,6 +39,7 @@
       url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
       sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
     })
+    ./riscv.patch
   ] ++
     (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
 
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index e10c5fbb568..fc7cd2b60ea 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
 , libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
-, hostPlatform
+, hostPlatform, buildPackages
 }:
 
 # Do either a coverage analysis build or a standard build.
@@ -20,7 +20,9 @@
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ] ++
+    stdenv.lib.optional stdenv.isCross buildPackages.buildPackages.guile;
   buildInputs = [ readline libtool libunistring libffi ];
 
   propagatedBuildInputs = [ gmp boehmgc ]
@@ -30,13 +32,11 @@
     # see below.
     ++ [ libtool libunistring ];
 
-  # A native Guile 2.0 is needed to cross-build Guile.
-  selfNativeBuildInput = true;
-
   enableParallelBuilding = true;
 
   patches = [
     ./eai_system.patch
+    ./riscv.patch
   ] ++
     (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
 
diff --git a/pkgs/development/interpreters/guile/riscv.patch b/pkgs/development/interpreters/guile/riscv.patch
new file mode 100644
index 00000000000..b835e161383
--- /dev/null
+++ b/pkgs/development/interpreters/guile/riscv.patch
@@ -0,0 +1,13 @@
+diff --git a/module/system/base/target.scm b/module/system/base/target.scm
+index 95ab8d8c9..93616f4a3 100644
+--- a/module/system/base/target.scm
++++ b/module/system/base/target.scm
+@@ -86,6 +86,8 @@
+              (endianness big))
+             ((string=? "aarch64" cpu)
+              (endianness little))
++            ((string-match "riscv[1-9][0-9]*" cpu)
++             (endianness little))
+             (else
+              (error "unknown CPU endianness" cpu)))))
+ 
-- 
GitLab


From 8415682658752910f9142165d483f861aa8d99be Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 5 Mar 2018 18:45:16 -0500
Subject: [PATCH 0647/1085] guile: Fix cross more, including 1.8

(cherry picked from commit 76bc1d3fae46f28dd28cad8bc998dba74d03285e)
---
 pkgs/development/interpreters/guile/1.8.nix   | 37 +++++++++++--------
 pkgs/development/interpreters/guile/2.0.nix   | 17 +++++----
 .../interpreters/guile/default.nix            | 15 +++++---
 3 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index c50a5fbab07..6a2fdbdea43 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -1,25 +1,33 @@
-{ fetchurl, stdenv, libtool, readline, gmp
-, gawk, makeWrapper }:
+{ stdenv, buildPackages
+, buildPlatform, hostPlatform
+, fetchurl, makeWrapper, gawk, pkgconfig
+, libtool, readline, gmp
+}:
 
 stdenv.mkDerivation rec {
   name = "guile-1.8.8";
 
   src = fetchurl {
-    url = "mirror://gnu/guile/" + name + ".tar.gz";
+    url = "mirror://gnu/guile/${name}.tar.gz";
     sha256 = "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3";
   };
 
-  patches = [ ./cpp-4.5.patch ];
-
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
   # GCC 4.6 raises a number of set-but-unused warnings.
   configureFlags = [ "--disable-error-on-warning" ];
 
-  nativeBuildInputs = [ makeWrapper gawk ];
-  propagatedBuildInputs = [ readline gmp libtool ];
-  selfNativeBuildInput = true;
+  depsBuildBuild = [ buildPackages.stdenv.cc ]
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform)
+                           buildPackages.buildPackages.guile_1_8;
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  buildInputs = [ readline libtool ];
+
+  propagatedBuildInputs = [ gmp ];
+
+  patches = [ ./cpp-4.5.patch ];
+
 
   postInstall = ''
     wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
@@ -46,17 +54,16 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   meta = {
-    description = "GNU Guile, an embeddable Scheme interpreter";
+    description = "Embeddable Scheme implementation";
+    homepage    = http://www.gnu.org/software/guile/;
+    license     = stdenv.lib.licenses.lgpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms   = stdenv.lib.platforms.unix;
+
     longDescription = ''
       GNU Guile is an interpreter for the Scheme programming language,
       packaged as a library that can be embedded into programs to make
       them extensible.  It supports many SRFIs.
     '';
-
-    homepage = http://www.gnu.org/software/guile/;
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index ea8ff924064..afd90397e23 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -1,6 +1,8 @@
-{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
-, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
-, hostPlatform, buildPackages
+{ stdenv, buildPackages
+, buildPlatform, hostPlatform
+, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig
+, libffi, libtool, readline, gmp, boehmgc, libunistring
+, coverageAnalysis ? null, gnu ? null
 }:
 
 # Do either a coverage analysis build or a standard build.
@@ -19,12 +21,13 @@
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ] ++
-    stdenv.lib.optional stdenv.isCross buildPackages.buildPackages.guile_2_0;
+  depsBuildBuild = [ buildPackages.stdenv.cc ]
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform)
+                           buildPackages.buildPackages.guile_2_0;
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool libunistring libffi ];
-  propagatedBuildInputs = [ gmp boehmgc ]
 
+  propagatedBuildInputs = [ gmp boehmgc ]
     # XXX: These ones aren't normally needed here, but since
     # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
     # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index fc7cd2b60ea..dc6e18ae1af 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,6 +1,8 @@
-{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
-, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
-, hostPlatform, buildPackages
+{ stdenv, buildPackages
+, buildPlatform, hostPlatform
+, fetchurl, makeWrapper, gawk, pkgconfig
+, libffi, libtool, readline, gmp, boehmgc, libunistring
+, coverageAnalysis ? null, gnu ? null
 }:
 
 # Do either a coverage analysis build or a standard build.
@@ -20,9 +22,10 @@
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ] ++
-    stdenv.lib.optional stdenv.isCross buildPackages.buildPackages.guile;
+  depsBuildBuild = [ buildPackages.stdenv.cc ]
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform)
+                           buildPackages.buildPackages.guile;
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool libunistring libffi ];
 
   propagatedBuildInputs = [ gmp boehmgc ]
-- 
GitLab


From 9a4cc93522aeee59fafe01bcba65d1675675f9d6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 21 Mar 2018 14:20:04 -0400
Subject: [PATCH 0648/1085] guile-1.8: Fix and clean up `libtool` propagation
 fixes

Fixes #37548

(cherry picked from commit 2119041dbf4323ff3e92e605b70b75fc2c252741)
---
 pkgs/development/interpreters/guile/1.8.nix | 34 +++++++++++++++------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index 6a2fdbdea43..cf42c9a7b68 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -24,18 +24,18 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool ];
 
-  propagatedBuildInputs = [ gmp ];
-
-  patches = [ ./cpp-4.5.patch ];
+  propagatedBuildInputs = [
+    gmp
 
+    # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l'
+    # flags for them without corresponding '-L' flags. Adding them here will add
+    # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
+    # see below.
+    libtool
+  ];
 
-  postInstall = ''
-    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
-  '';
 
-  preBuild = ''
-    sed -e '/lt_dlinit/a  lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
-  '';
+  patches = [ ./cpp-4.5.patch ];
 
   # Guile needs patching to preset results for the configure tests
   # about pthreads, which work only in native builds.
@@ -45,6 +45,22 @@ stdenv.mkDerivation rec {
     fi
   '';
 
+  preBuild = ''
+    sed -e '/lt_dlinit/a  lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
+  '';
+
+
+  postInstall = ''
+    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
+  ''
+    # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
+    # why `--with-libunistring-prefix' and similar options coming from
+    # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+  + ''
+    sed -i "$out/lib/pkgconfig/guile"-*.pc    \
+        -e "s|-lltdl|-L${libtool.lib}/lib -lltdl|g"
+  '';
+
   # One test fails.
   # ERROR: file: "libtest-asmobs", message: "file not found"
   # This is fixed here:
-- 
GitLab


From d77dab3ecc3b7db3724368966ce791c378739a90 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 21 Mar 2018 14:20:04 -0400
Subject: [PATCH 0649/1085] guile: Fix and clean up `libtool` propagation fixes

Fixes #37548

(cherry picked from commit 72984210ab06dc3a56a1c2b666f3528ec5dcaadf)
---
 pkgs/development/interpreters/guile/2.0.nix     | 16 ++++++++++------
 pkgs/development/interpreters/guile/default.nix | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index afd90397e23..2c9aec5b695 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -27,12 +27,15 @@
   nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool libunistring libffi ];
 
-  propagatedBuildInputs = [ gmp boehmgc ]
-    # XXX: These ones aren't normally needed here, but since
-    # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
+  propagatedBuildInputs = [
+    gmp boehmgc
+
+    # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l'
+    # flags for them without corresponding '-L' flags. Adding them here will add
     # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
     # see below.
-    ++ [ libtool libunistring ];
+    libtool libunistring
+  ];
 
   enableParallelBuilding = true;
 
@@ -70,11 +73,12 @@
 
   postInstall = ''
     wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
-
+  ''
     # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
     # why `--with-libunistring-prefix' and similar options coming from
     # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
-    sed -i "$out/lib/pkgconfig/guile-2.0.pc"    \
+  + ''
+    sed -i "$out/lib/pkgconfig/guile"-*.pc    \
         -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
             s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
             s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index dc6e18ae1af..3d5c51dc420 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -28,12 +28,15 @@
   nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool libunistring libffi ];
 
-  propagatedBuildInputs = [ gmp boehmgc ]
-    # XXX: These ones aren't normally needed here, but since
-    # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
+  propagatedBuildInputs = [
+    gmp boehmgc
+
+    # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l'
+    # flags for them without corresponding '-L' flags. Adding them here will add
     # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
     # see below.
-    ++ [ libtool libunistring ];
+    libtool libunistring
+  ];
 
   enableParallelBuilding = true;
 
@@ -66,11 +69,12 @@
 
   postInstall = ''
     wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
-
+  ''
     # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
     # why `--with-libunistring-prefix' and similar options coming from
     # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
-    sed -i "$out/lib/pkgconfig/guile-2.2.pc"    \
+  + ''
+    sed -i "$out/lib/pkgconfig/guile"-*.pc    \
         -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
             s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
             s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
-- 
GitLab


From 130a0cbde6feae6b51f35a007c78cc8a25a6c3c9 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 12:16:29 -0400
Subject: [PATCH 0650/1085] guile: Remove old crossAttrs

We fixed the linker issue with propagated dependencies.

(cherry picked from commit 515ca1a7c8ca1c57b472826ae2b5dd2965b8b4bf)
---
 pkgs/development/interpreters/guile/2.0.nix     | 9 ---------
 pkgs/development/interpreters/guile/default.nix | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 2c9aec5b695..3a11dc78c6c 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -92,15 +92,6 @@
 
   setupHook = ./setup-hook-2.0.sh;
 
-  crossAttrs.preConfigure =
-    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
-       # passed.  So it needs some help (XXX).
-       "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib";
-
-
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = http://www.gnu.org/software/guile/;
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 3d5c51dc420..748b3c5e200 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -88,15 +88,6 @@
 
   setupHook = ./setup-hook-2.2.sh;
 
-  crossAttrs.preConfigure =
-    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
-       # passed.  So it needs some help (XXX).
-       "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib";
-
-
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = http://www.gnu.org/software/guile/;
-- 
GitLab


From 3fc1694e8ae7fe148288e9e0a0f3e47008fdd580 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 12 May 2018 10:59:54 -0400
Subject: [PATCH 0651/1085] truffleHog: init at 2.0.91

This commit adds the python3 application truffleHog, which is a stand-alone tool
that scans a git repo for unencrypted passwords.

This depends on a newer GitPython, which depends on a new major version of
gitdb, which depends on a new major version of smmap, so I've packaged those
as well in the preceding commits.
---
 pkgs/tools/security/trufflehog/default.nix | 38 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/security/trufflehog/default.nix

diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
new file mode 100644
index 00000000000..f805670a5d5
--- /dev/null
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -0,0 +1,38 @@
+{ lib, pythonPackages }:
+
+let
+  truffleHogRegexes = pythonPackages.buildPythonPackage rec {
+    pname = "truffleHogRegexes";
+    version = "0.0.4";
+    src = pythonPackages.fetchPypi {
+      inherit pname version;
+      sha256 = "09vrscbb4h4w01gmamlzghxx6cvrqdscylrbdcnbjsd05xl7zh4z";
+    };
+  };
+in
+  pythonPackages.buildPythonApplication rec {
+    pname = "truffleHog";
+    version = "2.0.91";
+
+    src = pythonPackages.fetchPypi {
+      inherit pname version;
+      sha256 = "0r4c9ihy6wjh5cwli7lb6cr2yfvxrh7r6cgznql1src5gzlnkymx";
+    };
+
+    # Relax overly restricted version constraint
+    postPatch = ''
+      substituteInPlace setup.py --replace "GitPython ==" "GitPython >= "
+    '';
+
+    propagatedBuildInputs = [ pythonPackages.GitPython truffleHogRegexes ];
+
+    # Test cases run git clone and require network access
+    doCheck = false;
+
+    meta = {
+      homepage = https://github.com/dxa4481/truffleHog;
+      description = "Searches through git repositories for high entropy strings and secrets, digging deep into commit history";
+      license = with lib.licenses; [ gpl2 ];
+      maintainers = with lib.maintainers; [ bhipple ];
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 774f2becdd4..90f9edcd9f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21119,6 +21119,8 @@ with pkgs;
 
   tup = callPackage ../development/tools/build-managers/tup { };
 
+  trufflehog = callPackage ../tools/security/trufflehog { };
+
   tvheadend = callPackage ../servers/tvheadend { };
 
   ums = callPackage ../servers/ums { };
-- 
GitLab


From 468c09edc6d3e4c9f0ee84636cf0e795792d3e71 Mon Sep 17 00:00:00 2001
From: florianjacob <accounts+github@florianjacob.de>
Date: Sun, 13 May 2018 17:48:41 +0200
Subject: [PATCH 0652/1085] matomo: 3.4.0 -> 3.5.0 (#40439)

---
 pkgs/servers/web-apps/matomo/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index c8a918c2bd2..27cf873e790 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "matomo-${version}";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchurl {
     # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
     # url = "https://builds.matomo.org/${name}.tar.gz";
     url = "https://builds.matomo.org/piwik-${version}.tar.gz";
-    sha256 = "1hnja8mvjvlbqgw7maa76lxd5hxxg7d5ggq9wyrff25mapj398wc";
+    sha256 = "1l656b194h7z3k52ywl7sfa2h6sxa5gf22wcfrp0pp07v9p6pc5f";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   #   unix socket authentication only works with localhost,
   #   but password-based SQL authentication works with both.
   # TODO: is upstream interested in this?
+  # -> discussion at https://github.com/matomo-org/matomo/issues/12646
   patches = [ ./make-localhost-default-database-host.patch ];
 
   # this bootstrap.php adds support for getting PIWIK_USER_PATH
-- 
GitLab


From 960c657074b80d6bd7b216bf8b6f988b0ee3d6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 13 May 2018 18:30:58 +0200
Subject: [PATCH 0653/1085] home-assistant: 0.69.0 -> 0.69.1

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

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c530301bbc9..8d6c6cfaeaf 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.69.0";
+  version = "0.69.1";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index ab5125c035f..60b005ed54c 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -74,7 +74,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.69.0";
+  hassVersion = "0.69.1";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -89,7 +89,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "05hagifi1338law2mwwik2gjjw1ckjdjh0lg9l8ldsz999dkc2zz";
+    sha256 = "1y74zq1nah9k6rif8k384ri11h1f23ggr613f7qnn0107b23asr4";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 5550015b200a0a4df003f087f5fd0b233123998f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <eisfreak7@gmail.com>
Date: Sun, 13 May 2018 18:33:51 +0200
Subject: [PATCH 0654/1085] giac: remove liblapackWithAtlas dependency (#40430)

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

diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index dd92e264889..f6e1deb8606 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, texlive, bison, flex
-, gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas
+, gmp, mpfr, pari, ntl, gsl, blas, mpfi
 , readline, gettext, libpng, libao, gfortran, perl
 , enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
 }:
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   # perl is only needed for patchShebangs fixup.
   buildInputs = [
-    gmp mpfr pari ntl gsl blas mpfi liblapackWithAtlas
+    gmp mpfr pari ntl gsl blas mpfi
     readline gettext libpng libao perl
     # gfortran.cc default output contains static libraries compiled without -fPIC
     # we want libgfortran.so.3 instead
-- 
GitLab


From 03318efe0937a8070ae9b02051cd04aca3770017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 11 May 2018 17:00:48 +0200
Subject: [PATCH 0655/1085] libb2: 0.97 -> 0.98

---
 pkgs/development/libraries/libb2/default.nix | 23 ++++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
index eae08f0071c..5ba2f9a0b97 100644
--- a/pkgs/development/libraries/libb2/default.nix
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -1,17 +1,26 @@
-{stdenv, fetchurl}:
-with stdenv; with lib;
-mkDerivation rec {
-  name = "libb2-${meta.version}";
+{ stdenv, fetchurl, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "libb2-${version}";
+  version = "0.98";
 
   src = fetchurl {
     url = "https://blake2.net/${name}.tar.gz";
-    sha256 = "7829c7309347650239c76af7f15d9391af2587b38f0a65c250104a2efef99051";
+    sha256 = "1852gh8wwnsghdb9zhxdhw0173plpqzk684npxbl4bzk1hhzisal";
   };
 
+  preConfigure = ''
+    patchShebangs autogen.sh
+    ./autogen.sh
+  '';
+
   configureFlags = [ "--enable-fat=yes" ];
 
-  meta = {
-    version = "0.97";
+  nativeBuildInputs = [ autoconf automake libtool ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
     description = "The BLAKE2 family of cryptographic hash functions";
     platforms = platforms.all;
     maintainers = with maintainers; [ dfoxfranke ];
-- 
GitLab


From 409b97c95f80537a94d6183131b20d82e669a8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 11 May 2018 17:14:31 +0200
Subject: [PATCH 0656/1085] libb2: fix build on ARM

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

diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
index 5ba2f9a0b97..58961a18df1 100644
--- a/pkgs/development/libraries/libb2/default.nix
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool }:
+{ stdenv, hostPlatform, fetchurl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   name = "libb2-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  configureFlags = [ "--enable-fat=yes" ];
+  configureFlags = stdenv.lib.optional hostPlatform.isx86 "--enable-fat=yes";
 
   nativeBuildInputs = [ autoconf automake libtool ];
 
-- 
GitLab


From 66d204188b21e3156907e66165c2898076145bd2 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sun, 13 May 2018 19:58:10 +0200
Subject: [PATCH 0657/1085] virtmanager: add missing virt-install runtime deps
 (#40380)

virt-install calls some programs from initrdinject.py
that were missing on PATH
---
 pkgs/applications/virtualization/virt-manager/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index d0e27055887..c7d86ad9fd6 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -3,6 +3,7 @@
 , gobjectIntrospection, libvirt-glib, system-libvirt
 , gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3
 , spiceSupport ? true, spice-gtk ? null
+, cpio, e2fsprogs, findutils, gzip
 }:
 
 with stdenv.lib;
@@ -47,6 +48,8 @@ python2Packages.buildPythonApplication rec {
 
   preFixup = ''
     gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH")
+    # these are called from virt-install in initrdinject.py
+    gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}")
   '';
 
   # Failed tests
-- 
GitLab


From 642bed4b3e0d1b0a8f8d9bfea8d5c99cf7941c2f Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sun, 13 May 2018 19:59:59 +0200
Subject: [PATCH 0658/1085] nixos/tests/acme: fix on i686, improve timing
 (#40410)

... to prevent non-deterministic failures
---
 nixos/tests/acme.nix               | 4 +++-
 nixos/tests/common/letsencrypt.nix | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
index d7452744e17..21b0fedcfef 100644
--- a/nixos/tests/acme.nix
+++ b/nixos/tests/acme.nix
@@ -54,9 +54,11 @@ in import ./make-test.nix {
   };
 
   testScript = ''
+    $letsencrypt->waitForUnit("default.target");
     $letsencrypt->waitForUnit("boulder.service");
-    startAll;
+    $webserver->waitForUnit("default.target");
     $webserver->waitForUnit("acme-certificates.target");
+    $client->waitForUnit("default.target");
     $client->succeed('curl https://example.com/ | grep -qF "hello world"');
   '';
 }
diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix
index 10cde45d18a..7c6b3b29e36 100644
--- a/nixos/tests/common/letsencrypt.nix
+++ b/nixos/tests/common/letsencrypt.nix
@@ -386,6 +386,10 @@ in {
 
     services.nginx.enable = true;
     services.nginx.recommendedProxySettings = true;
+    # This fixes the test on i686
+    services.nginx.commonHttpConfig = ''
+      server_names_hash_bucket_size 64;
+    '';
     services.nginx.virtualHosts.${wfeDomain} = {
       onlySSL = true;
       enableACME = false;
-- 
GitLab


From d2f7acf30c6dc1fe3a742f4035b11fe57514952b Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 4 May 2018 18:00:50 -0400
Subject: [PATCH 0659/1085] pytorch: 0.3.1 -> 0.4.0

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../python-modules/pytorch/default.nix        | 35 +++++--------------
 pkgs/top-level/python-packages.nix            | 14 +++++++-
 2 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index c8376196d3a..b0ac4e07093 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,7 +1,7 @@
-{ buildPythonPackage,
+{ buildPythonPackage, pythonOlder,
   cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
-  fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, cmake,
-  git, stdenv, linkFarm, symlinkJoin,
+  fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, typing, cmake,
+  stdenv, linkFarm, symlinkJoin,
   utillinux, which }:
 
 assert cudnn == null || cudatoolkit != null;
@@ -25,7 +25,7 @@ let
     "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ";
 
 in buildPythonPackage rec {
-  version = "0.3.1";
+  version = "0.4.0";
   pname = "pytorch";
   name = "${pname}-${version}";
 
@@ -34,36 +34,17 @@ in buildPythonPackage rec {
     repo   = "pytorch";
     rev    = "v${version}";
     fetchSubmodules = true;
-    sha256 = "1k8fr97v5pf7rni5cr2pi21ixc3pdj3h3lkz28njbjbgkndh7mr3";
+    sha256 = "12d5vqqaprk0igmih7fwa65ldmaawgijxl58h6dnw660wysc132j";
   };
 
-  patches = [
-    (fetchpatch {
-      # make sure stdatomic.h is included when checking for ATOMIC_INT_LOCK_FREE
-      # Fixes this test failure:
-      # RuntimeError: refcounted file mapping not supported on your system at /tmp/nix-build-python3.6-pytorch-0.3.0.drv-0/source/torch/lib/TH/THAllocator.c:525
-      url = "https://github.com/pytorch/pytorch/commit/502aaf39cf4a878f9e4f849e5f409573aa598aa9.patch";
-      stripLen = 3;
-      extraPrefix = "torch/lib/";
-      sha256 = "1miz4lhy3razjwcmhxqa4xmlcmhm65lqyin1czqczj8g16d3f62f";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace test/run_test.sh --replace \
-      "INIT_METHOD='file://'\$TEMP_DIR'/shared_init_file' \$PYCMD ./test_distributed.py" \
-      "echo Skipped for Nix package"
-  '';
-
   preConfigure = lib.optionalString cudaSupport ''
-    export CC=${cudatoolkit.cc}/bin/gcc
+    export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
   '' + lib.optionalString (cudaSupport && cudnn != null) ''
     export CUDNN_INCLUDE_DIR=${cudnn}/include
   '';
 
   buildInputs = [
      cmake
-     git
      numpy.blas
      utillinux
      which
@@ -73,10 +54,10 @@ in buildPythonPackage rec {
     cffi
     numpy
     pyyaml
-  ];
+  ] ++ lib.optional (pythonOlder "3.5") typing;
 
   checkPhase = ''
-    ${cudaStubEnv}${stdenv.shell} test/run_test.sh
+    ${cudaStubEnv}python test/run_test.py --exclude distributed
   '';
 
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7868f7d7ff0..95b7f8a5718 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5623,8 +5623,20 @@ in {
     };
   };
 
-  pytorch = callPackage ../development/python-modules/pytorch {
+  pytorch = let
+    # Fails with CUDA 9.1 and GCC 6.4:
+    # https://github.com/pytorch/pytorch/issues/5831
+    # https://devtalk.nvidia.com/default/topic/1028112
+    # We should be able to remove this when CUDA 9.2 is released.
+    cudatoolkit9 = pkgs.cudatoolkit9.override {
+      gcc6 = pkgs.gcc5;
+    };
+  in callPackage ../development/python-modules/pytorch {
     cudaSupport = pkgs.config.cudaSupport or false;
+    cudatoolkit = cudatoolkit9;
+    cudnn = pkgs.cudnn_cudatoolkit9.override {
+      inherit cudatoolkit9;
+    };
   };
 
   pytorchWithCuda = self.pytorch.override {
-- 
GitLab


From 3b6486f8572512d7d13debba9049fb745afd0e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 May 2018 21:17:53 +0200
Subject: [PATCH 0660/1085] xorg.xorgserver: drop makeWrapper

It's been unused since 65da25997db.
---
 pkgs/servers/x11/xorg/overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 23aae113483..0da75f941f0 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -492,7 +492,7 @@ in
       if (!isDarwin)
       then {
         outputs = [ "out" "dev" ];
-        buildInputs = commonBuildInputs ++ [ makeWrapper args.libdrm args.mesa_noglu ];
+        buildInputs = commonBuildInputs ++ [ args.libdrm args.mesa_noglu ];
         propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
           args.udev
         ];
-- 
GitLab


From 836be60200badf15f31b4719f7ca527c2de550d0 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 13 May 2018 21:30:50 +0200
Subject: [PATCH 0661/1085] beets: install zsh completion

---
 pkgs/tools/audio/beets/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index b8f3318057b..b53a9b7eb0f 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -174,6 +174,11 @@ in pythonPackages.buildPythonApplication rec {
       test/test_replaygain.py
   '';
 
+  postInstall = ''
+    mkdir -p $out/share/zsh/site-functions
+    cp extra/_beet $out/share/zsh/site-functions/
+  '';
+
   doCheck = true;
 
   preCheck = ''
@@ -222,7 +227,7 @@ in pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "Music tagger and library organizer";
-    homepage = http://beets.radbox.org;
+    homepage = http://beets.io;
     license = licenses.mit;
     maintainers = with maintainers; [ aszlig domenkozar pjones ];
     platforms = platforms.linux;
-- 
GitLab


From d29202bc48be6069e3d7ddc7b7760aac8c0c19b7 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 23 Feb 2018 17:50:24 -0500
Subject: [PATCH 0662/1085] uboot: 2017.11 -> 2018.03, cross fixes

(cherry picked from commit 5804547243010ec8e341e98e8acbc5c96263682e)
(cherry picked from commit 7c46833b047710f220971d7d7d3b1dbe6fed805b)
---
 pkgs/misc/uboot/default.nix | 77 ++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 1bfcea1057e..9e07c22fe2a 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2
-, hostPlatform
+{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig
+, hostPlatform, buildPackages
 }:
 
 let
-  buildUBoot = { targetPlatforms
-            , filesToInstall
+  buildUBoot = { filesToInstall
             , installDir ? "$out"
             , defconfig
             , extraMakeFlags ? []
@@ -13,18 +12,14 @@ let
            stdenv.mkDerivation (rec {
 
     name = "uboot-${defconfig}-${version}";
-    version = "2017.11";
+    version = "2018.03";
 
     src = fetchurl {
       url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-      sha256 = "01bcsah5imy6m3fbjwhqywxg0pfk5fl8ks9ylb7kv3zmrb9qy0ba";
+      sha256 = "1z9x635l5164c5hnf7qs19w7j3qghbkgs7rpn673dm898i9pfx3y";
     };
 
     patches = [
-      (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/cbsize-2017-11.patch;
-        sha256 = "08rqsrj78aif8vaxlpwiwwv1jwf0diihbj0h88hc0mlp0kmyqxwm";
-      })
       (fetchpatch {
         url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch1.patch;
         sha256 = "067yq55vv1slv4xy346px7h329pi14abdn04chg6s1s6hmf6c1x9";
@@ -34,8 +29,8 @@ let
         sha256 = "0bbw0q027xvzvdxxvpzjajg4rm30a8mb7z74b6ma9q0l7y7bi0c4";
       })
       (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/pythonpath-2017-11.patch;
-        sha256 = "162b2lglp307pzxsf9m7nnmzwxqd7xkwp5j85bm6bg1a38ngpl9v";
+        url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch;
+        sha256 = "1rhhlhrwhv7ic1n5i720jfh2cxwrkssrkvinllyjy3j9k9bpzcqd";
       })
     ];
 
@@ -43,14 +38,22 @@ let
       patchShebangs tools
     '';
 
-    nativeBuildInputs = [ bc dtc openssl python2 ];
+    nativeBuildInputs = [ bc dtc openssl python2 swig ];
+    depsBuildBuild = [ buildPackages.stdenv.cc ];
 
     hardeningDisable = [ "all" ];
 
-    makeFlags = [ "DTC=dtc" ] ++ extraMakeFlags;
+    makeFlags = [
+      "DTC=dtc"
+      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+    ] ++ extraMakeFlags;
 
     configurePhase = ''
+      runHook preConfigure
+
       make ${defconfig}
+
+      runHook postConfigure
     '';
 
     installPhase = ''
@@ -65,21 +68,13 @@ let
     enableParallelBuilding = true;
     dontStrip = true;
 
-    crossAttrs = {
-      makeFlags = [
-        "ARCH=${hostPlatform.platform.kernelArch}"
-        "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-      ];
-    };
-
     meta = with stdenv.lib; {
       homepage = http://www.denx.de/wiki/U-Boot/;
       description = "Boot loader for embedded systems";
       license = licenses.gpl2;
       maintainers = [ maintainers.dezgeg ];
-      platforms = targetPlatforms;
     } // extraMeta;
-  } // args);
+  } // removeAttrs args [ "extraMeta" ]);
 
 in rec {
   inherit buildUBoot;
@@ -88,10 +83,14 @@ in rec {
     defconfig = "allnoconfig";
     installDir = "$out/bin";
     buildFlags = "tools NO_SDL=1";
+    hardeningDisable = [];
     dontStrip = false;
-    targetPlatforms = stdenv.lib.platforms.linux;
+    extraMeta.platforms = stdenv.lib.platforms.linux;
     # build tools/kwboot
     extraMakeFlags = [ "CONFIG_KIRKWOOD=y" ];
+    postConfigure = ''
+      sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config
+    '';
     filesToInstall = [
       "tools/dumpimage"
       "tools/fdtgrep"
@@ -103,86 +102,86 @@ in rec {
 
   ubootA20OlinuxinoLime = buildUBoot rec {
     defconfig = "A20-OLinuXino-Lime_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootBananaPi = buildUBoot rec {
     defconfig = "Bananapi_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootBeagleboneBlack = buildUBoot rec {
     defconfig = "am335x_boneblack_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["MLO" "u-boot.img"];
   };
 
   # http://git.denx.de/?p=u-boot.git;a=blob;f=board/solidrun/clearfog/README;hb=refs/heads/master
   ubootClearfog = buildUBoot rec {
     defconfig = "clearfog_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-spl.kwb"];
   };
 
   ubootJetsonTK1 = buildUBoot rec {
     defconfig = "jetson-tk1_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
   };
 
   ubootOdroidXU3 = buildUBoot rec {
     defconfig = "odroid-xu3_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-dtb.bin"];
   };
 
   ubootOrangePiPc = buildUBoot rec {
     defconfig = "orangepi_pc_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootPcduino3Nano = buildUBoot rec {
     defconfig = "Linksprite_pcDuino3_Nano_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootQemuArm = buildUBoot rec {
     defconfig = "qemu_arm_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi = buildUBoot rec {
     defconfig = "rpi_defconfig";
-    targetPlatforms = ["armv6l-linux"];
+    extraMeta.platforms = ["armv6l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi2 = buildUBoot rec {
     defconfig = "rpi_2_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi3_32bit = buildUBoot rec {
     defconfig = "rpi_3_32b_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi3_64bit = buildUBoot rec {
     defconfig = "rpi_3_defconfig";
-    targetPlatforms = ["aarch64-linux"];
+    extraMeta.platforms = ["aarch64-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootUtilite = buildUBoot rec {
     defconfig = "cm_fx6_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-with-nand-spl.imx"];
     buildFlags = "u-boot-with-nand-spl.imx";
     postConfigure = ''
@@ -196,7 +195,7 @@ in rec {
 
   ubootWandboard = buildUBoot rec {
     defconfig = "wandboard_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.img" "SPL"];
   };
 }
-- 
GitLab


From 2a450cec19028bb7ea533bbb3d98966722b22d7e Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 3 Mar 2018 21:17:13 -0500
Subject: [PATCH 0663/1085] uboot: add patch to increase maximum path length in
 extlinux.conf

This fixes problems with cross compiled kernels failing to boot.

(cherry picked from commit 1f4bb8c61d71f2ac12f1cc6cf50aaa590df40a45)
(cherry picked from commit 828fdd61b9b5ae0d3c9253309f3d115210348096)
---
 pkgs/misc/uboot/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 9e07c22fe2a..800c0057282 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -32,6 +32,10 @@ let
         url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch;
         sha256 = "1rhhlhrwhv7ic1n5i720jfh2cxwrkssrkvinllyjy3j9k9bpzcqd";
       })
+      (fetchpatch {
+        url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
+        sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
+      })
     ];
 
     postPatch = ''
-- 
GitLab


From d50bcaa8168b2b41d0e6d195d9ccb03e9d332d6c Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 23 Feb 2018 23:47:27 -0500
Subject: [PATCH 0664/1085] uboot: sheevplug and guruplug: use mainline U-Boot

These derivations have not seen any updates since they were created in 2010,
and some of their sources have disappeared. There are upstream configs for
these boards, so these are now used, and they build correctly. I have no way
of testing them, and I don't if anyone even uses either board with Nix anymore.

(cherry picked from commit 01020b3263629be5a8697aa781dcb267df8de0a0)
(cherry picked from commit 48ade50d8ece09d3ff732b07f0facdcd78084ac3)
---
 pkgs/misc/uboot/default.nix                   |  12 ++
 pkgs/misc/uboot/gas220.patch                  |  18 ---
 pkgs/misc/uboot/guruplug-file-systems.patch   |  48 --------
 .../uboot/guruplug-usb-msd-multi-lun.patch    | 106 ------------------
 pkgs/misc/uboot/guruplug.nix                  |  57 ----------
 pkgs/misc/uboot/sheevaplug.nix                |  61 ----------
 pkgs/top-level/all-packages.nix               |   6 +-
 7 files changed, 14 insertions(+), 294 deletions(-)
 delete mode 100644 pkgs/misc/uboot/gas220.patch
 delete mode 100644 pkgs/misc/uboot/guruplug-file-systems.patch
 delete mode 100644 pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
 delete mode 100644 pkgs/misc/uboot/guruplug.nix
 delete mode 100644 pkgs/misc/uboot/sheevaplug.nix

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 800c0057282..9da52e49437 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -129,6 +129,12 @@ in rec {
     filesToInstall = ["u-boot-spl.kwb"];
   };
 
+  ubootGuruplug = buildUBoot rec {
+    defconfig = "guruplug_defconfig";
+    extraMeta.platforms = ["armv5tel-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootJetsonTK1 = buildUBoot rec {
     defconfig = "jetson-tk1_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
@@ -183,6 +189,12 @@ in rec {
     filesToInstall = ["u-boot.bin"];
   };
 
+  ubootSheevaplug = buildUBoot rec {
+    defconfig = "sheevaplug_defconfig";
+    extraMeta.platforms = ["armv5tel-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootUtilite = buildUBoot rec {
     defconfig = "cm_fx6_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
diff --git a/pkgs/misc/uboot/gas220.patch b/pkgs/misc/uboot/gas220.patch
deleted file mode 100644
index c5a91b0f3d0..00000000000
--- a/pkgs/misc/uboot/gas220.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to allow assembling with binutils 2.20. It worked without this patch in 2.19.1
-diff --git a/board/mv_feroceon/USP/jump.S b/board/mv_feroceon/USP/jump.S
-index 4b6b9ee..58037fc 100644
---- a/board/mv_feroceon/USP/jump.S
-+++ b/board/mv_feroceon/USP/jump.S
-@@ -29,9 +29,11 @@ disclaimer.
- #include "sys/mvCpuIfRegs.h"
- 
- 
--jumpStart:
- 
- .section	".reset_vector_sect",#alloc, #execinstr
-+
-+jumpStart:
-+
- #if defined(MV_88F6082) || defined(MV_88F6183) || defined(DB_88F5181_OLD) || defined(DB_FPGA) || \
- 	defined(MV88F6281) || defined(MV88F6192) || defined(MV88F6180)  || defined(MV_88F6183L) || \
-     defined(MV88F6190)
diff --git a/pkgs/misc/uboot/guruplug-file-systems.patch b/pkgs/misc/uboot/guruplug-file-systems.patch
deleted file mode 100644
index 30dc1994303..00000000000
--- a/pkgs/misc/uboot/guruplug-file-systems.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Add support for the various file systems as found in `sheevaplug.h'.
-As for the SheevaPlug, the increase in size means that the environment
-must be pushed further away.
-
-In addition, increase the malloc area size to allow compilation of UbiFS.
-
---- u-boot/include/configs/guruplug.h	1970-01-01 01:00:01.000000000 +0100
-+++ u-boot/include/configs/guruplug.h	2010-09-29 18:59:52.000000000 +0200
-@@ -123,8 +123,8 @@
-  * it has to be rounded to sector size
-  */
- #define CONFIG_ENV_SIZE			0x20000	/* 128k */
--#define CONFIG_ENV_ADDR			0x40000
--#define CONFIG_ENV_OFFSET		0x40000	/* env starts here */
-+#define CONFIG_ENV_ADDR			0x60000
-+#define CONFIG_ENV_OFFSET		0x60000	/* env starts here */
- 
- /*
-  * Default environment variables
-@@ -145,7 +145,7 @@
- /*
-  * Size of malloc() pool
-  */
--#define CONFIG_SYS_MALLOC_LEN	(1024 * 128) /* 128kB for malloc() */
-+#define CONFIG_SYS_MALLOC_LEN	(1024 * 1024) /* 1 MiB for malloc() */
- /* size in bytes reserved for initial data */
- #define CONFIG_SYS_GBL_DATA_SIZE	128
- 
-@@ -195,4 +195,18 @@
- 
- #define CONFIG_SYS_ALT_MEMTEST
- 
-+/*
-+ * File system
-+ */
-+#define CONFIG_CMD_EXT2
-+#define CONFIG_CMD_FAT
-+#define CONFIG_CMD_JFFS2
-+#define CONFIG_CMD_UBI
-+#define CONFIG_CMD_UBIFS
-+#define CONFIG_RBTREE
-+#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-+#define CONFIG_MTD_PARTITIONS
-+#define CONFIG_CMD_MTDPARTS
-+#define CONFIG_LZO
-+
- #endif /* _CONFIG_GURUPLUG_H */
-
diff --git a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch b/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
deleted file mode 100644
index 4f32dd89031..00000000000
--- a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-The GuruPlug's microSD card reader is a USB mass storage device that
-has two logical units (LUNs), i.e., two "SCSI disks".  This patch
-adds multi-LUN support to the USB MSD driver.
-
-See the thread at <http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/85425>.
-
---- u-boot/common/usb_storage.c	1970-01-01 01:00:01.000000000 +0100
-+++ u-boot/common/usb_storage.c	2010-10-02 00:38:15.000000000 +0200
-@@ -204,6 +204,22 @@ int usb_stor_info(void)
- 	return 1;
- }
- 
-+static unsigned int usb_get_max_lun(struct us_data *us)
-+{
-+	int len;
-+	unsigned char result;
-+	len = usb_control_msg(us->pusb_dev,
-+			      usb_rcvctrlpipe(us->pusb_dev, 0),
-+			      US_BBB_GET_MAX_LUN,
-+			      USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
-+			      0, us->ifnum,
-+			      &result, sizeof(result),
-+			      USB_CNTL_TIMEOUT * 5);
-+	USB_STOR_PRINTF("Get Max LUN -> len = %i, result = %i\n",
-+			len, (int) result);
-+	return (len > 0) ? result : 0;
-+}
-+
- /*******************************************************************************
-  * scan the usb and reports device info
-  * to the user if mode = 1
-@@ -241,13 +257,21 @@ int usb_stor_scan(int mode)
- 			break; /* no more devices avaiable */
- 
- 		if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) {
--			/* ok, it is a storage devices
--			 * get info and fill it in
--			 */
--			if (usb_stor_get_info(dev, &usb_stor[usb_max_devs],
--						&usb_dev_desc[usb_max_devs]) == 1)
-+			/* OK, it's a storage device.  Iterate over its LUNs
-+			 * and populate `usb_dev_desc'.  */
-+			int lun, max_lun, start = usb_max_devs;
-+
-+			max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]);
-+			for (lun = 0;
-+			     lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV;
-+			     lun++) {
-+				usb_dev_desc[usb_max_devs].lun = lun;
-+				if (usb_stor_get_info(dev, &usb_stor[start],
-+						      &usb_dev_desc[usb_max_devs]) == 1) {
- 				usb_max_devs++;
- 		}
-+			}
-+		}
- 		/* if storage device */
- 		if (usb_max_devs == USB_MAX_STOR_DEV) {
- 			printf("max USB Storage Device reached: %d stopping\n",
-@@ -882,6 +906,7 @@ static int usb_inquiry(ccb *srb, struct 
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_INQUIRY;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->cmd[4] = 36;
- 		srb->datalen = 36;
- 		srb->cmdlen = 12;
-@@ -905,6 +930,7 @@ static int usb_request_sense(ccb *srb, s
- 	ptr = (char *)srb->pdata;
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_REQ_SENSE;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[4] = 18;
- 	srb->datalen = 18;
- 	srb->pdata = &srb->sense_buf[0];
-@@ -924,6 +950,7 @@ static int usb_test_unit_ready(ccb *srb,
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_TST_U_RDY;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->datalen = 0;
- 		srb->cmdlen = 12;
- 		if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
-@@ -943,6 +970,7 @@ static int usb_read_capacity(ccb *srb, s
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_RD_CAPAC;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->datalen = 8;
- 		srb->cmdlen = 12;
- 		if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
-@@ -957,6 +985,7 @@ static int usb_read_10(ccb *srb, struct 
- {
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_READ10;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
- 	srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
- 	srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
-@@ -973,6 +1002,7 @@ static int usb_write_10(ccb *srb, struct
- {
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_WRITE10;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
- 	srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
- 	srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix
deleted file mode 100644
index 9f24f1da86a..00000000000
--- a/pkgs/misc/uboot/guruplug.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{stdenv, fetchgit, unzip}:
-
-# Marvell's branch of U-Boot for the GuruPlug.
-
-let
-  # Aug 2010 revision of the `testing' branch of Marvell's U-Boot repository.
-  # See
-  # <http://www.openplug.org/plugwiki/index.php/Re-building_the_kernel_and_U-Boot>
-  # for details.
-  rev = "f106056095049c2c748c2a2797e5353295240e04";
-in
-stdenv.mkDerivation {
-  name = "uboot-guruplug-0.0-pre-${stdenv.lib.strings.substring 0 7 rev}";
-
-  src = fetchgit {
-    url = "git://git.denx.de/u-boot-marvell.git";
-    sha256 = "18gwyj16vml7aja9cyan51jwfcysy4cs062z7wmgdc0l9bha6iw7";
-    inherit rev;
-  };
-
-  patches =
-    [ ./guruplug-file-systems.patch ./guruplug-usb-msd-multi-lun.patch ];
-
-  enableParallelBuilding = true;
-
-  # Remove the cross compiler prefix.
-  configurePhase = ''
-    make mrproper
-    make guruplug_config
-    sed -i /CROSS_COMPILE/d include/config.mk
-  '';
-
-  buildPhase = ''
-    unset src
-    if test -z "$crossConfig"; then
-        make all u-boot.kwb
-    else
-        make all u-boot.kwb ARCH=arm CROSS_COMPILE=$crossConfig-
-    fi
-  '';
-
-  nativeBuildInputs = [ unzip ];
-
-  dontStrip = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp -v u-boot u-boot.{kwb,map} $out
-
-    mkdir -p $out/bin
-    cp tools/{envcrc,mkimage} $out/bin
-  '';
-
-  meta = {
-    platforms = [ "armv5tel-linux" ];
-  };
-}
diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix
deleted file mode 100644
index 53d811d1a44..00000000000
--- a/pkgs/misc/uboot/sheevaplug.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-# We should enable this check once we have the cross target system information
-# assert stdenv.system == "armv5tel-linux" || crossConfig == "armv5tel-linux";
-
-# All this file is made for the Marvell Sheevaplug
-   
-stdenv.mkDerivation {
-  name = "uboot-sheevaplug-3.4.27";
-   
-  src = fetchurl {
-    url = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2";
-    sha256 = "19vp4rlikz7h72pqsjhgz7nmgjy4c6vabvxkw67wni70vy5ddy8s";
-  };
-
-  srcAddon = fetchurl {
-    url = "http://www.plugcomputer.org/405/us/plug-basic/uboot/u-boot-3.4.27.zip";
-    sha256 = "1wqxznpdb6d2kx58gral4q0mg5ddxyrv7az8c6v29nr3cd9yrfsg";
-  };
-
-  postUnpack = ''
-    mv u-boot-1.1.4 u-boot-3.4.27
-    unzip -o $srcAddon
-    sourceRoot=u-boot-3.4.27
-  '';
-
-  patches = [ ./gas220.patch ];
-
-  # Remove the cross compiler prefix, and add reiserfs support
-  configurePhase = ''
-    make mrproper
-    make rd88f6281Sheevaplug_config NBOOT=1 LE=1
-    sed -i /CROSS_COMPILE/d include/config.mk
-  '';
-
-  buildPhase = ''
-    unset src
-    if test -z "$crossConfig"; then
-        make clean all
-    else
-        make clean all ARCH=arm CROSS_COMPILE=$crossConfig-
-    fi
-  '';
-
-  nativeBuildInputs = [ unzip ];
-
-  dontStrip = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp u-boot-rd88f6281Sheevaplug_400db_nand.bin $out
-    cp u-boot u-boot.map $out
-
-    mkdir -p $out/bin
-    cp tools/{envcrc,mkimage} $out/bin
-  '';
-
-  meta = {
-    platforms = [ "armv5tel-linux" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c27168530e0..6e4d75f78c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13797,6 +13797,7 @@ with pkgs;
     ubootBananaPi
     ubootBeagleboneBlack
     ubootClearfog
+    ubootGuruplug
     ubootJetsonTK1
     ubootOdroidXU3
     ubootOrangePiPc
@@ -13806,17 +13807,14 @@ with pkgs;
     ubootRaspberryPi2
     ubootRaspberryPi3_32bit
     ubootRaspberryPi3_64bit
+    ubootSheevaplug
     ubootUtilite
     ubootWandboard
     ;
 
   # Non-upstream U-Boots:
-  ubootSheevaplug = callPackage ../misc/uboot/sheevaplug.nix { };
-
   ubootNanonote = callPackage ../misc/uboot/nanonote.nix { };
 
-  ubootGuruplug = callPackage ../misc/uboot/guruplug.nix { };
-
   uclibc = callPackage ../os-specific/linux/uclibc { };
 
   uclibcCross = callPackage ../os-specific/linux/uclibc {
-- 
GitLab


From b63124dfc5f4f1f868a8132efc159d99f1b73516 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 6 Mar 2018 00:04:10 -0500
Subject: [PATCH 0665/1085] uboot: fix cross-build of ubootTools

(cherry picked from commit 28fd7d9594fa0ed1a1b80a9652b5ab065a29e077)
(cherry picked from commit 4c669db598aba04b9a6dd3ecaf0811329d80a072)
---
 pkgs/misc/uboot/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 9da52e49437..dbb2bbef1a4 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -86,12 +86,11 @@ in rec {
   ubootTools = buildUBoot rec {
     defconfig = "allnoconfig";
     installDir = "$out/bin";
-    buildFlags = "tools NO_SDL=1";
     hardeningDisable = [];
     dontStrip = false;
     extraMeta.platforms = stdenv.lib.platforms.linux;
     # build tools/kwboot
-    extraMakeFlags = [ "CONFIG_KIRKWOOD=y" ];
+    extraMakeFlags = [ "CONFIG_KIRKWOOD=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];
     postConfigure = ''
       sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config
     '';
-- 
GitLab


From 7dffe0d38c7be19537b9fe67ba24be8c37f96a0c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 15 Mar 2018 09:03:39 +0200
Subject: [PATCH 0666/1085] U-Boot: Add AArch64 QEMU build

See

https://github.com/u-boot/u-boot/blob/master/doc/README.qemu-arm

on how to use it.

(cherry picked from commit 6b069c656abf9704662317dc0173f18cdf4dfc91)
(cherry picked from commit eff6d9628c9e0bae2096251f8e97789c0b9afe6f)
---
 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 dbb2bbef1a4..b56ca269357 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -158,6 +158,12 @@ in rec {
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootQemuAarch64 = buildUBoot rec {
+    defconfig = "qemu_arm64_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootQemuArm = buildUBoot rec {
     defconfig = "qemu_arm_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e4d75f78c3..78641135ef6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13802,6 +13802,7 @@ with pkgs;
     ubootOdroidXU3
     ubootOrangePiPc
     ubootPcduino3Nano
+    ubootQemuAarch64
     ubootQemuArm
     ubootRaspberryPi
     ubootRaspberryPi2
-- 
GitLab


From 566d3feb4e5b785513f1ed1c6a23faee96d96077 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 10 Dec 2017 20:56:36 -0500
Subject: [PATCH 0667/1085] U-Boot: Add SOPINE Baseboard build

This build is compatible with PINE A64-LTS.

[dezgeg changed the original device tree patch to v4 of the patch series
"sunxi: sync H3, H5, A64 DTs from mainline Linux" submitted to the
upstream mailing list by Andre Przywara. Also install the
u-boot-sunxi-with-spl.bin binary similar to 32-bit boards
since it's now being built by the upstream build system.]

(cherry picked from commit 2ff31f71ae1f10b3d1779b876ac94bf2a9998bd9)
(cherry picked from commit 176d151f4d98d54adf293ee58427da649f28452c)
---
 pkgs/misc/uboot/default.nix     | 19 ++++++++++++++++++-
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index b56ca269357..aac5f5a2c80 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,11 +1,20 @@
 { stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig
+, armTrustedFirmwareAllwinner
 , hostPlatform, buildPackages
 }:
 
 let
+  # Various changes for 64-bit sunxi boards, (hopefully) destined for 2018.05
+  sunxiPatch = fetchpatch {
+    name = "sunxi.patch";
+    url = "https://github.com/u-boot/u-boot/compare/v2018.03...dezgeg:2018-03-sunxi.patch";
+    sha256 = "1pqn7c6c06hfygwpcgaraqvqxcjhz99j0rx5psfhj8igy0qvk2dq";
+  };
+
   buildUBoot = { filesToInstall
             , installDir ? "$out"
             , defconfig
+            , extraPatches ? []
             , extraMakeFlags ? []
             , extraMeta ? {}
             , ... } @ args:
@@ -36,7 +45,7 @@ let
         url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
         sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
       })
-    ];
+    ] ++ extraPatches;
 
     postPatch = ''
       patchShebangs tools
@@ -200,6 +209,14 @@ in rec {
     filesToInstall = ["u-boot.bin"];
   };
 
+  ubootSopine = buildUBoot rec {
+    extraPatches = [sunxiPatch];
+    defconfig = "sopine_baseboard_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootUtilite = buildUBoot rec {
     defconfig = "cm_fx6_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78641135ef6..96c76b95519 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13809,6 +13809,7 @@ with pkgs;
     ubootRaspberryPi3_32bit
     ubootRaspberryPi3_64bit
     ubootSheevaplug
+    ubootSopine
     ubootUtilite
     ubootWandboard
     ;
-- 
GitLab


From f2ea9e0ebf32754c0a9ad3ff5385b943b48bae3f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 19 Jan 2018 22:14:00 +0200
Subject: [PATCH 0668/1085] U-Boot: Add Pine64 build

(cherry picked from commit 4b77663edfba2c4e15db46c1ba900fa9819e4325)
(cherry picked from commit 1896fcff609d7b99b4be1781a5c9523193c33e4f)
---
 pkgs/misc/uboot/default.nix     | 8 ++++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 9 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index aac5f5a2c80..4a96deadaea 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -167,6 +167,14 @@ in rec {
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootPine64 = buildUBoot rec {
+    extraPatches = [sunxiPatch];
+    defconfig = "pine64_plus_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootQemuAarch64 = buildUBoot rec {
     defconfig = "qemu_arm64_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96c76b95519..d18e51772ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13802,6 +13802,7 @@ with pkgs;
     ubootOdroidXU3
     ubootOrangePiPc
     ubootPcduino3Nano
+    ubootPine64
     ubootQemuAarch64
     ubootQemuArm
     ubootRaspberryPi
-- 
GitLab


From d884ece1daa254b39c0fae9910bde0771c8fd496 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 16 Mar 2018 19:27:01 +0200
Subject: [PATCH 0669/1085] U-Boot: Make ubootJetsonTK1 install even more files

(cherry picked from commit 4fe75d11b2efdd3325ee8eaa4347626f1a950dbd)
(cherry picked from commit a68e60f450b5be76d40627066b2c34a0e2360fab)
---
 pkgs/misc/uboot/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 4a96deadaea..807bc48a642 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -147,6 +147,11 @@ in rec {
     defconfig = "jetson-tk1_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
+    # tegra-uboot-flasher expects this exact directory layout, sigh...
+    postInstall = ''
+      mkdir -p $out/spl
+      cp spl/u-boot-spl $out/spl/
+    '';
   };
 
   ubootOdroidXU3 = buildUBoot rec {
-- 
GitLab


From ba172467cc728e5345205c9f3d7fc992d4eed081 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 24 Mar 2018 16:07:50 +0200
Subject: [PATCH 0670/1085] U-Boot: Disable parallel build

https://hydra.nixos.org/build/71880710
(cherry picked from commit 50dc85ed6283bb17684597cbf95f9405d5637fea)
(cherry picked from commit 91b09422cf6f8e44d3d06274761053d9e21d6fa2)
---
 pkgs/misc/uboot/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 807bc48a642..4cf1748bad4 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -78,7 +78,9 @@ let
       runHook postInstall
     '';
 
-    enableParallelBuilding = true;
+    # make[2]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'.  Stop.
+    enableParallelBuilding = false;
+
     dontStrip = true;
 
     meta = with stdenv.lib; {
-- 
GitLab


From 5cb25c4406222745350d1df6ed9b93cc08f598d3 Mon Sep 17 00:00:00 2001
From: Anders Lundstedt <git@anderslundstedt.se>
Date: Sun, 13 May 2018 01:28:28 +0200
Subject: [PATCH 0671/1085] plex: 1.9.6 -> 1.13.0

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

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 29be86d1602..57de5281fdf 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.9.6.4429";
-    vsnHash = "23901a099";
-    sha256 = "0bmqf8b2d9h2h5q3n4ahs8y6a9aihj63rch7wd82rcr1l9xnqk9d";
+    version = "1.13.0.5023";
+    vsnHash = "31d3c0c65";
+    sha256 = "b94d571bcd47bc3201fd7f54b910f5693cabd1b543d5d0b4705668b7b7c24602";
   };
 
 in stdenv.mkDerivation rec {
-- 
GitLab


From bb07e8903d25dd294b58426e9e5ad559d6717a5e Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 13 May 2018 21:43:43 +0200
Subject: [PATCH 0672/1085] borgbackup: install shell completions

---
 pkgs/tools/backup/borg/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 43f45a1783f..6de4d3d859e 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -44,11 +44,20 @@ python3Packages.buildPythonApplication rec {
     make -C docs man
     mkdir -p $out/share/man
     cp -R docs/_build/man $out/share/man/man1
+
+    mkdir -p $out/share/bash-completion/completions
+    cp scripts/shell_completions/bash/borg $out/share/bash-completion/completions/
+
+    mkdir -p $out/share/fish/vendor_completions.d
+    cp scripts/shell_completions/fish/borg.fish $out/share/fish/vendor_completions.d/
+
+    mkdir -p $out/share/zsh/site-functions
+    cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/
   '';
 
   meta = with stdenv.lib; {
     description = "A deduplicating backup program (attic fork)";
-    homepage = https://borgbackup.github.io/;
+    homepage = https://www.borgbackup.org;
     license = licenses.bsd3;
     platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
     maintainers = with maintainers; [ flokli ];
-- 
GitLab


From 5948024c40942999f5411914767f6a8bde9739b5 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 13 May 2018 21:49:23 +0200
Subject: [PATCH 0673/1085] exa: install man page and shell completions

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

diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index c07420821ed..2e6753cec34 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -23,6 +23,20 @@ buildRustPackage rec {
     libiconv darwin.apple_sdk.frameworks.Security ]
   ;
 
+  postInstall = ''
+    mkdir -p $out/share/man/man1
+    cp contrib/man/exa.1 $out/share/man/man1/
+
+    mkdir -p $out/share/bash-completion/completions
+    cp contrib/completions.bash $out/share/bash-completion/completions/exa
+
+    mkdir -p $out/share/fish/vendor_completions.d
+    cp contrib/completions.fish $out/share/fish/vendor_completions.d/exa.fish
+
+    mkdir -p $out/share/zsh/site-functions
+    cp contrib/completions.zsh $out/share/zsh/site-functions/_exa
+  '';
+
   # Some tests fail, but Travis ensures a proper build
   doCheck = false;
 
-- 
GitLab


From 0764d5992c0caf539fc3abe711a6f8c5a50d8c4e Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 13 May 2018 22:03:17 +0200
Subject: [PATCH 0674/1085] youtube-dl: install zsh completion

---
 pkgs/tools/misc/youtube-dl/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index d2e490373da..29ece1b8b0f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -38,11 +38,16 @@ buildPythonApplication rec {
         ++ optional phantomjsSupport phantomjs2;
     in [ ''--prefix PATH : "${makeBinPath packagesToBinPath}"'' ];
 
+  postInstall = ''
+    mkdir -p $out/share/zsh/site-functions
+    cp youtube-dl.zsh $out/share/zsh/site-functions/_youtube-dl
+  '';
+
   # Requires network
   doCheck = false;
 
   meta = {
-    homepage = http://rg3.github.io/youtube-dl/;
+    homepage = https://rg3.github.io/youtube-dl/;
     repositories.git = https://github.com/rg3/youtube-dl.git;
     description = "Command-line tool to download videos from YouTube.com and other sites";
     longDescription = ''
-- 
GitLab


From 5bd19cfceb51e2185c969c894da35473b7a254c3 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Sun, 13 May 2018 23:05:04 +0200
Subject: [PATCH 0675/1085] libressl: 2.5.5 -> 2.7.3

---
 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 3a4357a6ec3..bcd2de7ab62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10950,7 +10950,7 @@ with pkgs;
     libressl_2_6
     libressl_2_7;
 
-  libressl = libressl_2_5;
+  libressl = libressl_2_7;
 
   boringssl = callPackage ../development/libraries/boringssl { };
 
-- 
GitLab


From 989fd880a16c662277dad3a75318b1dc216a49a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 13 May 2018 22:46:52 +0200
Subject: [PATCH 0676/1085] gnome3.gnome-shell: 3.28.1 -> 3.28.2

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 ++--
 pkgs/desktops/gnome-3/core/mutter/default.nix      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index ae9aa047ba0..772df5d2441 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -13,11 +13,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "gnome-shell-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1k2cgaky293kcjis0pmh9hw1aby3yyilb5dzrbww62wxzppc9s35";
+    sha256 = "1b9n89ij2g5nqaqp7a13jnqcd8qa2v9p55rbi71al3xvqk091ri7";
   };
 
   # Needed to find /etc/NetworkManager/VPN
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 866888feba0..20dda08f980 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mutter-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1bhmjvf6l1fj5igsw2xlg3nv5526laiwaxh47dgk50f40qax1qin";
+    sha256 = "0ighs1zvlssgq16v1h3vg280za7y448snq65gc5m1zmqqawqkymg";
   };
 
   passthru = {
-- 
GitLab


From f252c72669399b95827e000bbaa535510b952785 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sun, 13 May 2018 14:19:35 -0700
Subject: [PATCH 0677/1085] hiro: init at 0.1.4

---
 .../python-modules/hiro/default.nix           | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 pkgs/development/python-modules/hiro/default.nix

diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix
new file mode 100644
index 00000000000..0289c008e7e
--- /dev/null
+++ b/pkgs/development/python-modules/hiro/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi, six, mock }:
+buildPythonPackage rec {
+  pname = "hiro";
+  version = "0.1.4";
+  src = fetchPypi {
+    inherit pname version;
+
+    sha256 = "1340lhg7k522bqpz5iakl51qb47mjw804mfwwzm77i7qcm5cwiz8";
+  };
+
+  propagatedBuildInputs = [ six mock ];
+
+  meta = with stdenv.lib; {
+    description = "Time manipulation utilities for Python";
+    homepage = http://hiro.readthedocs.io/en/latest/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ nyarly ];
+  };
+}
-- 
GitLab


From 42d0ce8a28c63058004e38d0fb9a1dee4c0d00bc Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sun, 13 May 2018 14:20:59 -0700
Subject: [PATCH 0678/1085] keyrings.alt: init at 2.3

---
 .../python-modules/keyrings-alt/default.nix   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/keyrings-alt/default.nix

diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix
new file mode 100644
index 00000000000..140d4297cda
--- /dev/null
+++ b/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, six
+, pytest, unittest2, mock, keyring
+}:
+
+buildPythonPackage rec {
+  pname = "keyrings.alt";
+  version = "2.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5cb9b6cdb5ce5e8216533e342d3e1b418ddd210466834061966d7dc1a4736f2d";
+  };
+  propagatedBuildInputs = [ six ];
+
+  # Fails with "ImportError: cannot import name mock"
+  doCheck = false;
+  checkInputs = [ pytest unittest2 mock keyring ];
+
+  meta = with stdenv.lib; {
+    license = licenses.mit;
+    description = "Alternate keyring implementations";
+    homepage = https://github.com/jaraco/keyrings.alt;
+    maintainers = with maintainers; [ nyarly ];
+  };
+}
-- 
GitLab


From 51f4a46af29c4dc47659e687799146a2ac6c04af Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sun, 13 May 2018 14:35:42 -0700
Subject: [PATCH 0679/1085] jira_cli: init at 2.2

---
 pkgs/development/tools/jira_cli/default.nix | 32 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 pkgs/top-level/python-packages.nix          |  3 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/tools/jira_cli/default.nix

diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix
new file mode 100644
index 00000000000..37b76c50e90
--- /dev/null
+++ b/pkgs/development/tools/jira_cli/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, libffi, openssl, pythonPackages }:
+let
+  inherit (pythonPackages) fetchPypi buildPythonApplication vcrpy mock hiro;
+in
+  buildPythonApplication rec {
+    pname = "jira-cli";
+    version = "2.2";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "314118d5d851394ebf910122fd7ce871f63581393968c71456441eb56be3b112";
+    };
+
+    postPatch = ''
+      substituteInPlace requirements/main.txt --replace "argparse" ""
+    '';
+
+    # Tests rely on VCR cassettes being written during tests. R/O nix store prevents this.
+    doCheck = false;
+    checkInputs = with pythonPackages; [ vcrpy mock hiro ];
+    buildInputs = [ libffi openssl ];
+    propagatedBuildInputs = with pythonPackages; [
+      argparse ordereddict requests six suds-jurko termcolor keyring
+      jira  keyrings-alt
+    ];
+
+    meta = with stdenv.lib; {
+      description = "A command line interface to Jira";
+      homepage = http://github.com/alisaifee/jira-cli;
+      maintainers = with maintainers; [ nyarly ];
+      license = licenses.mit;
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a386721feb..702dfd5d473 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3150,6 +3150,8 @@ with pkgs;
   jing = self.jing-trang;
   jing-trang = callPackage ../tools/text/xml/jing-trang { };
 
+  jira-cli = callPackage ../development/tools/jira_cli { };
+ 
   jl = haskellPackages.callPackage ../development/tools/jl { };
 
   jmespath = callPackage ../development/tools/jmespath { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9033c3d825..15737f335c2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2994,6 +2994,8 @@ in {
 
   };
 
+  hiro = callPackage ../development/python-modules/hiro {};
+
   hglib = callPackage ../development/python-modules/hglib {};
 
   humanize = buildPythonPackage rec {
@@ -5070,6 +5072,7 @@ in {
     };
   };
 
+  keyrings-alt = callPackage ../development/python-modules/keyrings-alt {};
 
   SPARQLWrapper = buildPythonPackage rec {
     name = "SPARQLWrapper-${version}";
-- 
GitLab


From 88fa50c2f2bbc472fe7169eac8f2a1b2312ef03b Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 14 May 2018 00:01:15 +0200
Subject: [PATCH 0680/1085] nixos/tests: set default stateVersion in test VMs

... to avoid lots of warnings during eval
introduced by 1f0b6922d3c
---
 nixos/modules/testing/test-instrumentation.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 98da55ed68a..3d46ba72493 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -129,6 +129,9 @@ in
     users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
 
     services.xserver.displayManager.job.logToJournal = true;
+
+    # set default stateVersion to avoid warnings during eval
+    system.nixos.stateVersion = mkDefault "18.03";
   };
 
 }
-- 
GitLab


From f8dc3abbb053f3732afc016109a47febad94ff71 Mon Sep 17 00:00:00 2001
From: Yorick <yorick@yorickvanpelt.nl>
Date: Mon, 14 May 2018 02:03:42 +0200
Subject: [PATCH 0681/1085] linux: add CONFIG_KEY_DH_OPERATIONS

---
 pkgs/os-specific/linux/kernel/common-config.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4af5889fd1c..ebb569689b2 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -636,6 +636,11 @@ with stdenv.lib;
     X86_X2APIC y
     IRQ_REMAP y
   ''}
+  
+  # needed for iwd WPS support (wpa_supplicant replacement)
+  ${optionalString (versionAtLeast version "4.7") ''
+    CONFIG_KEY_DH_OPERATIONS y
+  ''}
 
   # Disable the firmware helper fallback, udev doesn't implement it any more
   FW_LOADER_USER_HELPER_FALLBACK? n
-- 
GitLab


From 83e237d92a962b2b3c831d61efa6d4aee1b786be Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sun, 13 May 2018 12:35:02 +0800
Subject: [PATCH 0682/1085] firefox-devedition-bin: 60.0b8 -> 61.0b4

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index bf7e7cfe9d3..d0c87fd35b8 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0b8";
+  version = "61.0b4";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ach/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ach/firefox-61.0b4.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "3cfc027c422936911f669825d03be090788fb94a33e0e67b2b7d58aed52b719eab4ff1a7e19ac368543a4b662766a41062971b9a5fb5588b76029fd8a78dcb1b";
+      sha512 = "79f2d4d476d87e3a66b5985eb05b4c2c67da500c4f655fc917bea787b2745cf2275bc1a0a60f2a7d8edd29339f9db8bddac9c079687c212076e2c51811784ff6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/af/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/af/firefox-61.0b4.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "a8d96e9d9529b4c068371cda82219bb334d54e069b3e63caa6de4054cf917eea2aec9e8767d64999ce72323ced179477e07791ec8bb23d8231fe268f92c72042";
+      sha512 = "6bff0f1fbd1ac000a2d3eaa6b65e115a2d4ab3fb7d8c267f1aa13e0edc42f3f1a390eac87dc516b144969473106fc492ad471f696a885b8994db05c19e386a0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/an/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/an/firefox-61.0b4.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "18b5d0188d6ddd22c2de16c02a3b3f8eeffc25cee1c1afcb2bc9f80c722bca7c15f9561c9215e65a5390b45989c235f5720cfdf01005d7ef7e1ab1119a7ee294";
+      sha512 = "26665a323860a567e6daf053324a895c5b639c720325612b923fc9c62365983c9d6af48274a068b51a22476c9c005e31ad6c95dd291bd8705f700111191cbad3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ar/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ar/firefox-61.0b4.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "8f8c83b0f4f0031dad8d3fef2db67ed7ee19e794a7c20525dd91f5024cbc1b7d1b0c9c847173b2aa187050b8bbf68f537b7ef91ad7bdf557759a3ecb4ae7a98f";
+      sha512 = "6b98ba510a4c5db95205ffb0a56ca3307093631bd905358ec8800a421506f7d880b599324f2a39150796d719c1d83c614e18db25933ff06980941319e648d8f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/as/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/as/firefox-61.0b4.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "866bc322de99f428e09ce5cafa26dadf77117ead452a527fcaa536da749e9eeda0a82f4d1c5e1aceb202fe931a79fc99d2512acc643a88638c5f37c48e19454f";
+      sha512 = "68650b9b92be7e65e9bdb833ef97320ad5475255e1b040487925a2172d16168bf0c36f70698379f194b7a41e1619152142ddc9e8ee46d4347b7d6b0de71946f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ast/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ast/firefox-61.0b4.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e91d908997d5924be2f5f7e7afd30a1e5d16d2227ea066a3136a12976fca7fcc89989160a3249ba47145518b53c4285cc7a9d39440cf8953c1729179efc1c690";
+      sha512 = "11e775167faf1a9d6f1b1a14009ac8f45569156fec5c550cffc90abb0fccc601827cbba8b805d82df8cf2239caebad3dd35e3e54818af69dd98aef45d12bbf63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/az/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/az/firefox-61.0b4.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "2dbb8d8df8177b4f4f7c69d321817b3ffb4f4430fd8e8250c2cc3678d758c01d9568873270b7aef2368145b6f5ffb0e358ed6c74864c9b883b6c04e11709fff5";
+      sha512 = "7c5347d7997fbe7a540153fb931a1d6e143c6f9200bb3692fbbdd0b9b5e3b38ba9e55d7579d448bb63816d4007c8944f0bedb5ee446c4ed1ecfdb8e8957fc717";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/be/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/be/firefox-61.0b4.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "6728628f6b71a6d495b49dd32472a64ddb3c41e2d9e2923cd033a37f19d1149ba5d3594598209ff5b59f0aaf6b0c2fcfd4313fcf34c9ddf3d5b6bda034dcb6c8";
+      sha512 = "78877031b48f257b7070d9ab9b261df1414b5e7447f0855811abdf47f35edc8f6ef8e59264a73a57ef5eeca0afa261557d18cf348cf38e48c7f0f24cc8b13305";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bg/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bg/firefox-61.0b4.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "1b71d585449f3da51da9c9934c9f5bf15b618bfd6a80e5054137c15c16b245eddcd50458cff69fb70ba2ac050b7fb6f316825bbb49e2ed640d63055a4b80f145";
+      sha512 = "8c57bfc0361de65a0bc7a19ede9aba1af4808aa4f07e0dede04c262429489791c84c0e3f2a2ae6d0cb457b1cbf0a44a966f6f5a636bf897fa9475858b6922ab5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bn-BD/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bn-BD/firefox-61.0b4.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "a84a384debb371c3cd7b4c4a30cd66f69cccd658c089c10339c0fc7c0b0badbe8600f18451bec4352cde253ba7c4cc9566def047d7df9551214dfe88d0965ef0";
+      sha512 = "19f197b25b3792e7660d062341ed047c2983c6a375947c9c09b7d0c39b5630f88b2f0ea70b6865199caec8bf19f0f927f05347b85ebdd176f26ae6a1997747f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bn-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bn-IN/firefox-61.0b4.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "b2f2c879b067d752c69a841c40b319db0d36a2805d441ee832246da199a0099cd359c0e925996c152d67e7d5f733ddcc776a393d86090c455f4c5cdfe79752da";
+      sha512 = "09c01a7da3e77a4c07fefeb8fbb33317a90b14d5b4d33286152c494238da9436b0db54a410a57046a183786a006fe8e3328fd4a2192465fabcb0e5b2686a4536";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/br/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/br/firefox-61.0b4.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "db7d9c6e991b3be123f80e62f5b1f9107ae537f3a298d65f910c71397183129a4527e324f75273605a5b945516ac5d2bcde05a3fa3de9748fb880bf0582d4e74";
+      sha512 = "2b8a1a9cb5127e678e783742876a94b8bdc25a0d392d90ccaa0747c3c7b50afef665bc950b20858194a2a2bc3617fe1421f7acd95968cdd67c7e7b88b7972675";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bs/firefox-61.0b4.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "df4dbb35c37726af2d5fa1dbcabd8d926f171896b5dda453a07989cede18f58705617e67f9b0702623ee4cbfe570cb81fd5cd9b93a050d2b75e28843fa5a81ae";
+      sha512 = "4a451248f826726a606b025b9acdf8b41fb3993906a7481aa60fe7110b8abe9b5206525fb188bb16159370ab9ecccbc199f0d1bed475db124c923461546167d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ca/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ca/firefox-61.0b4.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "2386672d892863c4d1ad4a063270125703aeeb2f2afa8bc09cd6d813088c9c80f5837096207c8a662d28025f9c457903f036f79aca3fc3b7ba97660ae861f1b9";
+      sha512 = "02b9ad16ba37bda6a60f980293eb402657c612bb78a1911c8ae2b60657fbde2a1d41ff7849a653a8ff2f8c77bdb4d8a774d856ae90d3112b89846dcdec988533";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cak/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/cak/firefox-61.0b4.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "6f6d1604cd1060a5efa633cb09ef8525369245ef753fa7894f17299d0df2b3bd62c7d2ac8cacb93cf93961dbbf9b240a43d47a0c73cbcc7ea09a2cea2b86755a";
+      sha512 = "2a87fd3ba1e96a7cf850c3795300e488f61cd29c17ef4f02b4957a9859f65b63e3a8a3479a56818e28dd08b2b7399eadf027b305fb10b5a4cb7fb7052c655646";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/cs/firefox-61.0b4.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "5b8dd67086cfa08fb76b066e2c10be109e0a4eddeb5e4579aa9366dff50642f5e56f6aec37f9aa21299fab0ae7005ae0e6ab4db05e079870e2f4620a4d96c54b";
+      sha512 = "128f7466d1bd1b2a091cbf64d9f521ce77dfc1ff27b4d1bd3bc5d9f297d6ea5b326eb822dd6f1f9a20220f1032afdf89f04296e1810c95e28029b1846fcb9c45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cy/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/cy/firefox-61.0b4.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "31347a1cb6fa703ccbf444830fa88f8535a2717da85fee09f6a544ee8aba1aaea093f4ab1368f0dc4fd7b0dcc3570bbd60bf8855de06a8725d2ee1b345242bad";
+      sha512 = "a99bb3ae930f47a8c7ea43ba50e6dd780b8aad4f3171530c8d8f730c395e4844fd6d4b37a1372ce5aca631b95a196cebafaeae1e4467f22240d5e0033ef505e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/da/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/da/firefox-61.0b4.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "20785e095d45c22ebab25f4a2fc224aa6e4a4b7c86db1e94a304c41598cba74ce1d1200effd78bd185e5bc90a11bb66f223e28c0cc65d6663229bb724ad1c791";
+      sha512 = "ccdd547ae7a31e4edb5ea980f55b8e58753e47845ae1b33b45bc1c3def18ba3a716cc8e23061038480ea71c43d682fc48548adefdc480ca6499ac3842e7508db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/de/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/de/firefox-61.0b4.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "e070625687172f84d1d5d82ec2ef385291a60c2bf011a4a075892413ded629ac16b7688d2ccc698ace07cde309e782a1b7b16707bc42d2b47ef9394a0deb6872";
+      sha512 = "afb82ce313001463da8763615ec9f6a52f019ceb1ed52616e0771081472455df2d252bf2e06700aa8add39ec1a6db0e51ad1f46026a1367cdd7e02ef070e3f9c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/dsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/dsb/firefox-61.0b4.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "38df16c7aa84fe2cfbff1e19e702b2c1ea4e2c5f1523cd3094144685fa1d5d561e00270881d0a113b14e926f540b25ceeb1562ecf4876cc35cd93fb794de448c";
+      sha512 = "8fa44ec6ea0726cada8491d2b47675a283ddd669a0bc6d7708b3807fad6007941325c430f5a01358977d6827cabbf79ba57e32b816adf6bc846c2f729f887273";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/el/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/el/firefox-61.0b4.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "e9846b81293eef5d593eb5175d9d73b7a42de7316c23251d94015da0554ec15981932fcbade6a5fcd726f6a89c6db461564f7ab9351342b9c4d8d915eb768219";
+      sha512 = "73cdbe7ecc09520bb3efb10f74b3792e079589bef18bb9e78f3eeb3aa99ebfd598fde9fb4dc1b1f7cca8f168f5677cf7c96941d1ee08799a41335faba1b6ddf2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-GB/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/en-GB/firefox-61.0b4.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "53cc5276c35d94f263cdb4ee4a92dbbd356eeff382c2a69dba006f6b5a3ce022c528b4e6102374b97c618e70ef7ad692b1799f6ee3987b26378b742c18145cac";
+      sha512 = "53b28a49f42c2d5a18ea81070da3dfe08609b1e967068e3eb99d369b9e16c95683dcae080954a3d89231b2b136caab4632e9c79bdafdd1860c2d642ba46d66d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-US/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/en-US/firefox-61.0b4.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "2b0e15a85f5d9a7fe6e8ac198c86d3746d880f96ec13f8e78d69d4618d86e73f76e64bc8dca214a73f2ed95a12ba674f57c697e54f0b869760129176dfae14fa";
+      sha512 = "1d68fb1e26f70e54e32dccda9ce56ba3d6ee4925c8a46ee04321fb88438df4cd9051772e3da23113f95d4ab684b154ac9c7732b1025bada5a7a71b03d683370e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-ZA/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/en-ZA/firefox-61.0b4.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "c751b4ec0567c5fdcf3b8660ab7bf100366b9c819f78c957c79f217a0e7658d1a7c4bd141baced6e7ba36596a8c07c89b825ade20becf380249d90e0517e1096";
+      sha512 = "e694b56888823d91888c92eebd9778429f92a749453efc2188013c83dbb71c6b4f9aca31d0cf1036ff3e22cbe229bab266319fdaa0efe2b3cd1a6844f0dcf93b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/eo/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/eo/firefox-61.0b4.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "d556386436ad4c226f0986500de244a2efc5cf57ac8d792f328616deabb5884cbd3127d0530add7f7a9dc5c2ac61512456abecd6b1cb8c84c74b2d2bf18d9113";
+      sha512 = "b8007be22bd2e84fcc99f76fc2ac6edbc48b8f529ed055aab31dd7212ec3aabe47d7870a6812eec554ace6a41f98654fdce32e15620b872e9898bff020c5e56e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-AR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-AR/firefox-61.0b4.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "1fdfea27dd45fbec3727804c49c8db28e624e8240a8589d28621b4f03ca12d184395632db2f629032eebbcd6f0d0f514eb3944d60c2b54bef3c187e06b9add92";
+      sha512 = "3b0998405d2a019b049b80f077eaae13ed7b562b5767a821cb73dcfe50d4c243267e5bb5490911c384a5f5e34f13e0338f768a0119098b1222671ae410efaa7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-CL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-CL/firefox-61.0b4.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "fc171dc5fad703344d0ec1a9d1800650d0469b1d4f10533e102031c776aaf14d5df7b9375a73583112b9bbd1d1e7df267873da0cb3e7937f5473b2d4652f19d5";
+      sha512 = "a28fe0c2be869e0038da0156601714e33e4e5ead47b9546e9328e06fb7c690b633f28c7f029747cbd438d4854ebe665f58244a18c309358d1877ff769557f99b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-ES/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-ES/firefox-61.0b4.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "7d8f9c31417bb03d02278c5567eff23d07cc2d9de93a5874938db0108c8c0eca0c0e3f924eb8d9887b14d7c058bf4b4fbe1aee1925f0a150212e76e11a0b587c";
+      sha512 = "450b32e899da5077b3e633917324c93132682d9bab4da0f44e63eebc0e406c1ae7c5ea5adf2863363ba4cf8dc8b235b5f3d1ab0be790ea63f5f51feaf5c8723a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-MX/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-MX/firefox-61.0b4.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "95b43192a707943cda58d98fba2bbb96b745d6997932113c1807f12de7fe3fe165c9dff7c000dafdf21192b24eaa42c874f068e3cef6a2e7c6cabb8f0e1fcc32";
+      sha512 = "bebdc8924ae2d3a6d329a86c838bc54e99335e087dac0696fa833e13af17b81ac2a937f7327db970e55fce04cb3cf66f645f8a0e15c3a421c2487a30e29f6d0a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/et/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/et/firefox-61.0b4.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "3e379c3389fe3a1a97dd3d6ad39abca49273e6e36bfcc9b5b6b2eda948529bf6e744fb9550b89edce2d9ea9145a2c7a0a5d9466f2975d4c2193696871b32ec58";
+      sha512 = "522acba62d532c6d96235862101f14cd0b7ff38bc52957d5e77783d3299820969c576713bd85c8c6bc63e7bbefaa09d0308110d3390594ac4612299ef8d751a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/eu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/eu/firefox-61.0b4.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "a1b6197535661193818b0ece5d28112073fa03824aa4bf4de999b554acf751da7117b073c875c7b2265b05af0bbbba7307b59c0f4ea02258e7ed438bc6e0bfaa";
+      sha512 = "799508fd282cc99417f040481d1988d2eb45bc2b7537ff5ee984ba88560819fb20df4ef0de8ed5304e5920bb7e271d05f1faa5e2400428a59ae8e25f4c1c3b3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fa/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fa/firefox-61.0b4.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "28927abe6b2e33868c37473378b5915ca325ab26e87b6c83566cf9a6974eef28a1ff1a800c164d2d79d613ab1482c0e563597aba20de2179b8645e8dfc5b40d0";
+      sha512 = "4068a191f7a66cbb11fc6938722b6a1a5cc902f024d63dd1f27187d35d1f2d28e1cb17c74e73ee4f4b2ef10925d858973ff51a779314a32ed22a91b78c2fed12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ff/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ff/firefox-61.0b4.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "07e3f102f8324d3b613c972651b80f83575129a3d23fddea3d02d3880bb66d3697c1d7c9cb47fb2b8dfb24acb4bf9029080675a5295d3ea1d2f7b31114ce4d13";
+      sha512 = "051d7945af28916ccfc39647617f81041f3fff0cc305027dce6408ba7575213c0cd1064d2d48986f4b2740533c7c770ee4b28802b9cde01681fad5baf2fdf27c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fi/firefox-61.0b4.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "90bfbe9cd103b981413d57f74d416098ee1bb284e871bc40676fd8f8240a7fea891b4d68a079c1d23d2c62e6f84dbeddc884b4ba31e446dc59fcc4d1b3422469";
+      sha512 = "371f8f0e5d14323a5274923d6745a3aa327b11a18b06b3ff4f4e1c9843985a83b675cff17fcf0c6927d34e771a56a1a605248b32cb04890e202a14251e0ff13c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fr/firefox-61.0b4.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "a71571118b26ffb823da9723a6c84a2f10c04c4f52b0a5aa9dc6832ca008071bca761adc71b67959fad643711f1ff859b7e1093b5df8a6f26fb03b01de8c234c";
+      sha512 = "0b5270611797881954b4c2ab8a506ad8104b895c33fe0ee32bc786e45b96f9fad47dfac84955fbae2091c63bf0f7a0c0e189d48366f623b2740aa8bf0115c0bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fy-NL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fy-NL/firefox-61.0b4.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "371d1292c4b9fb561bddfbda150eafe227f9c0c6525f5b9bc4ecb178c2768c2e837ae6f213cbf0dd4f64e16d51e56fbb0775d4df1b019587d5bb51428f21fe22";
+      sha512 = "a48ac0ce28c4a689afc7196de17e4235709b239f4c1b6c1150ae706dedc858edc973291998e6f72e36a233c5c316848ae70234fc6c7fd80923894947f2897bd3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ga-IE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ga-IE/firefox-61.0b4.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "2477da8f55c599acfd8091a420885f795841f55bb7a0b399c2dfa51db860d9ef03626cf62c6ed99c7c89d7549d1d0b5053c44580894d0c896169fc23dd2568e0";
+      sha512 = "d96b456a2e77dbc0ddb47702c94772b7f75d58ce9fb4473c7f9b4455461e6ea5e0507da2128810f194a74ad6f58d5c3b373a501a1d28ddf7111eb90f9d2e3851";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gd/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gd/firefox-61.0b4.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "b9849c5d545c40bdcb7bae8d5e3447894a7637d59b1b413f7a42f9fbfe3509a45afb03b20bbee3ce1a625a08404f903a1b79bde183f51b043326d560794e501b";
+      sha512 = "4c9d9adfb6236e011c0048810716a9d44e6251d2122443f7be1a2761fd12ef085c4b8aec06bbdad54d056962ada81f8034d3e87f9dc17551ca74ca9a0630d304";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gl/firefox-61.0b4.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "f5c014f18422c09f96d63efbd1dd3cd5e880ee5f4c1cb6a2a0eaf939a755a952ace065237b74ed8c4e70508062f69ec545d24aa55b21416cbdc449e840e8bdb9";
+      sha512 = "fe6a9944ce2e595c436aa3aa4556d3e24b2595e7aa3cfe54eacdb23d16d461b1e0e1f4ecb1185f776f19b9f7ceebc01177d624443827d21c5697755f92cb4fbd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gn/firefox-61.0b4.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "e35e1d007c0f1371fa4e95ea6498a87949f9f0fde93dbc960f44ad14fb8f2d4587a08fd456bd6898ba864153344a2ac8093f45264d7305a5db88fc920a8e79db";
+      sha512 = "5ed38fd1a5d0414c95c0ca1ded08f3f31e9a3bcc3860a3127a5568c3c8891a958071d1923a208174d27f479811a9053b0e217fe81d51d130b15b8c5ff8ad135d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gu-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gu-IN/firefox-61.0b4.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "cc8740fd82ca6cb4aff2a5bb2bcc02d6d3457cf7f10c619b087c94d278f79a80da26a7f5f5a995fd77915c95789e1d263feec9bf1b52a9e511835565861e0bdd";
+      sha512 = "b6f850d0a828b24d0c81be758aad2402b749701c09f40c19d47860aa6e9b8e595c223ad14b94560513044ab9e96113bd509aa049e8caa6ce502ac005fd59cf36";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/he/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/he/firefox-61.0b4.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "7547c1099276b4683012cf286482f37af3d8e3c0afa6f95aff2e2030b7ef81c5accb4116ea178134c916f9ff09cf9aebee30c0a698c8f88cdac6f91af64ee66c";
+      sha512 = "ff989985b24a8b4ea0ebc9dcaa73406b3031733d925477487b4ec53ac5dd39d879601bacd1a69a1190c0438df1403adf9fafa67419e098ff618c1cdf1abbb86b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hi-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hi-IN/firefox-61.0b4.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "ff3db0fa7c76764d836b94b7a8e7028a2c3f39c6a3340e90cd1396564bcbf9540b9adb9b235206146c3fde2b8845968817e5eb34095aa5d27cf5ce7cff885504";
+      sha512 = "ffae6c7f92f2c4dc83c65aa4caac0baaef54cce44e7da771a5523e57c15c2d1b2bf4685f8a9fbf0c0d83a234367ed4a30e037e8855fa909fcc3cef2e54c4e01c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hr/firefox-61.0b4.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "c13fde2cc3d39d87203239e442feeeb9caa7a0fa03fa1b98f7c49eddf79ed60b88fcd4ceaf5a3d70fd48b64270ee770bc03bf0bc4fbda15fa72090d0e0b3ce03";
+      sha512 = "d63f360161802fd7a680a412bd11ebd47ddc33e234ea97d9725b58ad35c7ec41b598497847077e991a3744024a384d5fd636d66c9f2a31a32d59040ee684700f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hsb/firefox-61.0b4.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "e688ecdbcbdab4a821ca17aaae031874c454b8e78cda40ab8d2ac8258a71730c656c6ea5e8542fe3bba975f8203c63bbc82a45f47a4af4da606a446a5a9c0d75";
+      sha512 = "6c5cf6db753f03a108a13303c2a4ccd1be0a8a7dacc4c60de95beaa0395c41bf93921a81e56cb8f65ad7d2ed6e45177c80c8ac9a516e5b72b23942016b62f78a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hu/firefox-61.0b4.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "72d6977d4709f04b282301b6f1b803e924f1b1f1b6488b871206cb323457c9cfc01d0a683dc24b3cb16b26d160271d4f234e5f8308f01cb7c8183059e3036415";
+      sha512 = "d98013b7aa341be6efce51e9d7d61668c232958066e8e3b9ea7a8ff886450946b30b9ce089b0bd4c12e43da85f922d58be37863eae552d76a953badccf135514";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hy-AM/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hy-AM/firefox-61.0b4.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "380bb6c5e7dba01547fc64e10e20234e571ea1aab0dff8ef8fba971a25038ea99694e235269321b38b346872314d64bc31529aae8623cd21c934dfdf82f2f87f";
+      sha512 = "044962ffc10cb00cee9c7a4e7025d3bc08768f4b955a0df9ec8e183de27ac06366b9cdf4a07611cee23fafb27258e9ddf0b3aea4104193d9ebe58577406cd7f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ia/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ia/firefox-61.0b4.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "12cbea767896b7e20b0c717666b87d7de9f6f818c4f35920d5a0eaf847fc6fd29911d1e8f3cd8bced453e38493359f4e3e644d9c1d92e91285caf9e9b8e75cdd";
+      sha512 = "3a810b0a95babf1e51fc02f54d2be4cfe0a3596b216a85c1e676f7d90bd322abb63d9ad1dab135d268d996fa409a30d6a247d14f8780b9c5daf7dcb09e3c49e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/id/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/id/firefox-61.0b4.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "3be7d341d036d4899dccaa6a92fdf117a46a441b4eb481b65f8a94e32b15f5d98662a4bd5ac0c45985142027af811cfa0bed9ea1d7d1ec45439df5b9b6210be2";
+      sha512 = "2faf68616257b9d4a81677676fa86c014fabcd0164d9b851c37176bf60b0495d493c5434d5f677b7d29c91e97a02aff92d3d3ec9449f5df4c85c261410492785";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/is/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/is/firefox-61.0b4.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "67f9ae05aef3eb743559401bfe1abe662f748ac11f788fe1407b9d77f6fc2974e8e4ca9e107d2b9500e01283f07a06d35dcd7a1a7223c92e09aa38022e077b88";
+      sha512 = "aa312acb041a1d8f3aaa6f85c0bbd09703d1c5ae972bd80006b929c415dfaebacd849b5297aa2f6d047cb4f21df601a71b3143c451088532f3cd116199373fd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/it/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/it/firefox-61.0b4.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "e529d48adce27340bafa07dfd7da2b6eef3559ba2caf2be59fc953028b48c3ead9974632ceaa1ae1a3c6983d2bd7a0b3beb094e8aa0cb5bb28a9e4166a8c50b4";
+      sha512 = "edbb5f0922521d17ffe3e3481ce5ac440b48af65bca441166c26cd9b1b9a12053b6212d3caf29e4f2b32611ce846aed9e157a537eb20f5785ec8fb92990765fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ja/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ja/firefox-61.0b4.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "35fbee4fe54f18627a647a610b178a5387428375ce743c8c91caf24ebcd37062183dd8d64b090925343e77530a0dd3a384ed5e4b2f8bccf9eba2815213721a46";
+      sha512 = "20d9c4e1cd8515432163daf732aea418fb0eef6f164c9f72bb8519c896a2e119a4774c00308d8fe49640838d166da673f5def9e99af2c88adb3191cf94ac545f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ka/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ka/firefox-61.0b4.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "5298adaa040804ae5311da123475f746beb2890406c47d0a15d530ad1754f78fd695c0355b3709e7416537dc1965ea8d714feb12865d183788f0962104a169e7";
+      sha512 = "291ab0b8da0b4ffb634967a298499b880e3fe8aac73fbf22cf90744aec1ee2d0eae38b32a970e4650243de5aa547986b78bde59e241668be3f363762922d56ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kab/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/kab/firefox-61.0b4.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "0729b8a96b8cb56b2e57fe29355792b70ba253aa1bcc34e13aa6f8c1e63358c9b315c2193c3f72ed40f47544c14f2f05768a293270bd07a2b735af9bb000ab5e";
+      sha512 = "edf8a27e6a745e2ab7db9cb3a5a270f50c12bf089846d9050176847b29698203c7a298bcce311001d69a22a3049e34506c77bfe08b6dca3b2f2a8a9fe9dab54b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/kk/firefox-61.0b4.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "4df76c0efd75cb75da4756add7a95dfba2a8a2834c90639687e4a963072e30d22dfeb4e9f5cfd4ea471bf97926844e561a2043423957baa1d60a64b9f1d152ec";
+      sha512 = "1b3972db8aa56fa61b7729029aec794c03b20378b7bbfea93dbbf4d14b9b9bff3be30b94fcc214531bd0067679c5dc5fc3bded774eaa9da1582706166331923b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/km/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/km/firefox-61.0b4.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "7d44c52fd2b384a6212e3a5ad11ab1523d0689a61562b05fcbfd7578e47fa39368bc1fd605bc6f4a27a382f4a62bb5301a103a5cdee7e5f8353596e80edf3723";
+      sha512 = "210d65fbb16d3f63e5b94b7df2b33655fe29dc3bb1707f0cff4875f480b7b5731aab65306ccf8d19c78041284bdc6343b5bfa195a03503a27e1e687ab14dfeae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/kn/firefox-61.0b4.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "953f22af390aeb1f13a10a47003f0f97051e83d3cd0a8f30fc9e3f7e99b82519da6ce0afdfae5f89e88b6bd017af858010aab624e1de8ab39ff9787b9d804dc3";
+      sha512 = "081d883a7f9982418347463a1bab7a361ef915654314b254993c22e1cc6a37dab197950dfc742dbb76c2e520628c12ee190b33d12b89675de3b87adcac4fd389";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ko/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ko/firefox-61.0b4.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "4cde6ff0a032c6c222e2f36e33398d6acf72b0e944d9d9b6c75c34893082fe3847ac87e837848b3866e55819fed1f41c0a1807ea2c2dcd264f793df9548a5ec0";
+      sha512 = "f00a78552a06c759f353d39a6a3abead6d10d8f4d7276b4eee2d81b7572e96b14aeb7801f6382fab96b355264f391093726bd35b94ce4e4c97d221b0eb18fe0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lij/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/lij/firefox-61.0b4.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "d6ffcad6fdfdaadef0b8225f30d9d0a80e7f918d6b2ff6468f4e460643034286cd561dd63391f79c3b32222d783c09842fe4979c6d94dfce4ebab41fcc6580be";
+      sha512 = "2f681b55c324601f297f56b7f7fd83af21a4a176602275d00f75f919923d6006ec1c7a5178877aae406559f2d9acb27de89aeb9fc94e14e273b2729eb27e5fd0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lt/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/lt/firefox-61.0b4.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "8814f08d6d26a05e7f003280a0272886a44fcf3b88da93d0088f0d2a9e517c34c264229ad8ccea8efdf15247631e3cd28f82b589afc4d2d3973127e1227c6c67";
+      sha512 = "2c7388340d8bf4dd7163e7515158d79da26428219f3b2c8a11dfd6d04f85966fde0013fa4209c297d28d8b6bf6ddaed6dcdb3209e1cf3ed6b359f35576d64d23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lv/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/lv/firefox-61.0b4.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "b80fdf0b0ac0f8decc7e4329a23f8ee1005aecc70f7d0d8a000eade3d406221ffff8015beb99c77403f903487ec71870dafa92003aca86f5b0cfdd8ee1f297eb";
+      sha512 = "c6f2d1c64793e63cd9c5f0a5e0346d6d20af95e8ee46e6a68c41a1af7c584137c2cfda7c9bdfcce22dc23a0f7f5b9dab93117d52133bf78b94a6dc78fa3d2261";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mai/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/mai/firefox-61.0b4.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "63b69aae0a219ad993e557d7125cf91ccbe8a19310a17a09536d5c2a80e7f3292e3aace28342a4b8eb73042ac2ce5d728af5a745416b4b6401d29fae95c7f9ed";
+      sha512 = "c1e0b25fe89e0d27c27942a3c93b2a5f1d861620e2b5e2a077952d806e66183319c5613b099afca667564a9d3f55109b5acb99a5b33da3e8362eae873099b83e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/mk/firefox-61.0b4.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "18ddb3ff53baf7efd11ccb432d87dcb7a89260c080f29691785bd44999a43e8f9fed99b636b26bd21e557921b82ad9e69d729c498bfcb45077adcfedcc3208fa";
+      sha512 = "b1da2340de04e9535461cd14e8bd203975b6d570d214288da2af3b1b9eeded470325b5a1048e277e173fa3159e7ead212efd4c10748444469ab90ae8ee36d49b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ml/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ml/firefox-61.0b4.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "2164dc4beed74c24bd3015d9d294ff0361bd5912728fb64854ce5146188414d4e8402d4ba88ac20944e499e24be103853b4820433a99d6aa8e4e48bed5b3abcc";
+      sha512 = "41e686c0ae341a4f3b5c89c1c3f583b05d78fdb9b45f51b4791cb0b6e8d32b08fa4b1b98d76e9e41241e90ffd60a43d0a1d43a3a33a20d1f24c1a0efb4ad6f43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/mr/firefox-61.0b4.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "476e3031b7a850cd52f2f20ec712b1fd0f4f55dc74ac10985c5957ab74b303b1eb4cb00ed1303a820ad4a6cea1729d282794e9b8f6b425280a05b413d86f8975";
+      sha512 = "3ceed12270a4d9f8c705d6cabc11e362ed56c7ae9d8ec550abeb3fc1df1a727dd836ab53a9301ccb10ac4f6c0552f614452c23c19c5371b00e5eae85ccd16e72";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ms/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ms/firefox-61.0b4.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "25d07f7f5013a1bd7de9bf977a1b16d193446e0003000362073d26f982139ff8bf0d17990173e77b40a808f845fd590543b7ef1de5a41d3bacc9491438d4aa36";
+      sha512 = "e4efd20a943b934c304b8a1a873dcf70a8f48e5d5c95314c7ddff0c5030afa0d80868b6f1bad6dc553c93d28c219183edcc474ae6a9905c26b2c4bb2a10cf9b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/my/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/my/firefox-61.0b4.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "131dc61a6c8a07c593e304cb5c1c887794a597a3ed98ccee1188081da0002bb2ea29a946b12fce1ac7287c5df74864bd881e9f99c2c485b2fbf7684196489248";
+      sha512 = "7f9f8eba68930d62624321470066a25ddefa3c85df9791829633cbe7c23b928e1e00e7682d8d9d11added730be19087d68701ca428078fd3bbf21dcc69ef639a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nb-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/nb-NO/firefox-61.0b4.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "115698e54318f4107c565337c266109925310d79cfd2f1908fd5a6114128ffe827e8e81db630665907a942300664af2ece8cb6888be80f009d6fc2d8d065cdd3";
+      sha512 = "184fcfccde9ec2190ef34cdcdacb3781c7f4d003a79672b78729512be1b899138a10f45e4570b837d5b4e64a1db13c1fe3bb0f2ca16defb5315dd495b1dd18c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ne-NP/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ne-NP/firefox-61.0b4.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "b89572ed1e0620ec29a762e49394ebaebc98ec964a9d98e8896927eda35155403883e734880ffed51d13405641c569085824ec36356cb2c3e8d57090b5f0301a";
+      sha512 = "19cd13b90d7cc501d2198019d05d33ab8afda90cce2fb805648aa5be8100f0ff15f4a2898b33e3b2d2a39f847ab736b87a77d0f8edf64146a0a5efc18b38df9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/nl/firefox-61.0b4.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "4a62b79d27361b324269488d1dceb4405f469d8e9a5f4764cf46a2ca31561d759e3f63ba5c23b21b45a43e07181aabd06f01aa699b04b9d1b75f0ca338e161c1";
+      sha512 = "6f716a77ad36a1c73103cea5d0c3c7021bbf70e33cbdb4d7cbf4148036a2888ffa6fa64e7e386038ce247e53e3538538c3cede0e8f1d300b393343b32f59b5c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nn-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/nn-NO/firefox-61.0b4.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "d8407d6930a11e73e1338e13f980f7575df5233dccd633625175c21387c5c697c5ad3fca95db99d52b50248b257586145fac8d57ddcab8d4bb7dc97dd7dc6dbb";
+      sha512 = "6c44f966dd099fdc355245bfd96edc6749dfdac74ac711ede0bd770b43f154927d78dd8b3413ea70b3992a8a2271cd6e67895fcb2e9fc5fe0b4488c6ffcd1c98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/oc/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/oc/firefox-61.0b4.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "1e963bf3f340dba469ae928d87fae73c112be3d8df0bd5b0667c5d7ba3a140d919b96bee2cb1a40a235bc1b80a174ba8a8615dc4ffcfad156fe87e1da2ab0fed";
+      sha512 = "dad6e6c63936b40e5a05dbe7b0a8dd9dcdf9ed8b80b50963067dea80dbe4c95e13ca890f0b7c4e3c134c1a4db8252fb03bbf32534ffa74d6de1a7213a43d2143";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/or/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/or/firefox-61.0b4.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "60c29bd2eb3a4abb984d495ac7e1679a66e951022b975b57ce1f5c23db3f2c43363f22626842d0a2750b7275ddb711f7ff868ddb209d37f3d790460169c5ac29";
+      sha512 = "5c1fcdea8c87acb46d74c3fead0da078316f8fc5edb97a379b613c2ec992c24296dd7e83468472f7f453794f6079f485724d154ca70c87483f803b17bd770c32";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pa-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pa-IN/firefox-61.0b4.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "de2c7b09e0973a6b2c86bda0f5fe2a5e29b4a18fdb53cd73301a135fef2212c0fc792c532dda5131cc9a1ee2b097e9a40d5ff4fa4e07f8b640422f9bd2e14490";
+      sha512 = "9c60479466d6dee01492a04250f77dc496438ec8f2cf3888f504df20a014f0e614a3651dea6eb4617a8eb7ccceb04415377edf04e87fb6bc01eede0ca41cd195";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pl/firefox-61.0b4.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "2a999ee49e7152227bcc18fcb0c17047df73b27c6330eba701ce12c4283dcd7643d824310cde1bf7571da403e3d3e9db8c34ec04ece7a3e72aa55a8e21da483a";
+      sha512 = "cac19ecc04fe84e3056c77f6c7ab2e497671cbb5900be1d7f8d296599d0a8a892d557a13711a46b1a73fbb0e0d30dd51a70399dd08680e5e5b119a7bd6f9443c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pt-BR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pt-BR/firefox-61.0b4.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "c62b8aefcd8b5fe59d0e2e643a73b0f6e4c8e6334ba5c223d44e14bead88e81f3622b717afb5af24b7f3d668852572942d555e5a38a577c242534d4328269b68";
+      sha512 = "580fbe7a4ece0ebbf08a4642d83724735f2075bcdbfed5d9883e8a94fb5708bf2496bb72c5357c53d7db995e98db7636f4a72da8492607ad4df5c1699302e95b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pt-PT/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pt-PT/firefox-61.0b4.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "c0738d209d9686dbd28e8219fbb40d497ee418450210613749355c57a64578b5591a78f38b78bd3dc2d838e65738ae91d6c69a13d9eeff5e2721be46e7ebd66f";
+      sha512 = "6d64a54de0468261ad3ebdbd96b390dc26bd11167ce93450f651b20167fb3796fb4a30aa5fc5cbef2c48a48637a4bc4b5f79a40bddd2744c89038ba339814b61";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/rm/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/rm/firefox-61.0b4.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "925db7b71d25a8e1c5485c92a4c0ba420d541a5c8c919bfd55a7a40357e83ee9728488bfc38eab789ff205513110f6c8f5894ec02d9fc5f47f9ae829a34a71d9";
+      sha512 = "faf3cd4948bbbfef3ed8f78bec64ac2aecb27d9a6a2ca695cc0cf79d44eff57450aaa1aad25c65b6bf934df007674fb2e6e97979798990827e01c5e17bfd96a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ro/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ro/firefox-61.0b4.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "c718cee842c5bd456282b1daa7b697a7a1bd5eb63108a5ff63dc4dc8f4ce67fcf0b433e65b6128877636f8a2bcfb469d7340052a9347d3b43ab5d87c03b82b38";
+      sha512 = "563fb9c0b44eaf13a82d8e8ad6a4cf45e5fa5ace7797b774687a1ca779bd8c455719cfa1ff2ca567323d4b282135e9e30757be8d432386bd9875f4c32bfbe391";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ru/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ru/firefox-61.0b4.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "fb650b4ad152cf230c23a4c849671e2fc96982d01785261ac643375e51eda259a9ac725d668b6d7fb50d3db14e7a2dc26babe208774a37444ee25eedaeb8b414";
+      sha512 = "5598552aa4e7cc7e97f327343cd6e5b717b8aa5b1a80e8955f08c37cbd87c3baa6fbde9c1bdb8be41687fa89d0b93d2720fb106193ba50efbd9736ac47661845";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/si/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/si/firefox-61.0b4.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "f2fb270f51fe996b829e1d49bfed793ab6ef61bccedcc6f3cedf02b2a50aa214e2942c9f90676f3339de8aac977b561879376513c0815e1157c510ecad29f2d9";
+      sha512 = "0a5dfd926c217c84b5fb022eb9d60e12bd9869a5abe4c2d8a575f72c8b1bcd6bcfd91a40d2b41c9beed97e5611f400d99546db3bdfb2ab77267f0babf843b091";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sk/firefox-61.0b4.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "533bcb8ce4d54fec85f0c74e04c6ab6635ccdc462bbd80771919700220e2fa48a12e1d5afa684a2cf4d00bd892fb3ccf219dd288926a16c13eb79dd64b9c7bcf";
+      sha512 = "483faaf1444715cea3f576db1b90963da3fa5999545c16f66506f60659f803158c5080f513bcaa0d51de6c56dfcecc1cfdcc2d7675c26b1dccd31e6ac6fbb70a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sl/firefox-61.0b4.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "d0e3d28147a6ef4e33b25790c9c205016d7495c0342221dbe3e3c56cc7de34c8fb4f319fcc8ca39fe14365c2ebc44bef4571e42b9254b6f093ec3eaf4e28b3aa";
+      sha512 = "25b17017b66ad20c1a895819fbbf4b5d33b536a14991131af6be536033376e53373b82aac17137bb6599672c179de9e039a71f468450ff9fa370a971dbee4162";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/son/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/son/firefox-61.0b4.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "a883303cf4805a251344be37563ceb16197fe41c5120f549449e507383b0737bf8a7ffab58cce6c13e57432e4c452a8cea8abfe4e776cf962436621f16ab1692";
+      sha512 = "4334e40cbfe4c531f04362bce012e03428138ddf9dc94abb75a94b76c1ae8881e8552b82b3e7e608bfd7a4b8684f9ad3105d65ed7fc378865b003e25cc389b3d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sq/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sq/firefox-61.0b4.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "9b2cefd313e9bed5d21dd937c6427313cb186f268449521af18bb48077f241f2c7fcc2a62145287dbcc9ad3e6532beb46a58fe3a05c195ece2eb5c2b9be9a76c";
+      sha512 = "355f71742b7f7de9523c388d3debc116b79cda128f0da877401f9a664fe0985edeba82c9a1f3819a8b0132b20b7f596830c94b4d49f57f6b924ce07c5995e410";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sr/firefox-61.0b4.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "6da0c24c43ae42e1ee778ce6f190b3159824d16b9072f72af13b9a33e43bc08551b66e7f0f6f101c2845bbd8bc0b88603390205888b640a01c36a61925eddf35";
+      sha512 = "c095d671593b63b17bc48a0bfc1683b96e0a1590e15735194a2e8bd9180df7c6484165ffda4e2f328589f1afbc561d8ef3e79d1474c91734aa77ebe5d53c7a67";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sv-SE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sv-SE/firefox-61.0b4.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "17ec7de363cd11814d4de5df4c88350bca1a30033f98fdcd415c408f40b34aed5c0c10cfea0d94e1a31f0325878319b7b8cfdeb787bde0e65320f4d914c7a3dd";
+      sha512 = "d9a80a6e41703831cab25e9ae7237d4122dfaa5bf992faf5fd5ad16d9dc9b5c6ee5d1919b25b545c4a2a9b8f52838e5ffc3af39f69266f9a4629925be1aee424";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ta/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ta/firefox-61.0b4.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "821564902471cc3b36bc14a9f168262dee1b4e527445f93f8f8c39b7db2af71c80eb4637da2471247983c600c50ba44f6581d6fdf792ef5774fdb08bbe357aa4";
+      sha512 = "6da53d55c5ebc813b6c2ad8275745ee2d9b93374c1b6bbf4cfd28c490210a4828655ccffc9c37657892bad50c9b08c87ce43a587126ab58131a50217e626818a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/te/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/te/firefox-61.0b4.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "0757f19aab0c1b9fdc9d80e82fa5eedeb43e7302903add9b4c7f68e030de42527237d2f5d1b1b0fc7d88c3de670aef25c3014546e01783b65cc6b25fa8a75217";
+      sha512 = "75d23d05b365d2bd6e06a2c737c3febb7e45c0ee944e26da78f5bd247aeb5853e5abd1ae638f95bc124f3657b23d457c62b9a1595a11588cf13bbb8528ada3ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/th/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/th/firefox-61.0b4.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "811815fc732896e6e90a860647152c1c9196ad7280cf7274b8d224aa5ffff6ccee1c10c127d6750c4bf5b8ccef5659eebf43241db32b516ed1f95e3d2af99a52";
+      sha512 = "f43d0c98bd1af2e19c6723bc4a4c28dcf594bbb37ebed416d0493883a4389c79d47f6d63a844a3d2f1c6ae9a84670f059faa3ef3d5ed01ff4eeaee6573da7a76";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/tr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/tr/firefox-61.0b4.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "bc07e863014d7be3a783a90b4373794ce491b57fc47ceb55382c816cd47c8b19e9b71d209217ff4af79e0b333953c4b791025e3760c7a04d7f8d2c672d9e36f3";
+      sha512 = "a6ceb28b89763e46f19307cd6f384dff8c8d7b69a1c89b29a40653b88bf3ec13955247d565c72a0df47a7ab0e3bafabf45b59fc6a22fa3ac6dd3213d3629cd80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/uk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/uk/firefox-61.0b4.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "1d48c99480c0db287b4ac3b7f183a6b708b61b1ebeb542aac37133bcb3dce61aaa2ab38b4fcf08130ca068c79494f6e1896ed3f0d26d88ee364f5c48842d8ddd";
+      sha512 = "64332b903dec3002fdb99bc4c13821c830fa29db868c37d6eee4f26b46cbd5b6b2c2b6f9aa1b2cbf36e5a68b7a18ce068431f229182c8dd380847550845e54e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ur/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ur/firefox-61.0b4.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "ae2c95bcd342bf2362266e460cc6303653771926789cf3ae689bbef6bb4d59c24baa3537329315ecf91d7a483f1f97a961049c2e866112978602096470cd28d0";
+      sha512 = "796361fbbb849c1ebfd5e44d97443c151be90275d101c1e124def82073cbc9ec22ae4e88b1767896f4ee0edb6b1ae20de508df1fce99a0846b4388b768ca5c3b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/uz/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/uz/firefox-61.0b4.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "6c349ead6a53f417bb693dce2fc06664796a1781ec78a38e4b2df72505808cc63fdb5629a9264c9bc93c3a8f61be6a832b42a0a1ae56c38e064c61d105ecc09e";
+      sha512 = "2bd641e76281fe1740890ebe91a4d87326179d5b45683d5667d523d2ef3300213342ce027578a6c510b46939cfb5d1d3b25b671b17095c9cd22cc7a8b7920a42";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/vi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/vi/firefox-61.0b4.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "df4a98d33d15d1e4cd8fef2f5ef80c8db43a47c7715c4f5ef8c3a8e3afa7515193557c5a779dbd93b905ede42563d6c266506dc881bae5b534dd2f5d091f593f";
+      sha512 = "d6f14d45db8551005cd37e386bab3ba1cef2b58bc3b5925dcd7fcb83627823edb9f49ccab2e8092158b7ea83ad263cf01635c9d639873581558234d1d1664a69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/xh/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/xh/firefox-61.0b4.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "853dd4a017b7f53b32c08a3984ab3e0584ea461e3fccf18fafaa461ca07fa40450d248c9b5df38800c8978d2d74b024861ab11e385b6edd99fe6637c2af6fe1b";
+      sha512 = "0bcb49577f8063b2378e6434e41429205b6ecab7dbbddb071b5a32f40533c2c2c1eea65870cde99a760ed0be34b7ceee4ab2f1a2d5cbb8734dfe1fe176129991";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/zh-CN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/zh-CN/firefox-61.0b4.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "76f72bb1563001978c39de8b44a01167d1c8a4bbef7d6fa34f2f904ca039ccb00534e4856413fceb0e49d2afaba06d40ba7b92c8c2cf9cdf55412755dfd8382a";
+      sha512 = "d0eb45a490fd8306113176ad3c42b7e8ab317db4f9b9004c70206e0fc51c4fb84274ca7410732f2003afa058b7f2c8ae2d1b8ec52f58d96ed79a2210db23c7d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/zh-TW/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/zh-TW/firefox-61.0b4.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "df08afbc8bfa7d82d9ea2e5e212494198270cf9f401aeab34d31cd36df8311f92d8cba0cdf46d6f82afec42897a3ddbee0d949d73a17ae962efcee72be728d3e";
+      sha512 = "51f43754fe3840886a3e8ba195055bfc597eefab9f056ffef25974ebcbbb3b05ccef9b35c99af8b5021249cd076b10a5d40307fca31b18f1b7aa315f0a9e57f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ach/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ach/firefox-61.0b4.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9dcefe6cd21b403bf51a54addcbc4776db92aa1e722f592ed5bc2cb39a52a1255c88134500ae0905193dadec89147ff7bf95499180678177e29fc872bb71e5cd";
+      sha512 = "9787c6977c6d50b2c9b2f4a6bbb3ee43a5a8298858cafa24d4abe0bf6bbf1b78eabadfd5b27e69f9fe96269f7a530bc6d0ec0c7afcc6800d88841115c55e5fcc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/af/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/af/firefox-61.0b4.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "ec5a3058b71d81c2e30804942d8d39ecb2ed4f8cf801c0464993b4521ad5992dc9c6bc2aaa63b646f7202a19a4243e37f32e1af095827a63d7ec044e9c47754d";
+      sha512 = "61400c29445bd6d7c2b5040788dd6db236678c6fc4f9a7a23414f97757e70cb235ed6d8c39dd35dca66924f40e62c4c4460f3b11cb6da57e2b6928109c2a661a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/an/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/an/firefox-61.0b4.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "814de6c9e194b42d2d4b6f5f1c0b88d5bba4f64f92a4819f8fead0c3806c52a3b9d8bcafb11c02abaab6a37253fa27efefba5133587e60ec25b76c94a004fa35";
+      sha512 = "cb9dc92f0c490accb006e0fc6d44c37c415e8df5b06e97f0d004e53e5662391b09e0def195c6f5ed41b2c5803f966fb3a151f140e048ae12b2f7aa1ff537fab6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ar/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ar/firefox-61.0b4.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "ba5afe64785c45fcbc7577e519bd996dbc324cf1da87f0e3044db968f9e67d16cf2958346ece84b57bf34775b05f27cecdb6043bd09bbd594dbbc277624787ac";
+      sha512 = "fbb4af4bce19250e42e362c43ca68b00080020673691b3917ade54e35028908b8938b924a4a8d1b4823a24857c10324b171944caf21a16b0f1cdd6aef8478905";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/as/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/as/firefox-61.0b4.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "fdf9cefa473363a7bd7027b05f412a260aa69742743cd121900f1bc5f2ca45c45011d068a6db01b6c5849d53719beefa4da659aadf7116e9c2b17ea251188586";
+      sha512 = "5fe55f0ff65e819ee7ed194a0d2c7a0cfba052e7efc6fb813a6faca7370031d8a679beceefcac33edcf221de5a5701badcf29276b1f835c39eb8665207147297";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ast/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ast/firefox-61.0b4.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "f6236d368e813b3aa88847cea48510be3c2be2fb7ff054eff0c1458205db70f645d83f6ef20285f774686ade01f58751cb082fdb2dd632511089ef2c63209253";
+      sha512 = "129218d8d08c39e118a47497e38c3cc30fefddc6a08ea363a08341da4da85b1cf2070a86b34ffa75038b27366222c8d03489d3a4eb4be35e31500fd32d606ec7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/az/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/az/firefox-61.0b4.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "74658505a2462cfd26032a837db50bcdd092a927f8f8427bfa3182301f25a15da346091d73689ffcb0c0e7c59b154da343b7be917e1ef4e1761948bbfe1bcc7b";
+      sha512 = "b30d0836f1ef35ad01c929dd43688976a2fd9917d56ec99be65298ff2ea88b4608ff0b5e398fc016718c62aabe6373cd85394b1a9da927c539fc1999dd49659b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/be/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/be/firefox-61.0b4.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "c168ac1509e7fcd3715b8f1eea47c64999028256b442f11ebfacb7809d61553f251fb1e3fb80bbe4050c7fd0371e6f1a417b7fcb3eeefdd0b2e30e547da3b8a9";
+      sha512 = "7a3dd71f5e22c03b76290d34eab1dddb83662d80977c99580bd7abb1bf80f448a6b4a3b866a1656c0b51018b323c28f921a7489d7e10fa3ed2b092fd77463fb0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bg/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bg/firefox-61.0b4.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "a2440702f8382ff965b17641e9d9dbc6cfb4d536427f92f51a3b8df63ae61ec869760d6eaa38202a7f19acc0ebd6895f1c57a27a5ece8bd1f6a29781d5a298da";
+      sha512 = "48b75a86c8cd4d288ef7b39d2a2998ee01082db7c32767c0188d6d930362e0ddc391062d69b2dd420ade553d13145b0f11233f85e68de27469f287ec1a788b73";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bn-BD/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bn-BD/firefox-61.0b4.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "c1aa573de2ed71b85392bff6b8c9279633a142ce51bc26e690c02ed059f6f7db47cdde3fecff902617d27fecca1824b8ebad1b10a7889b918de2056991921c76";
+      sha512 = "065841bd9ce5877c7e7c9732eedc96a61c424ed7d1ad797ae8411f3ab8ed6d24f8490f067ad96d0ef77af3343a201e3cee8e31e6b9cb4589969afcea03fba6f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bn-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bn-IN/firefox-61.0b4.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "a728779adf7644f3fe8363080d93a8180ef2ba09fb78f0d05989fa57585f77897757c5b587a318886eb54d805ee8de625c7cbee44908badc14b47dfbe2dd2885";
+      sha512 = "7c11742660e36861c6acb0d4022feaaae13ac4d3ea3c3a8dd0ed0c8634c39bd4f36f893ffcaa8bc7170a03b69fe98b8a426722ac9d394a3b0ce6c3b5ba00036b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/br/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/br/firefox-61.0b4.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "5bf79cb726263b8aab120c6b826a09524594bfd8ab7c6464937d23f02e866e353cf8ce71adc8dcb621d6df71e4e7d9dc8d60eeba4023cc3d7c8358eae2058d40";
+      sha512 = "e3b15b6c19340b8be15c72c926759bece00e26a1ff82c5fb0ee7f6a92e59c075af3cee82285af7ea9eb666c087193d6b19048043ee84cd6fdb8749395785f3a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bs/firefox-61.0b4.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "84f717ea9067ea2ae636aa15fae1821e2660c84db5c6d3f1f656d9170312b31e44abcdaa1298a29adfed9b221e72301faf2fb1253672729c7fe7ce275cf37b45";
+      sha512 = "ad8ee06512e4f9a6354284548359c6f27915ab10d5ba171ca16ca2f928a4fd07a586d6db8923faeaba18c1c2e8f6d62a7db36bf124ec8d3e3e36879b131f2800";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ca/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ca/firefox-61.0b4.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "66a6ca250c2d916503b825c05dc108e865ef63aaa851a658198869a0fecbad3e31b7572873b2b39f53220c0c1472e30d5822700512675cc9b1df9cda782185de";
+      sha512 = "e34d1c3c85e41bb8d63df460390473ede1f5591b1c261edcdb15fc8e2b892b4899b82f5a7de77ebfdee54c1dec78108064c716d36c221cd856b98ae79f5f5e44";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cak/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/cak/firefox-61.0b4.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c953bde75215054be5be2364394aa89bebc4489dfd930ce1088ea770fe5b94ef9682f8a17065674dc674303a558dfbc77973c751b7e52d975b2138ba5be823cb";
+      sha512 = "53ecf3572525dbfb1af987ebdacb2b2e2a6a1e88ada6974f5f831abb9756059006f63b7980cd30d18ff1b803db395731f4efb4de4d8f6fcaf2d52cef3d37ef29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/cs/firefox-61.0b4.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "d2ef4e665ce29f2df4ea9a9322962bf934b4e8eb8f2396fe532e2873a68a3d7124c53f3afafc541ac67799f01b8e75595de849a2a7d5bb7f552e0893add7ffab";
+      sha512 = "58c6b6878e2d519527771ae44c1253625276382aaacae50bdde525ed3cba0c2fe92dfd38244e0e7eb12c60705388e1d8d1dbf69e7f5010113fb44d1a466d0089";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cy/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/cy/firefox-61.0b4.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "e5f8b77ca5fa59d5236984e6141b909e2d232a5d279a295eee7fb83eeadf17d0078c936d2c560bdd9ce9df5809b0138547946d9052842d93e699fb7ad7161062";
+      sha512 = "e1d0316ccf08dd913131fe2c0c7286d8bd0f76e95103c2b112bae5a93f85f2860848a4e1fd48360be941f6ac0204b9e9a5d47371b6a8b0a3960eafdfa9a32d52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/da/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/da/firefox-61.0b4.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "f241d4d26266231e063bd556d07b34477eb5d93452ce29a1c0518a5414eeba3398bfba5b6113a9c7cbc7ff3dc5371cd2eb470de4a00891a97a9e8f5a6ffb6d3c";
+      sha512 = "a8273ee29ed1614adcd45dbe5fc78959a8bc17629dd92b1019a4b017bb0cb49ad2e6a65fb361483ec88d0124880e8d8994c3cd502d6e2d2f8ba7aa67043a9c37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/de/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/de/firefox-61.0b4.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "2e72ba457794ae8c40f0cc84a7f8f4ec66a2157a61853fa9ac7fb088e9320b85ca6d2b32653266dd4042b786596b9e03abdaa8f3f26157d354c070e3bd3cce52";
+      sha512 = "6e81e858d7933940e6866142cea5ebf1c7009a018ca322ae35ca05c0813b82b19796ab445105c9b274431aded2713d25992fa91730e837335596a8f5ccc9e574";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/dsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/dsb/firefox-61.0b4.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "b3bfa0ebfe62ddaebaaa35a90e220e6092b269ade846a07f45f12ba78050ff1d9c430ae98c84467dcb4449eec93c8216aaf9046a40a74b23d289beef89c347af";
+      sha512 = "fa4e6ee982554045afcbe798a3113a4a1a5baadd0bf20b79d08186d781a739c9ac01bbdcad7c1e473844c997bfdab03feb590d133be5aba465eb737938f8ef5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/el/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/el/firefox-61.0b4.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "d85b8c718e82115f1d653e4cbaa87e5713dbf4046e7c81701b6d9f7d7d3020142de5ff181bb3a46916a65954a743716f0b2898d098b8b582a14703a7a0169abd";
+      sha512 = "3865e8d77801bebd4036a69e0d5a4e7f96e676808bf8379c3165142b42ed9e2f1eb4cdf9e3aa0c1a1688c2d882b72d49f2e8ba04c4ba31da3d31d2672ec897f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-GB/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/en-GB/firefox-61.0b4.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "ad456cf1fb209f0a7f3f567fb79684657074eaf9f40bfe46716e52c482fd3f6e63cd4ff2bccf9d47a2a70d59c02c1953ecd70eff89f95608c25caf100be31f02";
+      sha512 = "5133291dd265109496669babd12fa97685e83e7ed08b98b8fe202d2d8baba0f3fce4fafeb71a09d16ded277bb809600af792f2e8dde8a2418fd7bf28f993119c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-US/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/en-US/firefox-61.0b4.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "c70393c2ff8eb5bfaefc5bb646a327f685d16ddf5e9f6839d9d064fe51b51ef12e82716dc247fe9533f97bd33641d242049d1cb09130d29bd72faf497f989bad";
+      sha512 = "f2a9a678f3082f85848a87cf784e774f36e374a872103c0b324b1de755f02889e844a78c6faff30109b301e1729898826a779f1f690ff0757e02e9485f23aba6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-ZA/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/en-ZA/firefox-61.0b4.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "6a4260b28a9d3f1bf118f4e32a64395a636395a98e0cf33546530d3439d74bcb773dd4493c9634c16f455cd7d034235d2c1f06830371033940a8cceef7a786f3";
+      sha512 = "7f5560724d00f3dba6249e4c38d61701dcf3007d1e4a2521353be771eb50fa1937bdd346008c1b912723e17a6b13708b1d57d5b385cbb1eba4ed7438e2d64a50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/eo/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/eo/firefox-61.0b4.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "e0a0812ac3a24a0b9358f68a63d136b4dd0d140bd299bbc7b9b4c7a72e88c6ecbd149d1419478642b0b9bb662d625f9134febe5d6d210f9856fe99a6bd566832";
+      sha512 = "6be242be300413c2e9e96f233f651c19472934c63b7a850957b32316b5a387ec81f25e84a885b0796317ef1d5f413be7793f7bb98629ea4550d31d33f7c540ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-AR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-AR/firefox-61.0b4.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "171772bdf3fd38225db4f1dd0321f7c47101f804d94ad6b558423761ac0a3e464ff992b23e118c2ee05e053213ebf27807413007c5dab0bd9429e6612e52acc6";
+      sha512 = "59c78ef47c350d2afe16d2d135028a9831c5a8a458582e9909f5a9e3e13db8dc9bd102b46dec06c606ff1f74b3c1c410b1bd8df2c38cf3816817ca56c32d0ad2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-CL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-CL/firefox-61.0b4.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "c7f96bc59b36c6ba7c4cd1d2ad0ce4e572dd489edadd39690aadf4cbb7e4573353fd73cfff94b2defdb6923a8a23d1857ec16621130cc106bdb6000fc054f98e";
+      sha512 = "b969bb7762821084db87f0da0ca0898671dba0ee2deb7a134065ef607765cf40f9b4858edb198e044bc8520221511cb26a55254a4870f01bbc216704668c0deb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-ES/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-ES/firefox-61.0b4.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "b4f28a2c5b303af01f1fab300a3c09554496cdae9ea15a0a6ab816411e7493a8a8fac2360e12a39be050a8de9ff2bde5bc4f6f8e0b6dc25cd8adad49a0d7514f";
+      sha512 = "cea1b56365a4a6fffcbce53ad3540ec9dbc9faa01500f8924c67a25828ce14d03e3a9338900d1aa44bb1b17e913f58e5ae50d8027359f6070c947bd419cef075";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-MX/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-MX/firefox-61.0b4.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "d847c11a5f207a27221a6b022cbb78e770a6d060eeb05065bd770101bc0238c0309bf4aaa063d070e23c1e8ab8c955c4318c09215bec8184b279f653ea05838b";
+      sha512 = "864580e8940a5d6cee69c14b3483ebc27abe06cd441f322aef3102c5b38d87502f514a3f315e7bae6ded19ce2f0c8d31f59d654ff3b067226923cee70987412b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/et/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/et/firefox-61.0b4.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "9a0a608abdf8040be460483ce8c291eaa5cfa5ff719ac113c03bb1092ace9017f9beb10cc78edf8a6169452f6f46169673f856dd58f6d8eb7cdb49d9378c82cd";
+      sha512 = "cf7cb0590a7d2ecf6f2286c9b2c14935a44bfb546be69985c109948e610c5ba501a87c80c983e7646420f41be27e4d4bf329242e2557a3706a40d2254fceab34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/eu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/eu/firefox-61.0b4.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "ca8e503ae4c7e6e457dce0674116a9beaa6360ba50df5d97d0b56375794c940c91028bbc1424f5f7628a80560220a169c8a8ff59a3739e2555bd9b091842d7dd";
+      sha512 = "968fe509ae134626a51d066b2f054f604ba35d0d4ae48ccf3d56a76aa5a73c9af43660b88f90c650234987fd9b8ded64779675e18ba7b67876e87e91e2b119c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fa/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fa/firefox-61.0b4.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "842bf6fa0d8b6ad46a17e1f1d54207522cc6d65051138e73063fbc0c9623ef56d0861f524d441105ff606753e95a072124c3538dbf87ce333d22bdc1a448bc3f";
+      sha512 = "bb72ed23df33434b4a1ea1d141e4e918200285d0ac1491376c520b16436e1a22ca04d391c8fe22780aca312962807c165dd2aebced2c1a2db6de95c51ef15c10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ff/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ff/firefox-61.0b4.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "f83218ecd31e86ce402b47cd00abec4065355e64e9d884fb5aacbde86977cf8e0ead693fd939f27c735d74b8b483ec18d4b185d7023c2124993fc52109238234";
+      sha512 = "5d68fbc01a5d55309af596520097b863dc670b51daa48f0fc03a3bc593871b68fe67252774d7a52c71932a08d84d8faa2c42aba1f48b4d26f765fa34561b0c34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fi/firefox-61.0b4.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "5d00e98297f9a9d768467c981bd789fa15945a5c70ffcb2f402f68cf13efea72106de8aa947963d58e25365d17456538e6e76c8bf4ae62f8ea5c0aef0b4d109f";
+      sha512 = "eb669bc4c743e3b4ddc241ea101ce1ca7c0e68ea80046ba15c6001a90bbfe148561ebb8d32cc6d353ceae12772ac4ca600ef48f9ce3f4896b5a99842a0298829";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fr/firefox-61.0b4.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "a30c6c7d0f50cc1db0505ec34ae1d5714737305c3e8e1e1660b6f519aabb699ba2a2bb14ecb77e1deda1d30cfd50ee69de3a308be004ca6a4b9e6df50eeb94de";
+      sha512 = "bfad13dc2450ac4e486d3e2555d9056a8ca3442f2e215fcf27e86d3a70dc78b601c711f47a70e75f77098a2f4025d0c0b49a1a0e82d8635efd248ea8f2be2abc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fy-NL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fy-NL/firefox-61.0b4.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "9f3a5a32d4be8c9941293eb1d8c18968502eaa28fad44ae89df20c2170809b850a7a0460a95f6aa189c148c2c54a881ab138d12f3029f21a863c5307e4aa11e5";
+      sha512 = "9e9e7532aaa30467a080cbb7fea380ad25a244fc17f89bd0be04f73508163580b7fae1b6151ce6e451904cdcf04b389605883a937150cfbdba5b20e9521b5207";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ga-IE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ga-IE/firefox-61.0b4.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "93547d639642d8c0ed10f23344ea01a66b43f99ecdcdd7a0e2e1a9b2a895a1fc10b44231db8c6d948a19a84b820a8dbbaa9ecec4df0bfc4555cfa62385ece6f3";
+      sha512 = "580f5e6d0ebbb7baa80084472c3b89817c83a674dfb73f00949648d42c8c9c327dace1fc0162d389e06c347f0a0fade4fee906b80931217662d59f1f1515535d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gd/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gd/firefox-61.0b4.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "73c501b9a4a329acf953881a795444baf4291ca6dd152cc05c698f661b2ad1f979fa7f45f4cbd6abb6b79b6b41ca0079658d32c1b5cfb6dd166eff486f0ff067";
+      sha512 = "2499205db938c19f749dfa303e859084d6801f86a384a5e88be0e9e0900863e1970bb7314929ab8441944b8cd4fd23f2b487167c7803ee58ff4a50da4af371de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gl/firefox-61.0b4.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "b505c3ef839778b713c42ba61ab2616d389184e6268313537ec12e648c341c8ff57b739622ec118daaad900b54fb4f8eb57f43526f711f59f368db88f788aa51";
+      sha512 = "cca1a6adb4096f91abffbcbb1969322d8c60a53c0fefd8cb98bfac1c1c324134a7cbcea53fa15217f41b2c54893f1dd26e4dea2a0fbfec9bcd0d7dd928c1673c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gn/firefox-61.0b4.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "744247e1441b2c44cd427179e5008ec2a25bf4b6d4e3195c910e8943c76deabd63dd5ce5c5ce6de2968d5f00e67990d8fce2322d901d2a5bcba6b2fbfb4f51df";
+      sha512 = "8484312cd5f4d38babbaf2757f1b0548fa0a291c1de76e751bf0235b67f1fdacc5f3c6e4d54729a91fe9f5451c527972346d36adc0d80bbd110ea1c0a0025b85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gu-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gu-IN/firefox-61.0b4.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "1784177b07a777972dbbe14b259af9c0f5e4e8453d82ed0a9dfc7c0f548f6909cd9a986b4a03c2c40a5d1e88bcaea32c75909e5f085c652637512e8cc56ce38e";
+      sha512 = "019deda9993a2d02cec8577f5542cfe247c04a4c0a7c7d6faf65cefb1a8338ed86e24e51c74e6ba30a4f5b6e644655de9df1c99584172ea51e07eafddad65f6c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/he/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/he/firefox-61.0b4.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "7a56deb3e7014ab4ed95f70e537c1613fdbca8a0a538820f903808e8d881a7259033ec6d0c8512ee17dca4b55dd5bf54789be78a6018f6c21f5176e7d9cef09e";
+      sha512 = "7a5285965e37b112803f0b533c8ba501ca70a9fd09ffd1e83e630174c4966a21d53f6c6054e7b60b76818acd47813a2062fa9f986d11d78c714c127b0864de58";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hi-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hi-IN/firefox-61.0b4.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "d47f44b37418d61131cf1b804e2914b6dbfcb8bb30efa771d2d41d0e3768e20660bc4c8c3b36b1611ea3e992825cbb9548a4c3b975578d6c218fe10f743d37a2";
+      sha512 = "6bbc86f071ff51ef1cd4aea468ec2165a6ca991ecef2524bcedc0ed3d25c7b3e0729dbbfe5df3c236d14d996629824486f064d554a0eb5f89f46d69f3a8d61a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hr/firefox-61.0b4.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "8e9229d45bd3484c76fcabfa66845b41de87b33c1dafadc9a06ff6d36396cdd9a1d5d86a7e85728b9b658c39197962f20f374453c594cb92b82f0a14536522be";
+      sha512 = "924ff70afb07ee9379c202bb684e7ef85d0793fdaabedde7c8889c0eb798c64cb7fd5a309a03abd94cb56e4a194d9b7b9f7a212abef4ed314d1b79ef4c8f0433";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hsb/firefox-61.0b4.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "f656f3bbc00dd0c3c4a0a9c4a7d5d74f2049c343284b891ea455ac093f15ef24bcb4acb244213516272b730cd42798115ce3e9013cc7ac6bcd648e97aaf6ef3b";
+      sha512 = "4e6fa9f275896bc32e426b91aa5b26867a27f52dd767e030872ca365ba56a57fc4a0df7ab877c282113333d94ac3a1ba0159fe8563f45d01650fa595568bad38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hu/firefox-61.0b4.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "de412f63269b4e89bea1fc854c9a0ac9f37ef73d19ec900f32aef0fb444fb49daac0bb2e1df9ad01ec01810f64eb8f9d96d17816e7f062f5f3a324406a863efe";
+      sha512 = "13593a85271fe064f0d201d14fcb830ae2f9ceb965b4b3ed1f3a7f7c9a7a6b889bedf551bbae07a385b9ff97a3d79e0f9081b1746d00c827af3c2c20092fe965";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hy-AM/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hy-AM/firefox-61.0b4.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "5b6a9f82c85318e21a4a4bb44e74db28e690372d3fd93c8ad8ab4db8b1efcd9014fe365df1c95cae4ab4e7a3abde9ab4dc8873e8d9440c3a5716cce8b38407c4";
+      sha512 = "a8357f7eb7ab322a1a5552a8852772ecc8bc36f8509d1f165aa226442c67d00649aac802ba405e1ae722c957b6c3f6fd7c2d546db2968f28bcc2c9a7e9fa7ec9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ia/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ia/firefox-61.0b4.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "8a44046e7a0c0345575fd9b715dddfb88bff2cae6b674421724056e9142570b3499c645691c4c0bf37cb4ed59026a6e4827801b32fc865e6e2f9ed7653e13c30";
+      sha512 = "b370703f8984192be45b07e30b0737ab296494aae0a9a5f3f31f276beb9548dcea441aa245cb1e12ed04fa9ae11d2f00a699483e02f8f47f35db625faecb1f2a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/id/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/id/firefox-61.0b4.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "57dd98bc122a433f4f2bc0a07d167344087a26bc7dbf728a9d9770b61b108f953826d88889e73c2c6599fba5edfeeca3dd6eee2377faab254bd7f741ae30939b";
+      sha512 = "e8bf96e09bd1c919848fe86b87769fd7d60086919f71b1f92896c6d785206c9fda2e7cc57aa79234765fe55b29575135d05db4181155b8e7607c28d3ad92fa4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/is/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/is/firefox-61.0b4.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "58e47133a1a1e018ef4eb64cf099abc7676a63d3edc86024d024ce3e95e2c007e37480dd9e015bf45fa7c53fc46f9ee95214199d25cf57dce8dbac6a56356c22";
+      sha512 = "9668851619bb97b32d043032931bb0a0f1df8f9cfc35a308594983a32de504a6a64830d265b46bdb30a23c58fbd4c7e6571a042e44382930d183849880c1ba3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/it/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/it/firefox-61.0b4.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "7825ff6f4f2645e4577dc472cba3e4cb0cbd8f7881671f99f48df03fd509489ae74c000705b212fd5033b7da7345b09aafd68171009f5ebc40753f7da43e36de";
+      sha512 = "fccd8388e7466ed46aae6d157f3baef23d742ec797fa26a7cc861da97f19650e09f8ba5e94aa9f9ac779555a1c7873e0aaecdc9bb691af773767b55ee0b820b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ja/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ja/firefox-61.0b4.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "0401f4890ba1f21c7dc1139046f0aa6e218891c69de964c7e0ea32c50ace9cf743990548b6d544c8047719b189f4af4594231c2c30abc48a8dbb888c9f6ff339";
+      sha512 = "6d8bb09d098b94be37d41d73a6587885240f15b83094714adfbac8ed595f3de4ecc78de82b5516270b57ca093439209a3093b2e737b2d773984cc3a28e8e27b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ka/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ka/firefox-61.0b4.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "f54ca89091125043d38ce7a197ea2e1675cd3f308ca0f93b0d57cd1ad8e341e2f8fc41dba925c85c12947cce4cc4ebae13e248a48fe5fb229e4e06e4ed0e1436";
+      sha512 = "902e6cec903dffa2e3227f8cf67b472857145bfca6e228a896f14fb347707b753beef3a2836be90e0a17161248adb7b916b2dc9dbf4f780989a09bfba757b5d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kab/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/kab/firefox-61.0b4.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "c6aeb9254c51fcaaeeabb973ba7c6b7cbbdf1547300b8149abac8b35bf9d319a3d1efd7a9d252b23d6fdcfffe0f311014c17c475b27bfedc15798fdd8fa08fc1";
+      sha512 = "7ac062a6523a91dff3573a9f8b664ed85877ba1d192baa196cac1e3576ca285c2368d1d5582a439b5693cffcddbc08b35ad093d322eba7dd8181c4ab797c4ebb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/kk/firefox-61.0b4.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "f3451dc01dad8018b4709a6af7c8829d41ee3de4e028b3529be556480e0c5a48b257dc33ada9527b88550b2f68985bb71b1fe7cb6fb84e505ef3165a58d94c1a";
+      sha512 = "83ba96c3675c4cdeb9a7c661c73314485430058280118ecaf2135318c238ec78ad88e6e09e2c7cb4c43f4e9dbada55cf010301b2b1b6d1b49355039e6bad9763";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/km/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/km/firefox-61.0b4.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "3364456a57641e1bb20bc2255c0eeced49b67043eafef74867fdffb6e6abc3eeb3871159859bbd9ff4aa823f8060409db068fbe2f44a16c09ec2170a6b8f858b";
+      sha512 = "71716deb9304033c46b72a277aadbdeea99fa936fe63830df79fad5e7a79f76eb9527cfd38da5ece4511fe19fdfc32eb301877a26d590b20d3c3c051bece2496";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/kn/firefox-61.0b4.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "e206b0ff442462a150b60a72ed29653e64e2d277d887e622f31fddf2332cef1f75b6d6ddc27bd9c5dc89bfd87b67ce3fed72491e4d29a77809f4f901a2e87c18";
+      sha512 = "2f296eead5f73a279309d68aa6d7fcd433bf133861f158cf6c24a766f28d902d00e3ecc25df07d51794706461bbf2bafb4228dd61cc3dfa3baecbbc4f967ee12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ko/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ko/firefox-61.0b4.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "a0873fc6ed8c69e205d4c01783ecabbc403317d94ea7fd21077e00f8cdc264424c00e32b6dd27202b2d6ed8ac08299eb6693a38c288cf9b9a24c722745ab0eb9";
+      sha512 = "51f4b2409f822b1ae357f194fb308e35f6436dc0319629a436c03b789373887eb0cf6f8ec2d11c005f7d63a79dfb035e8661d7833cac083648def49d1fb1acf3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lij/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/lij/firefox-61.0b4.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "95183a50d86bd9463ae2ceff374c2c16d563cde9c2bd7395ac900195fc7f663239289baea37ecf9941abd0d8b43b5c63214fd40b8eade0419e2ffef2aad51095";
+      sha512 = "19a2b183bd086aa57e5dda573e422e3721fdead13b0ffe62beaa1ec437544e6138747a5ac22d990c772bc75b58cfd69cfb218f518a6fe01c3fd375ecf7ca6373";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lt/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/lt/firefox-61.0b4.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "758cf8c198165c0579207ad8d67d998eaa81c32a8ddd269ce1c76a05082349cdfe38c0fd969188e7d4e86eb128b88cf88daa9e3c283820311972773b075bda10";
+      sha512 = "36ae93add3821233d16fb3f9baeffcbbb061f77824f5030043f1f9b3222e7612afa227022ff7ebf05ea5760dce1e727777f148c77d1eb2e4ba2e0bf35adb4911";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lv/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/lv/firefox-61.0b4.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b38a18191221d6fdf1386c72ec07e198d10dfb2cb33bca34aa5d960f5c7be2ae61fb543409559e3308db188ec949261eac4949391f8b699f63948fe3177a2ec7";
+      sha512 = "a3474036735619ef1ba34caff598f17572b32ec1138b2535983055dae6b4969428ce634930e2805b25d5b5a56a731831d681f12a6506429fbe1149e8cf57e8c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mai/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/mai/firefox-61.0b4.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "f0b09948695397b53cb3fc500d6ae47aabc4f84da9314867816e2c4f21e4228e601731756b1b87253d2a2d5f6057fa115bf667d115de5d54ef4baa1a5dc181e5";
+      sha512 = "185f3e1953c05a496dac5027e899054ed376a09ad0c08c88f183c4f91b7210b4244ebdbfa224ab88f7e695998faf50899551379b30e7ad04ceb2c9938099df4f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/mk/firefox-61.0b4.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "46ef2273ff40e516c9deabe4b42bbb57abbc813a6717b0ecde42720e9d54ef3b332df05f48a5db516f8030aa984bbb0d91afbe3f0b84c604f9d106c39e124bde";
+      sha512 = "4c04cd14c893461ff87ddf5a17955c5a80eb5e9ce929aa6a37204530f1fc10f359e9af451918f98d30fce80f595a4f14498e26c07b48ad0dee6b3720f72842f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ml/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ml/firefox-61.0b4.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "43a1803e07b496571f35e005b8ba0adfd9281c9c907b00b92bd0fcf37e9b4c8236af90d145456725feaf3ef2c7baa12f9e5651e88a239795d90cb401079ca4d4";
+      sha512 = "304abcd82e0bd2e0f0e2cb639558340f3424be9485ee9378aa8d59db49aea096013798132df26d14c0fe83529b211ab40c5b708ac62f117969a59d0516f2a3d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/mr/firefox-61.0b4.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "4a79bd0bb319c8851828a4a395d7a3f12df8ac812582048758ab007a61ec656785322687dadc46b023caf6fdde6226b25fb31e2c08ced97e73832517196c5b1e";
+      sha512 = "2f05f7cf18e4de46cbeca27910bff036ff34c4564f5ab66c4830f2e8c6a2d016fc87d700d2085141e01fac19a0226f27b0ab467f4a4146c1a6bb54fa549030e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ms/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ms/firefox-61.0b4.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "5c5c465daedb590f848415ac1781909d3645a3634da35ffe76c8e91b9a154f3f848efe23f348e0da4e2e7b79d92b41f98988fb68e59b54103ddcde913a7c8cb0";
+      sha512 = "767328afb8582def36c31911e5bb798acd19b2b47603decf6e21772626e0ba1fd139f9a79c2bd6a79f56b84480f2ec3564506db84841a6bbaeb95041d4b192e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/my/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/my/firefox-61.0b4.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "338af2c5ff8fc81401cbdd4559b8371bc18a77f07c28c87d71da2d4a164a697aa6f4651e631a507c94adb962059dd6ce772d78d75b2b9224e22e555687422b9a";
+      sha512 = "f68de98e766df5192a266dbfe9d9cd167d6ed4f3976ab58e768f8a6939d36f6903004e6bf0e09b8304a4a30cc0b36c084fb75eaaf9084804cae318727796c4ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nb-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/nb-NO/firefox-61.0b4.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "95c2dcf9a5f9abd0c2f12e9a40f9f0828a1f05c20b981d0b6c66d85b6e57c689fc443e8ca7504f592baf2e89dceb7e01c0aa9bf34fc06165bb1dcdeeaf5062bd";
+      sha512 = "fb1a96d11944441f8e7e74c8efd55d59d11ab3c38f446dd8ead4729346a0d8030c3e801debf517746fb78f338af0a178d45045e31d8178fbc1a1d9704c33f1c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ne-NP/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ne-NP/firefox-61.0b4.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "89c255dd709b9215d2fc933b6d09b0205495455ceceff96dcb9e2ea5b12c98b9fda258aaa12f5aa0a1806067cef1a8434c865c0d7a53c039b1612e0c8d548aa0";
+      sha512 = "e4764fa38c66196bbd7034bdc7216ce43b9d4d0ad550fb1faf89a0b030f3781605766d0ee95b67255656b1eba40825def39a25cd059e74bac558af511cbc6e1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/nl/firefox-61.0b4.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "39e6043e5caff0925e1f9d475c3a3e1281023336eb79cdfece1a8a5a73d973589258719b517cd6686cfd69400eeedc7b744287286e055e4cbdcb188818c3e94a";
+      sha512 = "8177521f43ad209734de5903746c366b08aed805067b0a195fa19c8d134527f8ef4226b79be8f603e96c451816511e2a38961e694e0a284ab54f272bd93b80ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nn-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/nn-NO/firefox-61.0b4.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "570fbffe7e1b70cfc0613e4b230e3dc0bace2225bf52b9b5ddea4812d1a9795aa385ff97e2471209e9a6aa3c5c03fa861741bc8f4dc499a2cd3ffe5cfffa0c0e";
+      sha512 = "a62c38672ff3ee43cafa8d3b8f03429414578f0a1bbe2cc39e3fc8dddd5edb430d6f12ea6fd40811e382694f925650224d7a59f27b3d5cb817e0e51f77c3c918";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/oc/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/oc/firefox-61.0b4.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "bb58207314655f500418321d6c04f9849a6263495b0406ad0ae53b43de395dec471ca401dfadd157307d942da3cfd94df8f112cdd4aa37ed249920fc64c8d4a7";
+      sha512 = "8d406f76157a5b8890a7d6b1bc0bdb820acde82b29aa4798d7020e140b336796e0ba309186044de42ac6efd3bb66b9ad8b9f56104376d81e3b0277354cca6aba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/or/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/or/firefox-61.0b4.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "744a0b481604d7f5ce312f0d9cd979e768e5c53c4b251bf3e9e6d97c67450d951bcd5bf4f4e38e830a17a08e6fc98aee30fc862db27013909592ea1e953a57dd";
+      sha512 = "2c23189d5342608f39d05342d9070094e2485bb11067e436da5aab307bcfbc6e4c92ea9ae28f4cc707b6171e2f708c9f0e6aa8e0e32afbfab592f45766c5f642";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pa-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pa-IN/firefox-61.0b4.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "baa1bbbc3c813a168b742a4b20c209c66bdba60b799cc307b99bf08e8975c72deebd5ae6a9aad53d7172305eb2a09cc6292d9f9533f3318de4061a8744e9686e";
+      sha512 = "6c586e3c9e7c4b10505fd5ba37ff4188415e1566b456f6c929b060e44f09151b9ef9bbe9f3bbacc36533ff6789805b9e007c7a32148e9c9517053ab4e20f2225";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pl/firefox-61.0b4.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "06840fb56bebc72b391907853474b29104107d7b7e2ee719ba48a2197cb166507f95d69ff215f29cfb806350e588c84d5f289460ae8743ba03c7d6c212b91b0d";
+      sha512 = "d26f54ffafeeff89e91e826614b4f55c8a78cc8a149845c5700fb024e20defdae937a2a9dd75d0a156932a9b7a13f5b39666051cbe8b50827e057400b8eab244";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pt-BR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pt-BR/firefox-61.0b4.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "48e4c56091a1cece6ac3f93e769760b71b8e79cf223ead1f2ed4ac3de89c309cf50bf9a6e86c9b7a22b8d84befee91d65d909c1fa2bba8b04cc7502dd0a57e5a";
+      sha512 = "8ec8ad7a5bbcfb9c020511915c07fe891ebf3e7f88977bd8a03e3a9020f9293122f6d3a6d257fd2867a34ed257e74d85f87e65490e037d28d5eec37d97ba0cb2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pt-PT/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pt-PT/firefox-61.0b4.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "8a1af26ab745b2efd03ea44a850cdc8a9f2e4259de8c568db40e54fcf57d902b898eaa7240a5d2621a7f456a8ec717875d1a2e4abe4f8a0c67e9bcd1bd9b4d77";
+      sha512 = "0ff4e05427926f408ed4310d63e01b46ce3b7ca618336faa289666924a203641102c02ddc3b171b9ce964bd7e7fb260a365ed1ba44c37e837a14df3c0bde7c25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/rm/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/rm/firefox-61.0b4.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "784a233f3098ca62ba0edc67a27af8fceb49f778f500c825cbca54c595d9c5f4a918a16c9bc6d121838981dc006a28bf53d3e3e0531861f261f8ffeb638c0ee5";
+      sha512 = "13465556af41b81d328b98a38361534dc4a4f9151b17fac0d20121cda3e4d5d2c21580ee7f1e966fda8e910dd26647806159bb7f556509a13dd456e22509e44b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ro/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ro/firefox-61.0b4.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "a585d1c972a039f82fb69268f4a7a6daa9bcab77db9d045720f5a98cd788ee1be0128bb9f112098536975cfc9533d369e6b6b0ccbe5a1e43e93406eff45da5cc";
+      sha512 = "1c54f88ed76c1c9f3863e67e4088e823dbd80c3e696d3b480a7bf15022b5abcde86b10953df18ba667d0cf9c5a264c4b8e59cb1d6031e937562c6fa207071013";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ru/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ru/firefox-61.0b4.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "93d5fd02be91c5e9b0304badbbe360b8755eb5e383168555712ab316ac353c2c8853a9f34ab1a028ede4f31b6b49499c5c31a0e992a0e349b6eafe6fe523285f";
+      sha512 = "4583bc0174b8e7b98f882571bdf0d9502cbeb5c2e4a44473229653c383df30b78beeab446d299d465425c7c8106642b6ad0672a436a9f74c76a3d4e131bf645c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/si/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/si/firefox-61.0b4.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "d5e197e5727cdec1d83b05a823e4379fa229673adb3d3c2c0125b028cc229747302de8f423bc0972190e01a5658f843c1baf3e1bbc268d541dc07889e8c8ef62";
+      sha512 = "66acf2ae9e2db8702085154883a6412ad1b15dd830b7297a1bf489a0b173884d54497ed5a91cdc1e11e179f8abaa0ce8cf2953a180febd3b6e5059468b2fb496";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sk/firefox-61.0b4.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "6b285afe17533f9cff61eb7001b5099128bf475a999a393d21f94f6ef734b123824bd5fd6d3fc77437943145865cfbf3469b23104bcb509707594c1a5a718960";
+      sha512 = "61837b2d91606c1d6c54e7e955843f1914bac69cdbd99558a25520c05a0a0c45b80a90cbee17d30f272cd969e352f6e6511cbfdb0734694eb7409f603a7c8114";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sl/firefox-61.0b4.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "b14bf0b48de19048a6c8188ff064e4012055d3b6ff21eeac10a19c03b6aa85208e7dcc1f2fd28a01b6ffe87eecc968d62082e7fa5ae9b2e5391730fb794e8a97";
+      sha512 = "2d8b99bae7442394760fc1100456d2bef3f65532217cc554e2c064622d7e1b56de1ee96114b7f31c7098afec3770a8ff4f7bc7b64c2cd4b72b2f41ff2a80ba89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/son/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/son/firefox-61.0b4.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "771e77e3533c9273ccc08cd88dcda7a07cbf89cd1b5939daceebd24944b3c336c7c203ca1b0d1f7ea2236775099b0edf91d75064b07e4ca76c1bc7eb3b5bb816";
+      sha512 = "5850028adba338641444a2fd62bceda5f03048321f70b3ebc090d362541b23e4900a2a37d5fd4f22ffeed422a63b7fe640e7aec829610397f2635de1e75ec1fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sq/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sq/firefox-61.0b4.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "75da529909fc77d0ad288f63d0e89103d63ce3f815eb8d713b43b712e122255ee4dcc059276dc8c53abb64693de650c8674302987999be5155c19001d8e95ed2";
+      sha512 = "6028d2498f800e0179b2102fe90d8217f719b9c00aad1e03ce8f5e593fab2467c628b2f9a60e643348f567c242bd6e2b600d989dafb1a664ace0d0aee2fa8372";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sr/firefox-61.0b4.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "a6ebf4ecaddbb57cca585eb0d2883336b98a0c1c7249e2db78a8f2042140d2d01c787444331f5c9d98efc7fc4b5ccf63ff50c4214263ce242b9c37c943a6079b";
+      sha512 = "3cd1bdc2a7536b5416e81b8e20617de047907a7a7b80c9c3bf2fd1defb5440be72f2102d28159b1b8133f2b2669fbfa765afbe999936ab7ea4d1fb8188960037";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sv-SE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sv-SE/firefox-61.0b4.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "e6bddf3f932171acd6560bb3a69129f71db73805dcbf01743940d652613ac4cc40875c684cb8ca46b6fd0b2baaf05710e18f1457ec41e9fe4fec08b7dad6193d";
+      sha512 = "d9be8928075973a22a15c2ea9fbb10968e5189fe34b13924ad6c33742e17c9b6c493d484024e3a1d3b1529826f129aa308e13549675560fee80244f98bafb04c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ta/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ta/firefox-61.0b4.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "863142d61d13085023eed212bc8fd24ef919e22141a560e06deb78b61a822c3af0d9f38c2dfe1574e80f04942682aa1bc0c10361c08e781dcf1ad8b4ef13b108";
+      sha512 = "86921b7228c6f2b2aedb68299ac21e22c82ad4fd5b55e428dae00e29f69721dff52060792b396a0f43b3ad6a571d977c87f7f3d420b52e665fff42e1daec95c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/te/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/te/firefox-61.0b4.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "40eb771258cfffb080462e465dc0daa0b6a3bae27ef6b5cf3e8b9e1fdec47ebc7c00f8af392a421971d2e3463456839d3fd0a5fb50d7226e5e27e3346a32b828";
+      sha512 = "fc2847ae6864ad852791edeb2d2228a1d5484052c87966c9b29b3471218366d74f53dca4b0564f2206134ccfb5bbb39fddd6b44fb6b53ea7ef1acb7949668aef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/th/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/th/firefox-61.0b4.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "08426effef46a0b26a35dd0bd37d5021a1968d2a7edfa7617e44bd561502722dc7a98c7fd63be853dc21c29241f0767a7ef31e07d3e8ba1241adc9537edc26d2";
+      sha512 = "61e412edeb4bba9c00cb853cf953c61c5e669b2655d08990aedc4388ce3a836405b0cc805a6c4b5e6041f6f1657c3586252803338f85e9f1c2902ef1187802e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/tr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/tr/firefox-61.0b4.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "c86de3b4b96d3520e7c4483e86aacaa1c3c56f524ac37dbfa7558a372c12130ff2b55a89bcebf3fc48d361a9e5204c059dd5ce70ca04343ae913b565eb4f193a";
+      sha512 = "c0e9cdb54766e2e05bd124a71d68b8023834ed8c701b721658bd43e27b17805c17a378f645a53710ea800752149d7930fff14050604ddcf6825147347a56ac6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/uk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/uk/firefox-61.0b4.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "2445e60d7dc548e1da0b79c4518bbf1aa16777ce1e944d8c70599c3c78ab9c4ae24a3c58c7c02734b0d0bf4f4bfe0a777671b82857a95dda69b8d584e6b77a54";
+      sha512 = "b8fe37b1922275e2bb717dac3ab24f5872bd1b15d48120504b018b28319956ba6a4d4587a9d87b128d7420fcf19fa09c0821fbce21d0136b35882aa3e2586e3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ur/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ur/firefox-61.0b4.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "c69f7306906fdb8f7757e2e814103467c859aa7da852e3a2e77a8b10d37d327b78ae79fd0e9170593bf82e1975126efb6296a48683e30474bc43fbe026cea046";
+      sha512 = "fdf65d54545271e79b118787a28a903b130c17569cc763d495c62150949cda4dcc6c1697fde0d038229a7cdd8c99f2d43dc530844f2ae1b75f87512901c763d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/uz/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/uz/firefox-61.0b4.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "b550a887851e2efa5c31da29b83b4152faac726bf64c2fc334ebb72b2fdfc8e74ef6ef2471e431a0efcf2491c22b0c98dd43d1d41373425b0e70216f6a58ada5";
+      sha512 = "caa53302be25bef37d7a40e3853cb175eb68a828abfc1e1f8562cd69312f785b9e7e853dbe796c758e01fa92129937f0625c7eae3aed07690395a92ab845d3c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/vi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/vi/firefox-61.0b4.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "0b84043d07e62e5a7ba38a769f9949cef05cde65852e90b21e27a09b3d40fbfcbee66c74dbb50e463b3f01e3a07b1c137496feae1856c1c3ba2f4c27ee17b3a5";
+      sha512 = "cfad4746a9357219a29f9d55e455e11e7d3c49a8d231ed18b64e728edb44ea3f5200bccd8b2115bc1e00cefb73a5a74af4f9a23aae4ded7f29d8f04678ee9f28";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/xh/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/xh/firefox-61.0b4.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "bedfadc5e0c075c284f33a5463b207fd5056117c8de9b5d0b89134be6a5489a43c95e2e741688026b21b09f3e95d3216361bbf767533173d23d5b394025ea82a";
+      sha512 = "a17d844b4ad6498c7b7c937d674f2129ad365c59a7178b9ed51cbcab6695f08746949b485c02bfcc72916a0a37b138aa9fa651897a5719504050783901f78ba9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/zh-CN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/zh-CN/firefox-61.0b4.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "3a6f79a49f183e920740d306483c697ce4b315b5a25e06c2b74faff74082d632078997f78caacbfdf7b97f598d1510fe1ad4f7a0c57e7eebbf543a263f46f279";
+      sha512 = "1a2ff744cac644e67aecaf838f5050324dfe4101842820fe847e86e55c3d711f661b59ceac1e7c3fe3d648576a93591951a74be5696c820956ba712418c3c52d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/zh-TW/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/zh-TW/firefox-61.0b4.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "c445fa9f12599a11aa5c13f5c88e5a510ac4ba99e852976504c5030008193e00194603971e1f4078d8e370f74bd3134b3702a5c97be3e6a0e4fb841e24b609e7";
+      sha512 = "86e03ba89c9918542305d35d18aff083a8e618e741dead7f11d7a01a05ff5addabf8fad060112b6c2cd5ef0ef7b3389fdf02cda4c65370449b2f4049049407a4";
     }
     ];
 }
-- 
GitLab


From 75305528ab1d7cc9ae1e180173436e12b6c7fd80 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sun, 13 May 2018 12:35:11 +0800
Subject: [PATCH 0683/1085] firefox-beta-bin: 60.0b8 -> 61.0b4

---
 .../browsers/firefox-bin/beta_sources.nix     | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index d8afbf9aa19..2ac0e9c1b26 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0b8";
+  version = "61.0b4";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ach/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ach/firefox-61.0b4.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "f45033523be148f3cf43d800ec7186791045104eba8c6eb10bb427a5048e826152c4d129bf97a4efda41281b5854643f239b9a124b488740c1cd2bc55acb2504";
+      sha512 = "1253b49fcb5705c5f35ba972ef6949cc9be52b0b509c15f1ad3197918cade88df3a69c6dcd1ba32fcaecf5485d0e614b008a1e05adb5c0675de50345cb2ef7bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/af/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/af/firefox-61.0b4.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "8d4ca433ad148cd3ac62cb142009a64c8aa09e49d04a060040d42c9e5720ec3619f1896a7b2e91f9bc0f4a78be0dbfa30fef7f19c233b78228413335cbfc9a93";
+      sha512 = "0668158d59973ebc1a6701066bd736304e8cb8d41095aef296b0a807eb0baf23edb1e399605c097dbfddbdbec191ad570d56a92e40edf4801cd2e857d03fc8e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/an/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/an/firefox-61.0b4.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "16d132420f991376b3dc15d43f118aa12d1d617cadb65d16d645b1a82a65cc7a17a4fa36a03a4280a6e6c3d05d5f4c6d97d5f1df24fbb4d6420a16d271dffcd1";
+      sha512 = "97f9ea677bd851dfe37d5d4f1fa54f0286f5245a7f13924bbd576a1c6ac19f14c96937e78c3c05e3f13cea146ab91d4e36c8501cda2026663f09536e12e5af80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ar/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ar/firefox-61.0b4.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "2a362ddb4a263a228b93494b8b39071b85cdf05264ef1541df5dd75a84f7d7391b0d68c19e76ee68fb0a4cab7e4de6c1b39d2f97f8f16e6d7c06ad1b630562c8";
+      sha512 = "85dc5ce10e6aa418d5f035a53cc392230010a89a3994579d40b926d5e2d1ccd41ff14bf86f634212c49ed2c24a10558e449fd82836deee2002039330b1b5baf4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/as/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/as/firefox-61.0b4.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "b9172bb80eec38221065e89e0e244c1a93f52e2a5754c0b0d93e78b338783188460fdb4aad13eb69a205f7af1b831451f07b19a9633ab1737e1d48e88108647c";
+      sha512 = "58d67ff5acacc6458d3ea24d017185a44072d2552e664c9d5867fce16e77c679a3f886dd5e680a12f0a09e77af82d50e375f43fd724dba10e62c52c9611b300c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ast/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ast/firefox-61.0b4.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "c1b665bf08317624aec791a4cf97a240c8bd192f28b31a3a4283846628216bb98b60b50a44d7a14b37b0339fa7cf51af9f3a47cc1ced764f560567eb19c31d56";
+      sha512 = "c1cad96695ceed2c9f8461d3a00c7f4c79064e79e808f0daf3f7b240c7af3fc076dde7a5c70b1ddba4b6291e51658f11937c9155c1c130bb9aad6a2bb83d8bef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/az/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/az/firefox-61.0b4.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "fefa5958fd2bd47125b5a8601fbd0834b6498a4ef4b38c73246575b090b94981d39f086534fa5844432554134f590ef28fd9ba0a9e656a4be16c82e4dc368f75";
+      sha512 = "8340347da83edd0d74543b7ccf8add125cf1a3722d182753cfbc5270b350e0b5268925b17dfea35ca565d360fc9fe03e1ba42939df2ea342329639eec98803c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/be/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/be/firefox-61.0b4.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "3ad059b65ac9a5d6e8af9745df0ff35ecacdd0af756fc1d5a22a272fd94c49b163d62c7a59ba5cf485d860dfc096209ebd814673b909c047a5c0a8fe3b551701";
+      sha512 = "be2f46fbd814e464d5db068ce0d5c3f1f5531b90c13c8b420813559f99f9c511f1505943dbdd94bce01dafa7e709ed6fddcde7ac13d9d6e7b28eed56062d799e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bg/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bg/firefox-61.0b4.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "0eae9cbaba7eebe0fbbac423538afc7dbf439c55d1d29eea9f14468764febbb3f1141fde29642f485f5d7c690ac1ba3b91c9fa436f1cfa50fa87191f1b76d6d0";
+      sha512 = "128835294278c381e4800cf5fc4b572e2ddae72f02f6f3c077f3b1c7557eb106858d3c40e254fd328a31d5520644bdc3263deadbfd2cbf31ae6092a5ed9d43a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bn-BD/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bn-BD/firefox-61.0b4.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "0c056092cac3a3660d8397a5f14f2ea0cfadf7253d23d97280d7ab3c6086ef1292bcd5cf42fcff3b1ac6bc55e98ba5aae707d5b205472bab9c37d4fc7869485d";
+      sha512 = "205bfe4d02cc73560eb11ee79ff2f737ee96a3234e62589399adaa03ea48cc8d0abf81567536f7fb11dbe037c751ef317a841fde5a2b1a6d29fb9a0fdc71d05d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bn-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bn-IN/firefox-61.0b4.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "f98a1efb8dc56319429a06e9b52d0431591ed70573c76e80a4b4c419c47a2d810ad9f3f9ea1c9a5457cd55e8f98155165b7922000d750033503eacab2e8b40bf";
+      sha512 = "5d4c5b3f7b025b77089246889209d3f7e3c0ca924da9a6d4886ed0c96d437c7c47452e8a2cf3d030ad4e4859565e3b0cb18ee1132852e1460bb1529058cd4198";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/br/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/br/firefox-61.0b4.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "475d9a65a6041570a4bed8c96e63aba067a7eb659a1f303b0ebf27e55478dbe3597ec7d968329f352498a58a5256b2fb36505e09e35d1af9ac1219adaf0e607a";
+      sha512 = "3d6baadab9b20598e8d4fb604720dfab67eefb89e9e9d58f220a8b7165f8162506e19ada83d0085349a63ca31b861a3b6ff1df4b15436d2256f7591db58ff3d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bs/firefox-61.0b4.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "ceea5a1b8fd3f8ef3d719acb62c5653ee00a3fdf7ffb2e81cfc22936aed53e726d447564a7173e53f27946f55d37816a7bb01abde95e8a6c1718d0f7cea35437";
+      sha512 = "29a8df8006287fd38a283cc499a799174a14359d7a540cf5ed1983da98d1efbbd504489eeb6b2b5d420c06f42a0a3f9b5e7afd1c1d5cc70f9eff8b354bf3cfb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ca/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ca/firefox-61.0b4.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "97b687e518ea024c510365b18a220ff22fa0f722645c927519778bb8ccbce55b1bc3a909d4d06b3cfb1ed20b3dfa3761593b7967f516623b4ddc8b26e97359aa";
+      sha512 = "3daa8bdb22e64dc39a359ab15a55d001c95ecf53ade50c0779e0b744043b21d41f36cdc1d3fff53f59c71dd0205a089f7af21074e6ae34d1b03744ad7cd38631";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cak/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/cak/firefox-61.0b4.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "6e846c894d67da44f5734f409b6822afc043bd02ac6bd3801daf47891fbb1b3bab10ded1f980f11c7f41a8ce4d59b6d99b20eecc33fb60d189cc15df9bfd63f4";
+      sha512 = "031311b5ad4173778f879f5241cdeb559739875bb49330d20c37d5733b7e58a226480b6c456a297d509a9a379803bd5de38343249dca1fcccdc74b9ec1b97ac3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/cs/firefox-61.0b4.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "4c647b30775cd27e6955e8ebc4e9b375283ecf0b068fc7a49d3a3f99212a8f318a83879f975d85c6c83a88735e9851296869374edcb43dcaa167c2b954edf939";
+      sha512 = "979985e5a292bacd3031554288b92d8d90f9b05ce8f59ca2126a5f0d2b38436cf39fec21d830e16204982157d722e8fa9483062d3bd3c78cf2cb462a5c13d597";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cy/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/cy/firefox-61.0b4.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "f1d742720553ce31bef0881fe5da8c20d5bb2ca99710a882c8805b26c35e2677653ad2d4ec91371dc724410d0edeb884813f8d88ceb0f9019963cc98121e6bb2";
+      sha512 = "3572e150c1effc9d5b67cad7954a69ddd50f6aa5159adb6ac40f0e2c557cf03f6760e664be604edb27faeed8235b43793122223fadd61ba6923694ae689fb740";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/da/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/da/firefox-61.0b4.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "ff07e1c11f23091084361ff20404cd154e89d483b98b3d960b2e72567adf66192debe1862c1dd461477469d8c6b07a02a6dfbb9f0ff644c6743380159df5fe30";
+      sha512 = "241dc58b57f683b3a568f456f1235a78af6b8089837b508c98c5e223eb1c9e98507df80aeb805752a9bfa15b0837f457e3b2cbab683982ab7ef29cbb1177b4c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/de/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/de/firefox-61.0b4.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "2338b344b5507478c36f900f76e264580ed7f62e46d042252ea90251c1c80a9262746dfe7d40c6bb593de89737c848527fe33d555dd7aa7fa3971fd0d4483e9a";
+      sha512 = "d86f8658348a006b8f0baa020f273cb40c46fe82b34a2de4a2193439777ff6d0874bd63cb143c976c6de9eac4170ed8081d446267d2dd1185fc8625268f11f1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/dsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/dsb/firefox-61.0b4.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "72cbf626c69a54d18d8c63895e59c2464e7e2f9e0c6f78e58548a8f861e7b2033533c3569ddc2ec3a2e4fe54d0e064a855a23485a68c08e1ea672e2499183258";
+      sha512 = "bf73cd3a94aae19e1e58fa492d766ce43be171f349c7f5cf3f889bbd1c3c0f8aca3378eda8583b9c9007b1b26f4d159b281f85b5a33279635acd22289badcc3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/el/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/el/firefox-61.0b4.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "ee3ba405eeb7ee4d0622af5ed377e39ee4049b33637d122b1395cb00a9db8558454d8d371ee16ced37e1a9f5df7c07b8df5c0db67822117287c58a7b08d45fc6";
+      sha512 = "fc7acf24643996c6f3c63f1ef392883b24875914111128ec5c3cd4aaa3fe45b3a8b86ffa0a32f288231d10229f1824526fe7130a96524b7abc4917f375f3d96f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-GB/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/en-GB/firefox-61.0b4.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "203e6881ebfe4e1c238b83ceee8e59666856640417dfb27478027ba204823f78400b03e7e060c8e070207654f522893c321a9efe3671a212fc3d93519bf6c960";
+      sha512 = "d79ebb446402325a043acf700c1aa05ed85793423a0795e6afd397a004ac4f01bef39ad7c31d3dafaed2ee665c86b4ea4293292773a3eb7442c995c73c47ae48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-US/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/en-US/firefox-61.0b4.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "51690eb72296dfe440216bcc85f31312da6c10feb251a94396944af3fcecefa9cc07a4a278775214df2841a3530575fd385ade2dacce18b33231ea7abbfadb75";
+      sha512 = "13d1ff7486bc06daa37b1d9e98034fd463f663bae35d1163fbb4f033c327c5d85e8fcbecd2d9854456fe4e176748b921cc96d02b0889beab332a4a6987b2c457";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-ZA/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/en-ZA/firefox-61.0b4.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "2c802cba2c2d9c6627136f83fa3bf31ac2a1da1a8803a0d816ebcb16ed36111ace5fd229617e88a9a6e25818dc350261650969f05f3b2c3e7bd252a0d29ee54f";
+      sha512 = "843fc740b224b07307517a17fae1ea342dcb71564b511172da3f8d96f566908e485da5f0de81fb924625edd5b182e9855d4c39485b5d5e6b1f03d227a1582cdd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/eo/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/eo/firefox-61.0b4.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "407f5e44710733635f1508ac205186a182891415615be886da185b856903fd3c5d4b61c55c89f4d9a5ddc5e275918dc9e2881a2d3c1b5f038e1d7f7d490334d2";
+      sha512 = "fd62f3c1b4295fd91c3b0e3606761da2f4dbf534ff9c29d63c150b3e0c08663c8639499643163868fc3a205159afaf1766127d68dfbbe91262109b4673d6e4d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-AR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-AR/firefox-61.0b4.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "f6d00c92c423e09c61f23ce9c743c91efbc4f24a140d136f0b567fae3ecb45168eaf3ad5d886a1f15bf269c63cf8d8ed4f35468fb887371610ef55ea71322a62";
+      sha512 = "098bbb5b7e60d72561e99fbe55d5aa7fdad0ca78daa9085ef47814e525a284fc69d5dc2723974df97b4567dc050a7c23c77a92f16ac29f8f1f2c32feb0fed5a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-CL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-CL/firefox-61.0b4.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "4f8fe24bbda036402225b42b27bb48b46166bd9fe1963f0c802ecba2f186bc72c300d59e10a0fae384448ee2374ae88f311606d69b939669441c33dbde352795";
+      sha512 = "1e518d4c0149e51452b7710791dde0e51c92a16183e36d2130beb1a9471bb213853cced03604cb81b209a550c8c19b27f69c2ec13774f63dd143abfd27187568";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-ES/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-ES/firefox-61.0b4.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "e3051d9beb78b3ff9fc2ea969ea9e8b672b03162f94a5cd290c8953c08f106d4bf141b749f3ea8c2d38a2d4711d3585fd0a358a45862b4968f6b1a1b38bccee9";
+      sha512 = "cbec05d15f141e61612d9eb2e0001104500839d1cff156398d58fdab027d446a7f936d96e257d6ea8c35082f1a519f16155a6e45f6186989a09bc75fdcff4e7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-MX/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-MX/firefox-61.0b4.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "a1b7c28fde683783d5e36ade55ae051bddfdb829f6568a0ede19d038ad9e5cf25fce0e5669d7fee50cecd8b476dc9f0d4d401c9d6b30f2c4589bb086731fc5b6";
+      sha512 = "33670d131c9746823f205260829d789144079c71e089c399f4fc9ece9c19ea1e2f840f48ea8b629cc1101e3e776bfc12dff3e6ddb48c27547d458f7ae9a61744";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/et/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/et/firefox-61.0b4.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "70f839dca4b337a3161b71ae8e2007e8075a0b8fbb1b17ccc0e78c9e1f34e50b5711e5678f183cb3fb14fb6b961fad82fbe32393f15c1476e57ecdf58881d1d6";
+      sha512 = "ceb2cbca7b75b2dc083d40ed6c9fedf0fcaf6e2b7a626cd93e3de0d92b6cf73b60374d8b90d6fa57ae2910c06af84f00e55a2769725be87b37e2291b15d1f0b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/eu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/eu/firefox-61.0b4.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "e242ec15f4b6d136d9018df3edebc2eb94ab9e02f0ec1737e10ad3f17a2c24696a0cc2d0314e3b09e07d979a2f0fbaed5a8ac10b9954d5c54cac0dd0a2b01ae4";
+      sha512 = "4e6a8878c8adfe5e8fd5ba0b6eaa6ba88ff4f76cc5f3a8178040ef72d838141360fa56b0f125490a1effcadaf964cddaabe3c769a69e67c94400bc07ece89cb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fa/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fa/firefox-61.0b4.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "4fb727e5d8b8c3519fba218a8d4bd49a58ea4d7c20f3143b183fb6ab5d1b17cb373933da645c5d3856906a97bfe6648964495ff7a85bb85e01938abf79139f45";
+      sha512 = "9aa36ed9b2e9770d56302d41a373ae19510caa8c5442928dbeb70bfdf46ce2746a68776713ae54b0b996c1f3b6e36a5efc45d5b2a4508d1b0bea0e49adc0f380";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ff/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ff/firefox-61.0b4.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "ee25d95b8f9a5db60fa5adb7c656e8f39a1420b380ddabb3b39fa2a50322fa104934380b6698cd4f6d941d9b63e77a98e5cb002ba9dd3548111c9e6d6741f7b8";
+      sha512 = "53955ae8ddd8d46863cb960e2709d643869b882c15cb5b13f73c05a6442a38d3be5df47f3da670031bc99f22dfbb10ae80ac9799a71ef775fbe34649c803c82a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fi/firefox-61.0b4.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "5344184aee16ccdd0b8de303c788134b8435364a760c1ea0a706c44f36d344ca6b25dc5dc6821c84cdff2c5f0a8a7da8427ef4234d94d649e951c901200c087e";
+      sha512 = "78d9adc8c5b05cae1def5260aee2ca9419cf1e46ac2f4e5272f565ff73fa2cf57912120c7bf2160cf4df18722e63a4aebcd3574ec3c61c2f35c757ac677d5862";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fr/firefox-61.0b4.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "67f5f6d342262e8bd3eb9ac0561b7bbf170b3f8dbe861e8b9c0607b087410a24c1e4b453502f77eebb5a045d5980bc9e1680bb0c6585223d4aa809c872fb9d3c";
+      sha512 = "1235a994606f43e3c9d8660adbd9d3049da19cf5e654d8deab2affa18835a65a3bb297dc99de7ac6949bdb4c1c47296e2dcadc859833740c235c4364c418b5f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fy-NL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fy-NL/firefox-61.0b4.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "b4a3d6a3be694d00809de9d78a1b36958f9150714b8ec068fdf9e79982bff82d3dc7c54f9857812b2ea9b2708aa0290d4fdf787993697f99ff719b213e50b0f0";
+      sha512 = "44d97d3842a2ac5f816e7c74301cd85a8e09884438e5130cee9d17f0b4a59015831169afa47bc2dc6f89d7934d356bec18bbfc20bc97c0a85b441214afc9de71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ga-IE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ga-IE/firefox-61.0b4.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "14411beefc9729e07b80f1f036ac651312fa4d257479882841f82b0c5c10ccfaf83f31b2597c9076dedd3af4dcdcd62ee660a38d48a864c09519bb1c75728e34";
+      sha512 = "5f1e8aff2b70032c5907a73f99b1d62500a583ce7c5d5aab50faa5e40f4cfc01f1ae10936ecec9436ef4dfc8b5db1fbfc1603f0a5bbbec0a9c04eea32f9f9907";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gd/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gd/firefox-61.0b4.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "a6e40bbcda17d41a9972e56794847fad10bdd14d3e09d9ceda82b09d0d8c65559667b69afa2807fb9ecd26b8daeebe29a8cef6975bfa9e769886bcb94526f14f";
+      sha512 = "1d971abafa1636d154f015d874e97db108b48a1f6e188145afb7f3f4da1c01f4b80fc152e917fe3baf419af767172b965657f75afc4cd694523d458498631b42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gl/firefox-61.0b4.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "39d93aad369a22207d052611355b8868159b8fcef54fb86bd7bb1323ffad34d90ddf870d4cf21fcd3db0418b7e12335043d683c5f533454e19201ba6b9090c77";
+      sha512 = "cf9cccd08695208227d0cbdc1531df4957817327c95f8aacb8314d0991f7c0226fb8e4cb565c18830cf5026d7e87e32b4e445a4580ed27c0fa0ce643c9f37657";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gn/firefox-61.0b4.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "83f4351f9c7217aae381b2ba3ff8cd00d1e60ac0a05e87598633ebcf70804d8aa235f0b6af0f5218b90292970a5f18ba923a1a20b6343b3a8a5fb67195034d58";
+      sha512 = "79dcd2747c22484002bacbc7266a793c984a0f51b34921256d351a0df5d5d0fe041f2cb6db0757ff48c9b32551c882fa60c0d052d8d59a94f0747f40728a5e85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gu-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gu-IN/firefox-61.0b4.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "82a3f443e757dfbe47cba8c6fd0099b55537eb290529a3d93569d7f044147e37518e6be82bfdf1b9bf13541615007c11d12ae7feea6c20c35e5cf74e00aac1d2";
+      sha512 = "425f0864046581340110ea61a6a3abc87a5b12c2c24401b91273fc5c55014a0af9d1868e4e2918b30576394d97f16854252fe999d0a5b84ffc15c7b7765e20b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/he/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/he/firefox-61.0b4.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "71bea5afbb118e32e2e8c88f2eb88a044124068115301e1eccd892293fa59b2296d548cb662f6b67c6b52d8d9dcac6c7f395e70183c2881b72b7fd3fcf1fa759";
+      sha512 = "7a2b5119651e391164f514e8deba75cbbc7fb2b89353d5386758e3f1442d0a9d61bfcc9fa5ac28c20a0b4eaa793c04d7c45c6dc43aeb4d0042aa07a1efb22d26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hi-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hi-IN/firefox-61.0b4.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "3cd583e0bf4d646fcea81b4c20a25731b9b69dacc61384e8aca6bbb3e1cbd795e31ff980f4079a51ce76f71d84c5cc6a3e486ff23f1ef2447d249aba48af9434";
+      sha512 = "b0bca544fda321aeb18e91c6c639434084ba508cd0bb3027271d61075fbe11c10c9114d5f3bacb3538bf5bf41dd83f37b9231ecba7c8586a19f64c367d7bc0a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hr/firefox-61.0b4.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "79393657fda529897b2f13e842f44f1bb76b2f90889bc86511a23238fe930eaa8abb55eb5541640fb214119ee2e0472b3688e75bd5f00c87f5b47b193bce8e70";
+      sha512 = "baf8526abbdac323b3976c0561a4f7152465db2f7acbafca467c06794ced55f851d30c1a02161945791097351ad5e07a4a77d89bb8e6084e682fd39813ab5af5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hsb/firefox-61.0b4.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b391dd863b6d336cc6c9c60c287e9f85f73c91cdc8463f1b3ded0239953ff7e0bf04cd8daf12185277175a71b55ba002ec74cc1256882e453fede8034c9a9a34";
+      sha512 = "21678434d8b8c90ccd8e6f04f29c0d5d99376a0ee8a0c34b4748982b48591cc5f6f361b3c8e50bc90fb45668e439db9b1e7e1e0bcd88bf65d42186463decd348";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hu/firefox-61.0b4.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "ecc51ff78e3343c72bd1337a025ffe81fbd62e98bf1028f892ef59591a3893bf99bc0f58dec5e183672c6ff9a7fe36ab140a8dbfd892bcb99206b7683b7f7189";
+      sha512 = "7964a915f1bb67cbe69a62ea5d707e81cea6a1f1e221cb8b35754a90c074d70822357bf71562877aaae41d53d58a310a4db39d388f53a011fdbc195160038525";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hy-AM/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hy-AM/firefox-61.0b4.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "e0fe7721850ce3dc21aa5fb587e205d3833fcbf1b513df3fe67e9e3326ed57411920c6ba7d8872bd92a5df073362f67b101ae865e0954731549c7b25cc34400e";
+      sha512 = "71f1f37b090e370ce5152290a6ba89cee3d29dea718247c5c472cc0d619e37c60910445f4cf57e0e0693a8af9d439820e2da57fb0b88e85f2c13db042252e8a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ia/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ia/firefox-61.0b4.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "fa1f58e589f1d5453e8b349f87bd798a0b7fbf396890b6531c433fd27043d3a599f218093398de09387b2bd1d98ab50e92bed3c211617cfea700bafa0c846f80";
+      sha512 = "92ce50a687a76bd51d852a65e5bd2495d572adbdcb250183c5a757d7c4ca09f2420c5b3e2abf968a956a5625bef4e28fd46f048bd79ea8be0a5a49e783986add";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/id/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/id/firefox-61.0b4.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "73a0214561b02b4b30e495c5e62c1883409cc20b8f26c7aaa2bc32edbe197e8aed2e4165122ae84dd3035d36296d91a30c4460e9a5a319fb222f0d813601486b";
+      sha512 = "668db99ee60ed9553076f8de71e228386d04bb337a3ef6efd25e9cc8a193ab98a472562bee667314cae745895089d34d08e8a11e0f21d6407b6f4d443be9f52d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/is/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/is/firefox-61.0b4.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "ff6d9319998a1c9d394fec7c484b96cda4a473e374b193b47de3c473ba91684000d5a909e5bc460b83fd92562e225476671d42781968051a9701a5e0f760a385";
+      sha512 = "409d8b328287e504128f1e5a76793e8bfffc43453d3fde593c0a3048b4c3d5cfcba155269b629039acd6d29d53f862a00cb1e9f63fe2ea49c9c96793f440db16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/it/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/it/firefox-61.0b4.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "3b31ae6a9d84266007d7a61840782f3e1621a5d4b5dc05c7352e682132ede5225990712b4371edd59edd47004a87319e11c347b18a39e4477afc267186b2f1e7";
+      sha512 = "d6ebeec88e354b3fe1e21a259e85c67c1aeed0278eb82c8da5d4df1990a94cb3bc239ae0094146da31f53715722d225ec7ecdc13c62bc69ac6a0d99854cdffca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ja/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ja/firefox-61.0b4.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "d5342196a66b2feb19352b5792bea6579e1921b573d583ea8223a3ec1e7c59df375a3ebe83345330bf42e6a01c54a5947111d0951025f6c57e55bf374bec1c52";
+      sha512 = "d81dc550cb3b8c07da81205268ca7411a81fbe481f289f7a35bc84cb8fcea978ce1c30d8d36b6b87349b5bf2c9bea45d98c6e0e96ee376e2fcdbf2f1fdddbdfd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ka/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ka/firefox-61.0b4.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "ab045e67a005d31da572c30c6a90266e82a892c3c99af55ba97de6dba0f2be029d58d6ea259ee13d63e15b27f124dac528879109ae4342dcbfb46eb376021846";
+      sha512 = "9005824d0555987b997366cf6bdc776f2df18e4e15b32a3953acda22ad669ea073233c91f8c2b12b5d1f783611bbd3acd9859778ec19d21d929595f206b55a73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kab/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/kab/firefox-61.0b4.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "aef5375d4d9ec0f34cc3417d68cfefd7f4ecb489a66bd668ce1bdad9ab804fea267557439bdab5d6685007a3d16cff85c9e92f7c1434e3a76bfcc94bea8353b7";
+      sha512 = "955c96dfb14225b9249323a4be404a4a2acc5523398c3456b22406f6aac4ba9a7e84607c7d9f3ef203feaaf66ab190b04d17ebb3562a0789143fe78b79fb6d26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/kk/firefox-61.0b4.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "d3c86d1afc103a1db53e1a03ae36f3c7da7a1dcddcb5ff9e2c8ec06ffe60a8e4f767a012e375191063f0c40a80bea08b66ab0a2db3ceccf796de15bcf232f04f";
+      sha512 = "a6519912de9d60fe4eb11bd14b65c946b9d80ef21c001689363d2f34ea3dcb6cfd108068538a96e0c566db48ffd4322ba3ca7ef4d6c4f95e8c22e4a41ada9cd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/km/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/km/firefox-61.0b4.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "0effdf51a9ecb2312f34e14edcaa7ef40d392f6f969c46b1dc204471da276ba5b73416ede2cf6ea69205f67ef44df815e6038137c2400df2e2581564cde5b1b3";
+      sha512 = "af3a016e28b9a2d0150298878188f798f781dcbe3553bb7231ce9d5a7bcd3b3c2c9ccc9a5a867efee4d0bfbdfe70355ada38e2e3531bfc63382bc2d2d9db7377";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/kn/firefox-61.0b4.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "f57499563c17f119472fcb48afd54d4df98c85c854814f872e12e5ef4d3dac3192905f43453849ca7f024b4ae9a96528c2f9a55866133e3ba0651d046fc4ee8f";
+      sha512 = "872a6d1dd69a540e253a15376a5ed0af35ccd65d400c110ac82046749c05a43b73c6f8980a0d1d8f4bc11cb8e01d412ec170b3d905461d8f896f37f3cbb6cdab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ko/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ko/firefox-61.0b4.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "50defae5a904a2dccfe8cd34aa2ddffa05a18a8b8b7181029f7b5b2a6bf612445bee2c3a4cb4c4f272bb97dfaaa487f2ed31dabf200631c53d963bc5f66fec1e";
+      sha512 = "d8890110362ce85decec314f885cfba90c8ee7c0287a60b8b747176bf45426706f88f78642d2c92e4542913cf64a602cc36a706d3331330fd3d37579af1b12dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lij/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/lij/firefox-61.0b4.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "9bee6742358a2c726b23e5c51d79fafa92ab8a3df7ac4acd2ebcf9b0d6a3661ee65d6335ec91b4e02a0f8cc3c3b452ff642ff2682788a647fc5d29c80b8a6d16";
+      sha512 = "73b79ee6702844e66ca565f10ec28d4640345303e1cf51e57a064eb01ce9be9c02332d8dc9700466e11ef38a03c99203ad7935fa6ca14cd751b8ee2096c2972c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lt/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/lt/firefox-61.0b4.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "1c2d6e3f62ff24b4590163da626a92e461b9e7035346309bc7cbf1185f21ce318ef6e072902249da5c59d1f37724e4079b1d673492d2dd94ba0f50c38af818a7";
+      sha512 = "d463bfd3766e950e40309845ec88f1ae52a72f38dbc41ccdb1652882f5aabc94b9b204b0d3e1bf1a0e4959eb2a23694bb189bda14f9dac3c91401c2a646be8a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lv/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/lv/firefox-61.0b4.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "be9704ccfae945863ddd60ac9a4cf4bd2642bfb11fe3adc20d396c9fb0a85189fdd31200e59f06aa4a1c50f46c799ab07864e7f677bec2133b9e2e60ebe3175f";
+      sha512 = "2616476c2280b7e1c21ab7f850342e8deaff2c97b1f0ef05496ed1b87c15578dca206eed0f853866c5d018be4a2d6281472033f490466b41132c5623abc7574b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mai/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/mai/firefox-61.0b4.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "0bfb640ce98b3e16b01b12db7c28753d9d90d46beb7ca7f205fcfb9d90537eeeab6b29ee999108e549b257c26ec4e13d64e470ab79531f83895403ca7ebe7d0c";
+      sha512 = "3628ddce5fe431663d46c4973059112b3384f907d3e76ea99266968a855cf88de932985e2912ea6513c0bba7b321bcb125024d9b52a1920cb6c02211a876bbcd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/mk/firefox-61.0b4.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "7f8ee664f3f4f91c3b13f2e9f0cfc8d575f9a0da263370b0575a16e6e9bc7ba9e449f62df6494ee9837fd8e4620c2d4848d0cb7d99a3cd675a87bd65c1ae96e4";
+      sha512 = "be145f4a7919433312a25c318b072e40160285542b9d9a9659aabc0a90f2d6641329745ca3950b4da2c0e58ee9c106b93cb93bd5e806cd35e0884217eec3a20f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ml/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ml/firefox-61.0b4.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "1161e096b7d01fa4de5ae618045cd0528715f961434eaa569f8492a7ef0c059c2369f2dca348ffe0f24376cf6ed529be9b7077bffada3b0812a4aaa6677a6c82";
+      sha512 = "4cd05fa46a357eff1a1121abc72e07b992763e702b5c58a82fed7b4a8b731154b4d6e5578a6334e4ea5a58323ef0bb0761beb10ff971ca25482e973144f2f6ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/mr/firefox-61.0b4.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "cefca3f2f8c94cafea0e473a44a1068ab7a26956b9bf2eb3cd0dbdef851288df0bfc05ec0cfd6cd804963d1fbed7b5226cd1171d2fbe86372c977c22b162df4e";
+      sha512 = "5aa015d9a68c5d840cb20cb86ad98b837a97ff08da1ddd7f2c4b003d7aceefe9f82574248a39e86b45f5567adcdea2efe7821ad0fc019042fc507a3c673e628a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ms/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ms/firefox-61.0b4.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "7b6801cde7734c77318de91dfbfcb3e039012d048fd83014e66079d797a9d4b4c7394b7a39f330a24c82c0761436bfe6d7d5915e26e4ca18f4095fc68c728caa";
+      sha512 = "e02b8441994cd826bc308f0a5955d0a646b60acee04a254e35b9b3ec4dbc36374bbc2405e917fae352b9f000b7e72d3242520f092f27b7fa171ea5f9808d240a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/my/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/my/firefox-61.0b4.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "c4257963ea60c4d932326dc5fd468b96bfb6a35b35ef3c7950981ba92f6ba07dda586177ebfe20c386fb8b61d0ad406e102163f43a2f96e9710a4b0e7c241245";
+      sha512 = "1a20e82aeea3151d66b673f774a6c284ba8155f3f724c1f1cf79195a41cffbcf56af3399a7b526ba9a43f294a7a6c155c5914035417b36616ebb88d9e9125dc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nb-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/nb-NO/firefox-61.0b4.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "6061bc7c8c0fea22bcaadebd2a264f0726b43c71b9f4b8c4b33ded9dea7ce9765e88fd1e4dd47935ceb5791a43785db5f4381fd2bd0181a281e62b6de025ef13";
+      sha512 = "0bfba4dc5ad7f20a5660b1492e356c1ad2113a7e67e74cb86950600c0a209b47bc398e8c9f6fef8d27bde502b706c04965046316d952fbd8f2eb7d1f87af3e10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ne-NP/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ne-NP/firefox-61.0b4.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "ad4b705bcf4ce2b819f92b45e4fcdaa2003b37dd6823e75caa153ecf5afb1940ef79984c8602c94e96ee2be025d46a52956a78de57e3261bdacfdbde605f568c";
+      sha512 = "f373d90059cb2b65f3eaf34af16dd5644c28f3bfad9fff8a02b855b5b3a0da3146b876e835add7e70e94d59a911c68ab61dcdae8739d2e2a39afda3cde6e813f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/nl/firefox-61.0b4.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "d74352e12bd6f7a948f9ef8cc383811f361c8b68eaa060ed9859d3680674c07a4ff922c818bc502fda85dd94ffefea679e6f9ddc927fd193ead7685f40beba75";
+      sha512 = "bd971832a63eb6d8a2df4ba1ee69db7390ac8da13894aaccea7bbb79d27d1c29dc541144202b1e44ae95dff5e0c1425ee17c2845acad9c55b9126fe20d53e85c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nn-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/nn-NO/firefox-61.0b4.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "7fdfb976b9c586cc5cafda4cae0e6d379eed5ab0524bfe5cd5384612667a2949e5cf1e741786828b30e8ba67a4150bf34c4f10f2cd2c7aa89caede413501adc4";
+      sha512 = "a5017881f6b2ba0453b3ef41d6a47763fabf7a87e18e47e9b97d8c7d3ed4dead67687fbe3b1ed18d23e6ca3a85db4ca4dc3632537f74432faa1ea5fb69deccad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/oc/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/oc/firefox-61.0b4.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "3a967f09b09bdb3b0009dee7896cfe787b65ae15095e88be6acacbe79f69411afc6d90638f0cd82171a4f8f858e366821d3b3f3cbe0fd50b03172768ad2525d6";
+      sha512 = "f0593858258ec794dccaa420dcc39fb3bc35dda0c5b9996c7069d53d2b68fb2e373fbbb40859099ab8d85044308da500cf931dfb6e2d6132c7be2ffa350d653f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/or/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/or/firefox-61.0b4.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "2f9d078b65e479427c1a91714aa7290a2aec04cf3a6414df82ddeb5e830210575656d7e3cb35304c2d1fbbad264d85ccbea2e2408a477a396c368fcd4aab95ff";
+      sha512 = "33cbdcb3331097ab29581595579a2bff78c2af99dd20ccc9b0308cab6ae73335b990582d559cf8d9459c422f03f4dc0dfcba4b72c3e66bd286db001e0064a6c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pa-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pa-IN/firefox-61.0b4.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "bc3b65a2db74bd04e31082b9dbf3aad9434c9db2021d28f6a058ce78ade53b6ead38b9a7f123bf58e8a25f25d76a0e5fdff6372b04e34c88f4cf7e58ef80daea";
+      sha512 = "b5af8ed8a500d8b7b8ccc7ac44be235c8182dad44a55e461365f7b9089190c40d7ab7d2ec0fef7189d19ee0d80f96bdcecdaadc563c7d281f61ede5d19ba227e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pl/firefox-61.0b4.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "e1910f17681e058fca270e37939e5b6003195499080d747f3bc5a4ee9dbb960919a440a7f627050dbd0b66988067f32e41599d72fd6bf38f07e23ad317f83938";
+      sha512 = "77a651fb2b5bcb33754adbaf09e1c5abaf9c07af78fe5907b8954a1d0439d2853186070124e926a4ea2dae6acdefc5487632110557e96fda274556e97fdf2061";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pt-BR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pt-BR/firefox-61.0b4.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "a5993b73b475483deab792e4f657a27994aea194c716246707a0612a7b5c4f6b8b7a23befafd7c6fe50855a11fef8513b5bf16cfc6125a786b7fc0d50b102687";
+      sha512 = "0de1974b69f3d95381be1ac1366e9e7cf1057e26adeb655e20b088bd77035fc00bf94f0db24e676e5dffb320efc99481a9c9ccdeb5f6b0ca5c7050313daa3ba4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pt-PT/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pt-PT/firefox-61.0b4.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "306c7f964d09d8d73b7c35161e28dc856917e7798c1a6a57bae7ccead2abce5a6a6a151f8e5a66473d3ffac43e0d0e2e4dd9d1bfcf66b23818e6bec246bd547f";
+      sha512 = "dde0ba1bdee706596f0da206c9c30d959db7f1bd0ca7d98482bbff5c8554a7e9049b8b8f905a0cf0138c00e9cf136dd8a805db7653849215733268025720ce43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/rm/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/rm/firefox-61.0b4.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "fb29e90b0728b2a0b23e2d87c8baeb6140301cd0d6d89fcaa3e047da25c8333f5eda67a5a1582f98c6711f894cc08542a6e8ab0a326726e02c08195cd88131c3";
+      sha512 = "c75a77ed854bc309bd20551a1dd99811043be9a1344b81831ef38dadcb31b0155bdffe7511e928b1fb877050b10a425c5f76520fedff88dd41388db7ff3085ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ro/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ro/firefox-61.0b4.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "8cc66ac0b88632bc40d92764f0efdb71a69949d29a14a2ea06907356fecac5faf472399fa2c55dd515579ed8c3501925286db600f9239a82a4963aafba2b56b5";
+      sha512 = "b9cf50d440e405114f055b597b85cdf8c78e67a42213d0a1c7c81346fbf8768408d0ea0defa173b41283a239d12b037f4a6b6ee6458e1aeb0e68822351b849be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ru/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ru/firefox-61.0b4.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "d346b5e10da51dd30b1b404f567673fec759ba0f8e44f0f0dcad1375df212aee58d34147599beef8eb78d12ff6911ba703ecbc3daf8edf206d19a3566a83cd49";
+      sha512 = "9075f179b98ada166c203d044b55aff03a66c2e8c3c1478f919acf34a02682a126a5fbe7076cfbc8b34f5c4c68243b324e71056dd92cbf316b3ff23c36d3228f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/si/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/si/firefox-61.0b4.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "ec97cbfb74a86d96e05c70f73ac2e45448720c25845cf24e9c45d8d3174fe540911b691fa12fa96ed4b82cbf291a539311247d2b2c8073f790e1a3054997f50c";
+      sha512 = "2f8215d03ebdf28d74c4dd30f5a3db568e32e1a169a3902a71bbbbd546e4b9f9e2de2b25ee83a2fc512ba34888139ac2a1cad1625a8a70dc16233cde8babc28c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sk/firefox-61.0b4.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "86676135408c0d9c268f93a271d959dc250d6cbd9e47273abafef0e5d8ba86a03e560539008034b5895ee0e9c415748c10586be538adfaeb5c7fac5f3f54a4f2";
+      sha512 = "12cf08203e22eff69adcbac620cafd5bae56ed137c257ace48930cb3f70d7877780dca32ed65afefe7015413581c9493a069d463c5285e9ededf8bf3b9045ba6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sl/firefox-61.0b4.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "7fd5bbc7c046a09ab05f8751015d9c04f01d8cea0cd5252ad49f7dae612ac87d65d5992e840bc7701b3d99c90869143c721e690e51f45ac0311e27c45471b23f";
+      sha512 = "c4f20a2d20d89e9795cc8f67cfabe1563e69649015850e1e9e26c21a536325d760f4494d734b351b6e60e789e9d23b726a77b7ab8c970c820f6fe0a1e1de379e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/son/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/son/firefox-61.0b4.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "b1fb2a67f132d420cf47707e0f8c4cac748b2c010ae5df7720921e742c13af851b7962c6808316db3eddb31520fdc84367f9dcd4cd0549bfc5a0aafc02cd9b4c";
+      sha512 = "d86ec2e9961d5802cd16d1e98e79dad8f758bc10f875c24048eab2b3114b55109e781c3dce3f8498436ab6f542671e9d4b883f0017be71d7321e2fa86bfd1dac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sq/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sq/firefox-61.0b4.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "979ba11bdc4a19cd0ff71c6626ec9bacd18738758b1748218206590c29474532ecf28aa9284e94e57db72b24330632913df89128a6e4297582ee64ed47e63065";
+      sha512 = "3ad5d9d572cb30aa8e373174e866701494548acb471f29b3477477606b6f856ed984b3fc84cb2302927363ee62009fbaa0a4a0a9e51ebabd431fa17b8d472445";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sr/firefox-61.0b4.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "65fc8854f5dbe87f0f548eb755b08f9dde3141c765eb6e891fc85cb91814a72edfd09d0aeeec2d98949a788a11a775e49a8ab16829358d8499b5ee27565da4bd";
+      sha512 = "0b684b2a726f849cc61d4b3dd4d8618280961a59f80e479689cab06d499aac6f1c0eee82705fa6d0295abbebb498d5652f9e745060323ccfdc2a7cb1b800ebe3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sv-SE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sv-SE/firefox-61.0b4.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "2ed2dc8618c8864497174245c50f6e4c64cb00225c7ce77c04a81619bf56fc5e93bbdaf7c215576e521a7951aae5d22ef606f8b93fb5d5a302bde3e92d2bfda8";
+      sha512 = "50cc112c5aa0404dba0760b183f6849e74fa57aa28c7f4ec03ef3c68c8726ba212655fb5ac49df12f4492454a2fc8431550a9ae84b9e9f86eb6dc575617f77b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ta/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ta/firefox-61.0b4.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "f8bacb758829611b730ae584107964b4fdb3e202e45ce5ddceae9d6697c655377242a1550884051c7d6c18126fa24f8859ec9a8527368bb28348d16e69ab656f";
+      sha512 = "0821005fcb9010e14db315283d178438eab03f02e1dc7a524815cb1175509343265c2c972a8115d229f5346d5a5bcf99c6383fbd294f5862386665748112ab42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/te/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/te/firefox-61.0b4.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "b20773a0ee3be91af9635e4bc92b148c91f1cc62597294f5b37608368b1c5fccda1fc203938a8ad7f2f59274dd6dd74e98d1436e74b6e4cd8ea21a6cf2263cbf";
+      sha512 = "0dfc09db03347201731214c987856f22c63a89272d9fba0fb130f12a56e5ef2b932850f13af117551fef949803b9622717df02c7b164e10035243181168fa0fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/th/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/th/firefox-61.0b4.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "ea05713f6f615280317d3deb14a5f8c3ab6895333333da165aac253c7cd9d62e6b913b56a850e82c0713abd1fa92c9f447771755b557d0056e10f39e54b5c663";
+      sha512 = "4a54abbc01a456433ac601823dce9f22f1f19ce1def11d4469a8f5aac4b529aed09828fc75aee1a47855a9283bd54477994ab0be06fc0b4996153a1d0df43ff5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/tr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/tr/firefox-61.0b4.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "73a8207478a59a2cf2291ae848dd1e8edc7274b4de4feaff4703279750406bfb9f74a3928f717d0d2274f0475b449c8327cdbbfe367a31f35499fe3401029f26";
+      sha512 = "c3b90f4197f7c99e3c24b6ac6aae31567f5f5fa6907a5eb9cf026904bc627bc8c0f4b3b889e30d63ca871499ced0a0349fb1fadfd84c8171eb0ff52a771fef18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/uk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/uk/firefox-61.0b4.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "7a6f6ab7e282150b7020bdcc4d025883709088206df00f1eb47979a937f5b7f1b1f7984c3e9148e14ea669bcb4b9022c885816e52aeaf695098f55d9c00739e5";
+      sha512 = "2067902285dbbfeb7f3c8dd946f2f2997a8ca6f7a731deda8fe53b3bec1a980793010beebdb5360d8c08ce643a2edc0c86676f50961b7e531b4b59610ad9e151";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ur/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ur/firefox-61.0b4.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "b8f7af681ee9f83d6f0ef76f860a399612a4431447f77b16750cc09c03e2b78b98f2b2ccd9b661221a17a2a45a3e383a12346215fc3970d6105c44ba4e655e62";
+      sha512 = "f2d12deb0147d178e53444e6f047e3cd809ed53124f78dadf698cce75f8f9fed76cc94cbd32d606c0e7ac5d1c6cd07356a35739651650bd3e3f95a6b2f655ac8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/uz/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/uz/firefox-61.0b4.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "85978c209c7519862d72adc61065c52a2f7e2d3f37fa5fbc10190fc896506737a42bb33fca3f7532805617932e7f824bef010c43f51510b8c9e0609560c1918d";
+      sha512 = "4b6c73553ab6f4f20bafbfc1c45e41bf342c76de27562514d2662047e78435d95ee0c20442b5328f13ea0ecc6451f18166fe10e6fb0b16975fda4000c713c80c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/vi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/vi/firefox-61.0b4.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "c7dce64af32f44b09811fd42c2edbc58556c931d9e4d11e763b27d969e74d860a682108b5011335fc75f1ceb09107dc27ef1e4c0b196f0048fe8b3541bad8f59";
+      sha512 = "172f81ad5505494ae3fb3a170e2c38507c89a2627896e8889b3d128f68099bba5b9a91af7d102b70fdf10e827a4b7fb6c0aed117cd1576910e44cc5e72372207";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/xh/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/xh/firefox-61.0b4.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "b63e73be6f0f7667fea700592407adf7599935c5a25ed93d140565d17f563fdc5c7e0cb688733916312287952b95f16e82496905c187d92832e0da296d925164";
+      sha512 = "3ee80235b5bb3b717930fd9366c43c3c30d519945673ba16b550fb8665b91ae929b52c7852281f5b275f2c0a140553bc348e2323960516d2ccbaeedf5999804e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/zh-CN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/zh-CN/firefox-61.0b4.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "8b1de2e32b3450c84184d20df16991ad0a84cefc745ef110c93697841fa5cb3f4bbd9d3f21c8df6807d6cacf97dea1b856cf651567858b4c7403738e7c8445bf";
+      sha512 = "735e577a352aeffeb8110d4385e35741f28a5f7471cf77dd7cf146a48d5fe9aaabdf80dc468807b15b74601532a5eeddb27d3fa158cffc32623d929111f67c47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/zh-TW/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/zh-TW/firefox-61.0b4.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "4dacea538fe5885bc5030512ade78787be53db7625ca4a006c48787e6d62c4ac82b0c7d40976767ac483a6b88e4f44abe5339e7909b211cf1f720d584105de89";
+      sha512 = "ebbadae639f4a3c9de64909b52a56ba192f832c0200fb983339b16fcf3dedb0b28589c73599990c572aadf85256701b579311a0d4e30b45a507e0c7186ec4d2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ach/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ach/firefox-61.0b4.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "6a2681ba41f8449503b9a55d551ca72a94c51903865062baf0f80e29a4cd98953ebfb239c72706e42795dc1a49d087822e4f13790298a78b0d12a0a08468691d";
+      sha512 = "61779e2106c89aa37e7ff2b0e2bfdcc2fe5f6d3de0c96e913149dfac19d93d2f572298214bdc9ac32d26ef81f69710f55ab888d9b432928c6473b2c510c23d60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/af/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/af/firefox-61.0b4.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "7835ee1925c7e097cd16c92a9455e331573baa0a7c5150df27698199b423cfe0e511400955be5fecfe342d537b8a0d66e10042bfbe1f411b5b9563dfcd2f4875";
+      sha512 = "39e88a0db67b553ae149626c34cc988a2164b64ab634fbd9d1f649ecdfcedfc5e2a62a017c3048df74aad8285be7d904dd6f4b8edd9ced2e0a8beb25ea5cdbcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/an/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/an/firefox-61.0b4.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "bcad9e4ce854ae1a36ffcf82690cd8f2240aa04f0a525c1c0d9149e5ebed1e78813488a4eb8330b39e61399907fd421542f1b10c616819b2567215e5ff5f972b";
+      sha512 = "addb893599cf0e376c37905a76cfc4e05d17816a0def36ae8b163c44f994a10533e0a55ff9a3ecd19bf8f8b6627ba68afb1dee11125554132a5509b095412eff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ar/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ar/firefox-61.0b4.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "205217f6214d77d0d8a9c33f5d09abc7c32488bdbb7f5e5221968ed490c10f634dc2ae561700f63408ac38d020f6d17937af2b711f2451585ff34affd52dd25f";
+      sha512 = "a0598263fb3ad1aa67a75fb47a92633c31b0c769b05b1279f8c8a65989bee532a04480b47aa41cd6e03159ea407db910efa2cd15ce80b47faef18e15bebbabd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/as/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/as/firefox-61.0b4.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "7fff85971ce1150b1ba030b11b637c51f166ddc038acd78297aea2251b3b2383fec376fce58610bfa3579825ba66d9859a8f3e7d2e33939c82d4e692d9df5b24";
+      sha512 = "d3d7eea767b6ed9097585c91ca81bbb83567749c9998896287338dff19fcb78c9b641ff9f3abb28ade7624b110e2a129495ec4e3d7906779633c319e950bfa90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ast/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ast/firefox-61.0b4.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "f3bc3e70cbc691ff611b6bac2900d7e547d80ac84b3e1caad250c11e3b3776d9ab4db7fca8db0c6888378a540f966aa57e100becb810b1a3fa5b0e8944ae81a6";
+      sha512 = "4e12e39c1061c14db738372ad8fd0c9488a42490682ae0f0450a5d02d08d959ea33c87c3e4c1e66ae58fa446b8faa6643455bb21cbb03d2aeabad0207f8f4180";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/az/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/az/firefox-61.0b4.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "e9c25cedcc9684b88f442918e0a5606c1bc8986edb8c1ac8e885b00241a792c115f118799d425a876c462aa25abb36708b819ac712ed0c854e114a835998e30c";
+      sha512 = "8ec2ddefa9530e1135ad70a8ce5b2304a756efaa201414f657bf865699b02e26b19431fc86d2404b41c3d3557b81b9147a94033739c59b17690be4d3f250643e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/be/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/be/firefox-61.0b4.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "0e27ac6e9ef47d8e54ed5da4e88b02468596869613dd214066bee13c11c5a3f614fce3dc92f6e4b49250a175195a14fa4e11e0a576e24a550c02fc64187a7da1";
+      sha512 = "55d15c013df53929560584d3586a946e1cd3b0fd481881d10f0ded8513257ab4fc4a77d0495708c203b15bb749eb92abc2a4231dc892987ae4b2955a5fbc93db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bg/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bg/firefox-61.0b4.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "06a1a97d89230b344d72544e7d16cf9249b608d5a8957efbd5fc72eeea09ca791cf17d040d3a8adb64493d2eb10dc9cc1c334a0236aa41b087b9dade15345f6e";
+      sha512 = "229c10bb56080d50a88657b7595fa4d0f33f79570a00bdc9207c4b583aff5ad27ce309d6dab77988789cf6fa2671c7fb21dcdc5d69b0a4a7b87a767c7a7ca98a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bn-BD/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bn-BD/firefox-61.0b4.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "6acec4d29d2a40e0d946fcd72ff1f623d54daf9d9c5c00099560fbb286dc91f1e2ba341153e97bdcf62f54fe616bfcf38ff1e6c0b774a7917653a7e422e26320";
+      sha512 = "81d57db09707f13efc8fba2a13a0bffbb40224e837a50f5fe3c59b1648d89c8f7965cb4eae60ba0b1616cc77316c00ea2189012c4d8b8677649c042907683ae1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bn-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bn-IN/firefox-61.0b4.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "b492f32f37ed40ab42fd628cd01d063a4705c8fd14ea599327f417231951a610b307cf1035cc81edaae2e784e38c55dda17275f77921e1a63936872d48944ae6";
+      sha512 = "f674542115e8d9117f6255dbfc96507577791f7a29ffaf1de263ec6b75c0aa332beea348dc9be60c24ef6ffa822b100037030985157fa4e8540eddf2a9d6d769";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/br/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/br/firefox-61.0b4.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "e4a2432e279ee0046606ebbe84f0249afc225fc1276cd28bbe989049ac59b8c2fd09ef787fbf269367b45ff9c8092c6779cbafa45a05382976dfde3479527148";
+      sha512 = "9adbfb3ee70096a03dc75235e2a0ad60a9d90f1b240d3ae35a36186c013aadd283470b0878a8514759f04952208210bd4f2ab63a987e055bdbc9652296333259";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bs/firefox-61.0b4.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "c8172442b52b48396b57b36a9099c3dbfac36020769101c6c2fbe0a1e857700817dadea56a775d62f127fe8f86b714be0d1be63c9dbd8a2aff15b6698fca84eb";
+      sha512 = "b9267ccda43e947096337b02a5c40bcdca497755aeac2df06930232b1b1bf1b7e245c32733990575719c6e998c2103d8d29f46c804024cb4cc15d1400d459ad7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ca/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ca/firefox-61.0b4.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "e199d2b24e0a1f559a551bef9f0658d23dd69b0a6f9e1c2b02885eaeade95144bea2a29bbdbdb0cf7e34cf9f7c6ceb49c407c34ef61f855e260b2b84436e38e1";
+      sha512 = "59a5ac9116bfbfe296595cafb11c13cfe50a4483e3079a4112d04a10e1d6168b67183874f25047fa7c3e0e93a7932e5778bc78930e0cc48ff9a4a661fea202dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cak/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/cak/firefox-61.0b4.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "32552d0a4ec557950d64b0e67c572a7696ea7e58a99960b192e5b383ee30a39382c5b80e0fdb1b14f3643ec8c48a422098dbee1d99ad6b2c9eef1bdc3d0dba91";
+      sha512 = "3ea669f0050922163e4450ce8a1e72432dfb9c64b9317796b0648e9079333a2204ad1691c9c8e293714aade59c57aff75ded358911f4bcf161ddd140126dc164";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/cs/firefox-61.0b4.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "07f772b65b234ecdac971fd0a4c0ba049d17e148701b286223e972cfc77fbfb28c357e60e2311519459806b48ee8f10f5df96686a360b5148ad88c6e9de3d545";
+      sha512 = "39391f7b6b1ac13ec573040c5b7ada54c29fbe202cd5efb9bccf0ba5b38c962ba199afa845a5d7df0ecc58f3f205ce0b120acf70f5cf5c66fe8b465f324efdf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cy/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/cy/firefox-61.0b4.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "1ae9d11b2911997ecbdf06c66072ba5584c70b33024a18aa348a50ce91019c62c862ad201d6cb7b427397eeaf0c7133136047241cc61fcba4cc761d9665bce00";
+      sha512 = "2c44aa81963f6285bb8f5e689c18a9e5f15d449d1a1f7983c5e65c0049a8da72bf9e07c368b68da408839e4e4c58b35692cbb7dd3fd565c5d53c21514ca33628";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/da/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/da/firefox-61.0b4.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "71786ab9acb16d3d2bb102863efb79e716a67ab0b32c6a6475bdcf93211d9517b862939576d258b98b543be9301c26e210c9f420ae084233e56d497ab49b8763";
+      sha512 = "0d49ed761fc55d137c4337c43d0ac8e2ee36c15fdcba2ffdd6f536a2d51ee42227eb32f553ff15bcc1313476a12d7f51d59a112c2c23aa47f753a01adf121755";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/de/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/de/firefox-61.0b4.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "36067646d3459c6893f3504d5e9a7ae3fffa7291fc32969e98d4ce3223b09ccdf7e0b04a6b73fa2584f9aa45e9b38a8135fa243a88a50fa2cf745b17e7c17de7";
+      sha512 = "51cf51f85b68346dd0eeac98706e097e1a42b6da1e3d740459d58e7954367c3dfa4bbd423a07eda4b2f89e03de1c3c6ac169b0bf0657922c9c2f0ec865623a47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/dsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/dsb/firefox-61.0b4.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "e6fbb31e7db958d00a937a8565e691c4a65b975c0cd3f852c9eb13e97ed195dff660bf36c40764d3f9169059884e384fdea25ec55e49226a02b693b9e2fc3c0f";
+      sha512 = "06d58745022be40d690483d0f96b232df31de994efca42bdc43d57554ed38a6c4b36b466dd5b9a28b6f9ad8bad8c672a0cbd1bee5c7dcf0820da479ce4c03b55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/el/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/el/firefox-61.0b4.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "15d300f31ce324e89f7927e66e39c25a0437609817f321185b385ad4026eb2646f065f81a1cdd0ae1f7b120582603c83e8c2b845530a6d44871741a23f219261";
+      sha512 = "74fac2b70c3a5eda6859b7eecb4609569c56ae76b82f880ff9cf9d8bc1af2a3a6efd09ddb2bd32315205faaa6e5cc471cf41edaf139a3da486ce4e7a2788b635";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-GB/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/en-GB/firefox-61.0b4.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "7ee1708cea3282fb0de47147bc54d5738ec4420c3d8e41af445e138fe88b453572d6848de2edb7e48258bf3ac25e03fdcf22d768b220af6998e97fd16d4588d2";
+      sha512 = "f842a7fab1eb6bb15a9782838bcda4b69188c2a36114316f984e5e2f21fbde9d8d07b7a680ce3516ee359f638c82524c1961dd67b1f05a430a045851aa6e41e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-US/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/en-US/firefox-61.0b4.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "2dd63530379b00312b310ddf63f7796b6eec97edfe6638dcc82dbc2648c42e9e96932c73f16518687f922cb1d45212b82b04abd39b2e6e7aed54fa4924a5da34";
+      sha512 = "68797571e5cb045872c78db9cf9ba06bbe2982f464199a2c89f35d1b42369f49ce3abff1d01bb6be612efea2a102c2cde5f00d4ae71f02ac0728abfb96bafb65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-ZA/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/en-ZA/firefox-61.0b4.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "a04e3c3202e12f7f53b11107e0db92282bb5d8fc6627f3bc8729c520481d9a3566d39c68c283a97959020fc62ce1095c5b19d8dd85577bd5b0b171f7b67abec9";
+      sha512 = "22369e8b23cb8b30a8e1680f35acfefc3198e2cca558c58ddb0478da8ba11b08f1336cddf1fd9d3bbc7330f43f930ddc9c81b4b25bcbb6f2919aad8b60a30def";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/eo/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/eo/firefox-61.0b4.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "87afb472bc3cf46a4af7d7bef7b063a09208927fce7060824575ddf7197e6f58810e5e36631402deed1cfd5d921323ba9326547a57792e0c8f4166c061214018";
+      sha512 = "44b5d9b3a4fd149942277700ab3ce73246eaa8ab2826843bbd4f4f5db5aca100e6aee1149389cb9d21335b1f928035f872afec1a62874942932614afa01482d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-AR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-AR/firefox-61.0b4.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "c963b697c4ecbde0432170a068143d03486156622294ab46e1426e3a3535031ce4c8e2b49d5a5b0de721cf1dde2abd60b6619fd4f8dfea90b12ce64ad4744ef6";
+      sha512 = "7ac6beeb77e49d5439825a6e909355f95dea535978b8639173c6903013cd1218461b1a8c3f4fc1baf291e9063e7f16c0ad0a985f02fc7c41f1f654ca872c9797";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-CL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-CL/firefox-61.0b4.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "f88736bd06a98e2a03550b7134ed4b6dfd06ea0506f83f0974d1c4b3226a3a37c1fbc5ffb085c5cb044dd282c594ec8899ddd3aa1ab153f9a5214432ffafdf4b";
+      sha512 = "7b6c6daacb63eb5435a908e9ea95eb205c57e0626059f80237083290af22b4b12feaefc0d47ca23345238fd1f665b08e1f97e6b26633b7fe231b9526137a29a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-ES/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-ES/firefox-61.0b4.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "ae0368b758e8a19c96a4344a0519b2b5c645e6bb19a3babc0b0fce9c7b43df83a5586406144d08df049fa984ace65f86282bbd14307364d99139549e0873be4e";
+      sha512 = "37e8968ccac78447e07fe54965474dd6cfde6fee86be113bff29161af76a83b29806b3ea6c651e8e014f550832012032750daa72d7d1ddbcf99549bae1a6a345";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-MX/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-MX/firefox-61.0b4.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "a003622d0b5b048087e80baaee0776ef0f41189bbab81441bd31f430947521149ef8671aeef02308049192d4184d2fa0dabea8c4b29eeff6abb005992278da7d";
+      sha512 = "c61dd6fa039da4724cd5f058c838624f0e5fa8246b6c15fd28e5f501077ff0136dd9f45a3c249eec339b2ebb253a7563e06ec080bfa6bbee823bafddc36bee55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/et/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/et/firefox-61.0b4.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "71a81507a18ee16d947441f76daaff9c35a7d1f509ec4699143a7018534524f5d0c64340541efebacdbc7a163955ae06a143a165ac178a5d26c1b87b2479d669";
+      sha512 = "635bc450686fb89bb67573a313a8b06c4c7ac3f0a7ce2b8d9ae9cfb128e63f6cba4a4701c93016d9111d1ece4b5466bcef7497ef83c9b8c664f903f0ed79da10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/eu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/eu/firefox-61.0b4.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "d9fbed6bd402b3d21eb2ba032c4776888629e68f9dca68421418e1d293e4eac154bc26b0d8297e814dca2cc754e69b33e307e9a896bfa8edc0f2da7a75a8cef2";
+      sha512 = "9fa8d908bb5b656afa68b67a3289e576a3c64b845a9688261e21de10908c123879bcb87eb1ee8e3f151295c97596a8a122ca57d61eac56badf48e0c1c3efd245";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fa/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fa/firefox-61.0b4.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "bb024088948f3be6d37418eaa0e987ddf4d9854e7d06513e1691c4944e1d8ad8fff1e65118e9f45557601a238f0adf07a1596e82293728f2b011d0f1784a8afa";
+      sha512 = "f8e8a56dffd9c82289b7bb5c2c953292dfaec1c4737fffef17f8ed32a8abedee90c4d484fd9a8a27d24163bd3005e1931df5bb0b50efba5d42362517861997f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ff/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ff/firefox-61.0b4.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "e3f21493b6dff7cea9564ee067445076b2a9967b752530a0f922a70794fd5dd120982833574240d0ef854734a397651eb77a8edd0715da6c8e1710c3515e40e5";
+      sha512 = "91d0571155490d847b9bd5bdd8cec98e4edb7841a7c32da07b52fb7e3d67fd286ae5d770af47d66d7e80638c5e741f02a3e38e2cef28f08cbf332ae5f1cc50de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fi/firefox-61.0b4.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "9ad7444691a95c1b21fe149ab4468031a6886a42738f31d5aa81e2321c737d2c53a6d817523de2722394a47eeecf514d218d7e41158f42a80b9bf2ac3515a0b4";
+      sha512 = "8a363ade6138222a39520a7e3b02fad03ae846ad0b015f90259c5b6e09f4d309bd84a5b545f67288e3415f406e3efbf6c2dc9e1aba1aceba116318734de30f35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fr/firefox-61.0b4.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "d3eade70bde9bae372fa275912f3c1970c10978ac9e83f84c018b02443d341c21441b100f723c6856a5b61b742285606c5049328838444e7813e7427e1a0feb6";
+      sha512 = "47f2830f33753931516be570f1984624b41009fb0e8402ac6f5bc769fc6791ea50ff7c33ed79deee913539461f1ccb2eb0a0b9b33b9da9d03c204cd0d77c1dae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fy-NL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fy-NL/firefox-61.0b4.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "412a873708341e94fefcbb5fd72661559a83b4c897f5bea8a17051759afc0ba214dbb9732f65d5f4d9dfdff98498106a3cce73cb4c6314ec7f7bebafd8e63113";
+      sha512 = "df144500225be3ed718e4276062903b4e7cbd9b9d176cab88469ce5ba57960817be80a106bfd20da2e6cf14807dbece026167572e941b3c4d75cdd49e753e4ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ga-IE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ga-IE/firefox-61.0b4.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "59f0b8e533575841f768cd80390d8237c2db3fc2f2e99bd87011a8868fdc76ee8e5a87401c029f55c990fb0775fabc163ad4d9ad1531dfdb7bf9fbb9b601e08b";
+      sha512 = "b063d3701661a1d3298f268efceb4ace079a56b8017a0476df13677d1871fb36708984d0a0d03d56e90a02229e7c3b005501259884af0ff8b38c503deb581c68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gd/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gd/firefox-61.0b4.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "29cfb3bb6bffe5960968cae3096c63d92e50c514fcde9a26940e8304b688a869d6b03ce7479df514281fc609ea767c69fa66fc1f42e9b0f3cfe3be9ea0efad7b";
+      sha512 = "68f34cfd93b5e84017ee06cabef3945797c29668ad6c5574ec11d2bd3f4e6480d48c2161f5908a1782b9ef5b139fab855bfaad2db17646c94f33de2d2e84aca4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gl/firefox-61.0b4.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "f7b425e76607833cf4ed8e4381da101667c94d2942fa06a9be94193da350d03e8bd0f1f6d500ed0c231bddc3db5e458e9e94bd8ff77580ceb321ffdbd8a5e320";
+      sha512 = "3bdbcd0efe048104c09e44645bf11d3bc2daf61d3158d02d4407c8290fdd51c7c63d8ae7a111132b173a0fa86e73350617aed47fb33d9a97b911b20d552602c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gn/firefox-61.0b4.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "4f4a07552616989448bf5eb12d0a0ddbfb12b10b8f876d8a08f86bf58f113436b364f99ec26a20fc29eeef1030eb81546e0db1e92a8c86f46f6db1e60e784698";
+      sha512 = "1fded332e034a7ad70fa2a33d4033301291098b5deed26cce6e3007198f0ed998ad32fb019d0126c5fef7bbc546f5c483be56ff0d0ae299b42482b283c27d4bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gu-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gu-IN/firefox-61.0b4.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "5510e8a069b7444c20af0c95258e21d5d7e35baea46b83ed7fa3546af41e76299191fb8e14beb459c79a4a2aa5f195f6c99240f5f54a54291e2bd7256e8a9979";
+      sha512 = "36b1c695fcd4db371c27d6560c1d39f8cb692a297423fed0e8bd11ec861b26ad0b94c97e7283828954d183ca69c4347b378725e04454fb4ea146836602ab3447";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/he/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/he/firefox-61.0b4.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "c3b140194ef9fefe85f2aff0cfb44c49ddbfa3bef89b9b53d4fd92eea4532753d19617a57809c7d5413833e8055547daa1296e4cdc8f6d2a1cc792adfff65a79";
+      sha512 = "5c96152e5244b5da39b4c86a24282c289516c7555e23d0152796c7ae78ecc186cbe870affde2d25f5d30533d2f73970d28ef7595b9ff5f006f1b7eb17fe78fc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hi-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hi-IN/firefox-61.0b4.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "34e457813bdb5201b862dac75309ed6e0f4d7915111e9956517de12a809cf7cdf8f18238dea9e480434334d61f0e02cb1d3b7b63ee1e83f4854bc76507093838";
+      sha512 = "ddcd5ad522fcc041028d82d212dfb0c05c8ffd6737af6ed044bd7d26d34317cad252cfea2002075dd855a52a86be84e54f02c2038bf1aafb1b10adee90415d31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hr/firefox-61.0b4.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "b65b6560c82225baed727e8831c549512d0d900f41c337a759d941b6d78462221649f6ccf2a3cbf889a838518c773cadc034d70cc34ae1253afe74af8e173220";
+      sha512 = "a4131caebecb7d340f8a006684118f801cc8a9987cb51d219d5463e4de5fb934a0a9856655224a3977657879bb45f823ebf41271aea26878efa52ebb1357cf34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hsb/firefox-61.0b4.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "c0966d7b799648a279dc1e53729bb1eb740eda31cbe008623e617085ebd2c6e76fcba68ad038b6b25e9f22032ca6075a66dd3fc068de7edcc9a297ced0353793";
+      sha512 = "ad25dd1d0e795150537860b60174ce0c475b341605328d68f4cd1e0bf0c5609e08b6d637ef4ea654f2683a15b8a5dfe2ddf6a9fbc609ae13a4add26d4ddab4c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hu/firefox-61.0b4.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "d324a1a87dd4ce1d39691e1f5bce35b0576abdcff72786703f9a1c336706faae885b7cf3578fd5436d3a6c5e30aea2f80276cbde72c38bfc546fbfda60ba29e6";
+      sha512 = "15227814eb13d55b9a5274cd21da6127b4012292403b06fdd76306b1ca40fa32992ed735a43be6229cb0ada49424c23dd655fe9ecc8361c107352fc40357a804";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hy-AM/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hy-AM/firefox-61.0b4.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "7aea87a05327f9d322931c79f39635d4b395a648af26177cbf2b4bf261d2fce0c756668f0de5ea6d3bbeb1fd51f7d4673882573a5f67ebb4406434ab42dae86a";
+      sha512 = "10a88c32862badf5db544470dc0f3b08276e74f0571b6f4e3af80f6f29009288d9760d553776fd273e0bef41b039a318f09deef478fa63694096d4ed9fb7667a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ia/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ia/firefox-61.0b4.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "cb0a81af96aa96923a49ce75c5dd6ece2597c1c7741127b9727df9f403437e41da674958dc3680d60ff599bdcfe7320d3c18fabb7cf28ea1db27a321e25506b9";
+      sha512 = "4a44abb56c89dd65cc89be06fc17edc79bd6fcdbc600860bfddedaca277e03a5cc146bc89be4e3529bc320e1dad14d080efa6d388a56f0511fad8e69c5752ca4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/id/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/id/firefox-61.0b4.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "546a0f63b7221de9bbba1d055d9d27a220d61527957b236031a062a092d73a55dbc8699154c6cae7d24cdee4715080fc99c4d15d592a7dd6af8a1f05811199d4";
+      sha512 = "611036954d22acf9b82283e44e869a6cbe6e46f2111b30c410576af281e907f19abe4b885ed1ba68d67de7450ca22bd02c020a9aaf43dce6b64828c55aeac373";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/is/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/is/firefox-61.0b4.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "8ad727a32508f339880f10cfb059c7f3efdd2a195490586d59566e622f99d58a9f0e72d2975453e795a51c6087b0e400c7deac34fcd250510eb85094df08128d";
+      sha512 = "051b1f604bae1d65d8001dc524b2edfe36e1a07e4f8625aa908bf912e7791840f6ee83581cecadec079eabc67961bbe8204f5992795b2cf4b29edc242d741837";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/it/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/it/firefox-61.0b4.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "21d1b28d39098f9580f8573a85e50c2ad9aceee4c9183dd4a6c9ec673cdfb1411c743c44a26737a662fcf9b4acd9193ffba69016a8ad1ad8a2e85eb1723aa55a";
+      sha512 = "3939de7cb78afe4749d9981cc40bbd8157f028f6f19b247e09d25ce43af7341d2b8544be37a1052ffae17a0de796333c203fd89408fd9d390b16f41947bcb985";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ja/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ja/firefox-61.0b4.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "71bc02ba091f38f0cbeb76c14e0009152a37a6f0adbac5886918fd2b6e75d04f3be3fcfb85230cc88664199422c15041d44991d476b8d5e827e502b145751fd0";
+      sha512 = "63ca3b592e0473a2cc24bbad734091d90e35464da526d6696b68bc2478d1fed2571f3ba6af51d5d19898d7640c6afc5cc3354593ef9d3d389410b7e50495b326";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ka/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ka/firefox-61.0b4.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "dde038391cacfa4acdb25b3c703cc16a98c1a6115f82907d5dc40dc9512c904772f73e8f27651ea0dccdaf703bbe1dc4fa8f8249937933ae7ddbb51d0787d9cb";
+      sha512 = "75a3ea5b87058d3e793cffff69c6b13b0e65395241ed2bcb3f566adbfb6c9a7f6f419f211f1fe11c2d44008091f3b7132495961d145c155191d9fc7af29682f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kab/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/kab/firefox-61.0b4.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "5879b59629f09cc265a1ab6a477899538f1ddaafefe6357fbe655698096d084df9e0f0cb7c7b4387e3ba14d3997cb36744c7e9f92e8967a44124df59cf1d00d9";
+      sha512 = "290ebd2df481ed5b4b3663e1746b5804d9d7fe6aaedd2e81f10f566fd7668dc27f869e992ef023fa921c77818d8e389676de5cb94459ece81aa3828e02f527b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/kk/firefox-61.0b4.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "fe41667306010fd00ad3611b4c426373617c5eb64345ca3b08d86f0a28fa2055f61c1ce3320fc5b26223b851eef19168a2f43ed2e4e00167ab937d1a1f3133fe";
+      sha512 = "372ec57b95d63469552683d709862d66cd5ef16c3b6c91c618193799eb9cc1b882666be8137bd1d037e656d7841e4a18cb1f5cd5c477e49e7f933bf7860d4116";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/km/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/km/firefox-61.0b4.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "5520a9cbabd270113dedda63162a21af2d284e0df6a9eb9b5b9a55d11989eb1ab72e6b0cde32245716de15e7d89ff54f26ea67b56871c4ab94de690a015c80c4";
+      sha512 = "56202e87711e0f23e46f361d135f36ed4a2a55f8743db57cdd91d433e70a1d0d45f8b52f574c683f65980df220b194c93726e036624778385bbf1ad7f499a899";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/kn/firefox-61.0b4.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "e9f33a0476c90be99f3e66da6f4c244496a5b20a45dd81b8294446cab71e423e8a6a77442b2af268b87b62b329525690200b54996856039cdd857e5ba4e07f84";
+      sha512 = "2c507240bf10fde9b7576b95a129e33a06f88d8c962c39a50366d4efa72d2520bb96cf756fcc911c92c04b008ca0199fb8f79f871df6153eab247d228ef5af64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ko/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ko/firefox-61.0b4.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "e021722d534ab811c632fd472ac1b3cc24a49865fc625476db9e142b8210dad7d9eca87aac1537b1447f38f2264b7f61ac7a780edca4929637f78587378fb66c";
+      sha512 = "925c3d9a67b697493de83c8fd1d59ba7cc309f37c42f7db60668c82790cb90ddde405cc90a0a88073419788dc040c5bcbd4efca38ad415cac73e3e21f6f64fe1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lij/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/lij/firefox-61.0b4.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "c7e8e77b2a71e57d8114ea0f4aa3f9653bf5fa695091211534ec1eae3185b68c557550e8cf7a506b361310b95274e4a5f21073957af25ea4d19c8fee33b07c50";
+      sha512 = "bbfc7409fde63525642c12f82af5693f7e6857e3abe7ca21c298e45ede687797efe35dd4f874f94729f5eaf01392c49899ee62cc1a48c6565c606267ed59c825";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lt/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/lt/firefox-61.0b4.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "c82b411a66b0385ec8e9708ecb9e68a3c6cccb4088d299727b639adcdc41edb740b79721025c6ff17b8e3b3f9783ad7405ffe1da3c3e844f82e640ccf076dae6";
+      sha512 = "2770ac893a60bba546fc44c3e88deb098eea8c04874d363dbbb974f3bc0037fb600f681e95b7184a5e8d74aa61e4721fae21225b9e5506d18e6bcfb39ba24027";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lv/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/lv/firefox-61.0b4.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "a45966d7dd15c325588705d209409730ec21f828c5dd690e705a8540b58f278f4ec67d3ea17c4fa0c94f2de9765de7fff71c2fa2d3dac851f01bc5df856f6c8f";
+      sha512 = "5a9e58ba15226a919d92efa893e3e8d05ad905eebe737cb7637259279403a545845cbe612389d5aace5cc1791640d9aa0d0e8e73dae032de48312ec55123c387";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mai/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/mai/firefox-61.0b4.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "bd205990181115edb1b9134c5a7ddc7725699ade854737b8d27018b80c4d6d5d0774ae92e6d64c5bb160f85bbe8a3cff7033893dbb698adcd4bca0a189b6dd20";
+      sha512 = "73ced087da65a903dd9233103dc955b8429cb07dcc262a15e02dd0782c2eed68eb239745d14598ac261e40f7abb5c8004724389956f05a3f607917fd1c68aaaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/mk/firefox-61.0b4.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "0cf7a3617c4cc9e8fe6753b1a6eb2199b3ddc8739efac499c45f41b79f319c4cedbf8c9e522c13150a7afd622c569c66057f934ff03176ca33cd35cf51a792c4";
+      sha512 = "71c65bd3d47fcf2dc295f595618856f6d37d794655ed5b443c0d4a57667792eeed18a262df3a1c29661ccfe163d5628c1f5980f01fd7bf5781ddaae617118e56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ml/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ml/firefox-61.0b4.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "a65f9f11ad6dbd82b64576a1dae5b76d30a353478932b5f8afd046764f9fb438c10d631935ede3743155ecc05612247766a1b3b603e3a9206538e68e015b6eb6";
+      sha512 = "f7b9fc140cf6f2632e5b62e1747d0c5e4fa8622f3b1a267d2f43143a4167f99c73a08b54a535ed3b4853a115dd11831143afe100d128aebb07ff46ee406552bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/mr/firefox-61.0b4.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "3385e2cbee86b9fbb44a1cf719a3fc6dcfebcb67f8adc884bf207e887651befa00f55aad6c74e009bbd4b1e07fcf39bd299abd3ff9d1c9f44f9ab33a1f4bd129";
+      sha512 = "7829daa88913ef2d0bdc07549030e6659825e7ec2a22b3431565080e0a18da24e29f057c51fcf1d6b8705b994720c203e04fb71c5dea7ec5780b27f2e6cd463d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ms/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ms/firefox-61.0b4.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "0c3a323e1e72cc8fcfa153def5ce4b2fb90d69e16ca4e4b6472561b72d7cfddc28e8ee3f90f5b9909837330f6521cee5b1ee86329ff0db245c0ba94cbc87da9a";
+      sha512 = "576c4996091d788d2ef814dd150972abf909bdad4f351b1fc2de31b4b45910e5e565c873b386b88c44f2a4472386335a68a22fe36544b033a7963d80b3252ac1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/my/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/my/firefox-61.0b4.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "18e7e4fabb8a42491bf083863b2979ddab9a3a914ae476b2cbb8a290179d3685164543e637bfdf905655c482634b1914903253d7ac120bb18d122d0e60ae1f85";
+      sha512 = "869ab9e2bf7494203d44917ef254ed0d74465abf93e93fe6feed03c60988a1e20d932c92290028fc3dfd4e9f53194cfeb229b7f9b254fd45d05451c776ebd077";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nb-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/nb-NO/firefox-61.0b4.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "2f7a98b86c52b35ec5cac1b866b844474020eb0076cb5a2fab4abf6bd12ab3882a54b7b324ee3491ea173c206655aec3f854a9f0a29d934405359c56a34bc9b0";
+      sha512 = "bd2b1e3707d233d248b54dce532b70455414d740993c5526834acaf0ac72f273500e5f601d1fe5c1d747780ce5300317d1e6d0e106726311ebd3e8f3568f721e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ne-NP/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ne-NP/firefox-61.0b4.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "18b8472b4af585b65995b3d25e6fe290d5758a06b1cc1dfea4ed3a6512a8c250c2d3e0157a274a35677183b2e4a89d1b0970d310e8dc319ec8aa8f1c02a6b70b";
+      sha512 = "ddaac816dacc0d07940dcbb034a6c117e557733b51706ad32aa974ccf76722961aff057e0bac299315a064000d65c92d8547a89cb8e522a8bc8b473e2d3e6425";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/nl/firefox-61.0b4.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "f62dd81c30ae0201d1f7f98804c10e8e431bf19ea3249b4a4edc71ad2103ecb63efdddd5153059837dcf4d70499bcef5b874aa69a15a391255af0d7c37a65b5c";
+      sha512 = "56711c59af60b7082bf3f2c413ad94aaea489d3984e4afa55304022f0c57fe072efa597533dbec5ba8e3aefb2ced9d365a7564ebcaf93e77b4911cc28150cc80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nn-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/nn-NO/firefox-61.0b4.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "955b9faf5f17f598c13d51d9845c4c520b5cc93c0c0433da189cfc43d177665f47f2894f77d2dcc195da7ebb16870200d49703e45eec6769624d6f4c52d85879";
+      sha512 = "a6939789ea572a5687d2d542d9a5fd57159e7d5c8384e82816fdf69417f5416d23883d571041dce6c285b66e6ab1b90190818f87105f7c06c0f6bb0eac45ab3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/oc/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/oc/firefox-61.0b4.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "6a400ceada231224f3e38d4583ab064fb6a2aaaa89b886f21eb51435ecca32c5cc0bf4c67041a3e04ff2006b1d12899679e0cd6e425e39b005ddb5ca80e4aaaf";
+      sha512 = "9b51e1b2dd125e12bf8de2517432fc9d60a6e807372ad375a949c0c6ed3d8ccd4095eeb30e275ede31aa89a9c831c7f9108173ea2d207e0ecc37593094f67020";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/or/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/or/firefox-61.0b4.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "ef19a79b8ccf2c5418009abb06131a46b7205899a71b48baac0958062f73c54fe000ccee3984c42cc2fec2ceb2aff3644ee260754af5ff40317c375e22edd9c3";
+      sha512 = "6f3e10d95af809d98fee038039d048dd9da04d97465c6ce16a97d3a6bb1d77bc3481dc347b8e120ecd9e10daa47242ea11601e13236c4d7804d993b4ee455ed6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pa-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pa-IN/firefox-61.0b4.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "590785f0a3cfca1f8f7518cd6cf93398d71f1bd01e5bb6add5c79e3acb7fe8322d37b77994ac33d4ca33e19a81dce016dd0dd479fc38a7ba611d7a4d8fc30955";
+      sha512 = "e9d5a3618744e99604a476d39b04b35618b589e90d655ae7ceae942e0944a2395d01a6a05e386adbf3dbf13f6e3eaf8823a04d307d92fdab4086261736800e07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pl/firefox-61.0b4.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "77d6741dc35da55b92cd3eb5ebd3a32a96cde805e53314cdd64ac0ecca6a74bbb042af6cb778d344cfe01e88ef5005c067f964609404e55d4076f1427479d629";
+      sha512 = "cc5cbf37e8af29d9a186ea5e91ea263a77db7ff7758e58877a9227bb1e3591b80bf112e0bd7535d8e30a519427724b52a557799d60acfef053f02b383b25940a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pt-BR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pt-BR/firefox-61.0b4.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "1aac86496779b9b6b570a7e7b0b4c8b443c4ac13e5dc548290d33dfc64ad940d6058afb7cf062d8e89baabbba5d55f285d1724322006c15476005cb0a04c163e";
+      sha512 = "296054c1424fc160b8688d89700b37271d3d16fd29ffb85275e0488fc45a3465c2f060bf77d5b6c1e8d81c2d53ee5cae6853cf26704ae7fb5222351b09e652d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pt-PT/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pt-PT/firefox-61.0b4.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "3ae95a9255c6dccc8551d59b5428345a672b9c39fc08dd6e5b509ddb64ae0af197e6f1823e1bee08a2393c54c17077529a474757aa0a4bb70de3d868ca934023";
+      sha512 = "c32d68de0fb3a54b38db13f6416be06745e61767d3dd2dbcfa3d397ba54899318aff0ccede0f562b3cb8b5a2b4a126f5f0300c146e9d4d847148d1392bb1a2be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/rm/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/rm/firefox-61.0b4.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "41d5e3a61b7d8ede3c040720fd6be629f948a8fb55617a9cc6333c275c00304e990e6a0924d2eb4fc16544d855208cb2bbfa633ff829fdc37385b51492e49416";
+      sha512 = "92bf05ae92adbb08e70e610d46e260c63158073598718fc64ba5e14f8f15c8ff712353586da0b2d693d070bdeb48824b0c68a36acb101b483b8af4bf37f74eef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ro/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ro/firefox-61.0b4.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "bc409d8cb772d57ac8729ec61d5fb71b7df32d20ec9836cb1c2870bda85ac8f1d6263f607ab0be0e2818795969bdd4fe41b48c9fac5827b363868505867dcf87";
+      sha512 = "3e5da35749bd3a5da3172b9d567e4baa121d268a0d13611becec3e497cec2bf652effd26310a4147204940499fcf837bf20138555c4c0bd7c034ec3d36d983b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ru/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ru/firefox-61.0b4.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "4c2c6342a08da3991c4b6a436cc638be0f600b34e7fe02d75fbb6c10d297e693d2aee44624e6ef8543164f36b11a466f4f7c7bec709682aeb870e591523d72b8";
+      sha512 = "a83c33ead97106e384a4d16f4436e639bc736db9811e162e889f159ed38d37a670c6256a0f3d5b5dd7e62e03dd140cb763c02d5d915b2fdc1de35650de0fa165";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/si/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/si/firefox-61.0b4.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "6708d0ad517b3551302f0b3533b8e365a8c27489b781f375fb469e45b8e9c84df11e0ff4299154ff7e3132e233b5b64f9e41432f61a399ade7ee0409fb1c5654";
+      sha512 = "272cb7022e819e930ada868f2260c991bf21fcbbd8f219ca9d3199e2152059d2956c490bd7ebd10441ccc261210f9b8fabce4a41cf4e01939aaa2054e4ab99b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sk/firefox-61.0b4.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "cfcb6141b3bc780f2bd27f9226f5b0f82d86ef9f22a15066ce57f8f156727f437b67b3f165c2b450fbf0c0492a2c9d246f2fcef417a511164ca29a4a7fbef6ff";
+      sha512 = "dbe0b1c1e63836eb695a24ff2576190d4a0552c9a7b6b2373a3b55774fbd9891b0cf32f53e95923fc267e8fc052bceb79d3d900ef060b92cbe40d7f0dddbcb49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sl/firefox-61.0b4.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "2df73ada8ee40a4a6f01143c4dcef7fc5b5efd486a20057e86c1036d68018651c2451e02c10ba127a110fcf8bf88f43928ed8b65958b1c7598b81973b79ef9f1";
+      sha512 = "7422cc10f57ebacd937a3153035cb8acf369639f117d71447e002fa151cd108f2a8609563fb9575c2c71271f3f4e50fa5211cdda88a1ae53847045aad8af9b9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/son/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/son/firefox-61.0b4.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "75f0025e6d7f6d63fd4e017ec68dab3de9cda824944d73319580861bc3be599d5ed6e4e81b7b4b4fb8bc8be7d530ccc52dfcfa920ca160682ea20e499a863b20";
+      sha512 = "8eafe8f6e1fc8170f622f29e598c6a06ccc507dc97d180e0810ff971d7fc4a4a965a75f1eb878483b03069ec0484833bdd0c0c1aafc732982b8cc802249914c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sq/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sq/firefox-61.0b4.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "763bb5692bbb818688ce3ec8ea78a9734b4de8ee29ec9ca8516c33e406913907affe211cf7146428b176c230353f0468824bef69c4f5ccff69b75ef7c302a1b1";
+      sha512 = "32a5e3d158e8931cca10777a59765cd8aa823678cb339b013519b07045b8a6614082bd6ae81d7871cf22fda10570fb4934c05be5dd16b0610f9bf7a1f19d671c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sr/firefox-61.0b4.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "eb0eeb897688fc2f2c29ddf31b76e8e67a40e620f7892bcf2379f2d28dd033070fad749d58770709f73610dbfa512331bc090ef5f4a8c561b196485e30dd27da";
+      sha512 = "42877a689c178b9ddd8711b2b15e51062411667ac4c978aebcb364ee9c71764c8dd64963966fd17f3bc929c9853bdd54c12ab312a4c1527f7adad277fc9adc32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sv-SE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sv-SE/firefox-61.0b4.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "6860fa25a9b2a1933784f0d4bf2cce6066049586a7968fcf3dcf1078f1964027fddd28c4c18842073befdfa34ef5b9a470d6ad06f014d86677e548e1b4b6de98";
+      sha512 = "48605bdcc841dca8a663b61d75d30e2bc7e0722be9e47833c42fc0b6ae275bf778b5ca534e66440db2cd85de70f8725f25a1f9a303b2fd8057fcbc1f4262e0d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ta/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ta/firefox-61.0b4.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "b060723474d8075a3b0dcc32387983a4fd159f7399de7a4dc606a11dadacf2b6b8af059238045fda70597c1530ba6007b7a07e065ce153a5b992965d1889a964";
+      sha512 = "7ede0ec9dc91cd2ca4226e5c361b2f14c592e77573bc64feaba4aefd24dce79d8139967f5c394bde440ecec5fc83e21d8d17e00923775fa33ed39b055ed50fba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/te/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/te/firefox-61.0b4.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "ddb772b303412b1275dbe563b991038fb5b860a7cafe3c79ca4a85070cfd1eec1394850c6478e3e2c89353c1d90e7d99ada1b2adeb35d5b55c7b190881c1a920";
+      sha512 = "b37dd0bbdc6a8227fa76902ddd049281bc4313bbd5cbdd90866036b400ecb0b07d2995015c48e37c69a6c68de3b8810787fdcf138c36075a47fbc43b0106811e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/th/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/th/firefox-61.0b4.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "91e4108240ee7e2573935c5db84ecc3a6d1ffce5f508f6a725e66d7d633c23f48d20797bb664a6e079e0ba6f4ad6a12abbf80a43cd51cfbc925a2b10e0ac0473";
+      sha512 = "29ce9cafcb24811fe6c9ef33d81d3f43634bf4acee7e3f1905d743a241bbeeb1d8d44d210389d28f6fb740f6ecf37648e808717780319f54f9c198a0a1b3f319";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/tr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/tr/firefox-61.0b4.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "e4ca27faf36e60fd8db2d338d6cd2bc57c27d0c446e7e434279c8c663235b69b16dc2a957ddd0f025ec71650647459152dcc289a72b90f8b94b9e50d69ef2989";
+      sha512 = "b1248f1e115a509554ee8cef5316ea85020fdc8c150bac0b363b25123ec17b40fd46d34f2a33a161fa66822fcbd4b111313986649931e0e6ed2c4afff3ea9279";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/uk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/uk/firefox-61.0b4.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "bfac00d8b23fe24da516c22e2e200f68ac8057b09fb3d93969622d4c703d2a74e64f86d6a0d942c32eee4cd6fb50f1324035a6d9be9e6f8d98781eba28d582e5";
+      sha512 = "6220697e54e30e70267c3d777763da05bfc6625fa9c239a5c761ab3b992d3fa5e1271332011fe7aa218a615917002351c2c5e9fe4cd278f99efaa635f6934237";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ur/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ur/firefox-61.0b4.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "3548acbf07cd5012fb75f739f78d2b4c63f01253a06f094d0433f7b631f8e3ab33f887459afeae7f855193c5c9802ed96f862d41e937f517c6f84edead88a624";
+      sha512 = "bbbc09b0f0a88cf5540c4bcdddd226984bd91dd7aaee1256bd8142535b5e949d54dd8b92990f1d71e3695a8ff0054530dd64564edafb21bcf93e6764988c6568";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/uz/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/uz/firefox-61.0b4.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "ff30ce6eae9d2e78aba595a5a8c3a6579243ec585f705f949402cbf930f7f375b2dbaa36df40e888151831d2a2feefcfd91eb698330df0c8ae67bf469e782ed2";
+      sha512 = "164c63d66666ee819a88169844859c8db95ec5281eeab77e30a63b1cca1fafd97bde09538665fc433ab9ecd62d05ac7fed68aa43bbb6e16476e34461ead4164e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/vi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/vi/firefox-61.0b4.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "1d052d53ebae70c01c9aff7295d20323403a067275b59e6f66980718654a3858d55271d31fb0812a22a5dbd7cc8a1db8737aab1e696f4fcc99cd9bba42cbc812";
+      sha512 = "b12a47314960a28c9527cb2200286070294d4ebaf6260b9b4d4c483e4eb98cef349e4df7ed7c60c032a327aadf101994a49e2226a2a0cedf7793feec42e85cc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/xh/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/xh/firefox-61.0b4.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "fe0c271d4af2236ce8d2b489eedbeebe185da434d0b4080bae2ecd222bf95b4b3828860c3186cb79434ee60ffd379399b15045c8231ddd56aa5c210b8c52c856";
+      sha512 = "147b827716182a41fac6170656ab53bea4b658a0de537c57a0ca786d77ef4227c433c1ebc09d1dd00a4b92e07f03eacaba5928b61e055af67ac35b1aa9238890";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/zh-CN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/zh-CN/firefox-61.0b4.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "4ef2464fd35bb71ebe6d86d0e213e9e5d33a756ba139d38ccf903ae852dc025e5bc34727cf4a8c3a8a851634c975044b9c9f91ce64adec8cace79ae1d3e67093";
+      sha512 = "c47f74481322b2f480893be1ba9f795d951af2db7632b6a0fbed6e00155a4dcba12e7a8f4a7a3f44460540e499c03b2561eaea5a67d22f68d31cbad8fdde58e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/zh-TW/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/zh-TW/firefox-61.0b4.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "da7d14a85785ec5ff6fc01bf6c18b7468aee74d5cae30f11515588ad403a3cd571890843f4a11beab08577eaf78ae3af6bfd757cdfa628c36aa95feaea6e5a5e";
+      sha512 = "41c5b6b561995a4a9a7b954ce0c6981889b89e046ca7420bc17ec4da7de90c11e7e54b1408587e7bb60d58b667e51816dd748f651bf7f3abea6e84bcf86659fb";
     }
     ];
 }
-- 
GitLab


From 68ae161f5365bb863b382ded3eb6d7f20090bf56 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 13 May 2018 22:28:51 -0400
Subject: [PATCH 0684/1085] dbeaver: 5.0.4 -> 5.0.5

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

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index edc1497294f..23b98200d14 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.0.4";
+  version = "5.0.5";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "0dfs2xa490dypp4qz8v0wj6d2bjnfqhjmlskpzrf8ih416lz1bd3";
+    url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
+    sha256 = "1rcskrv8d3rjcfcn1sxzcaxnvmzgdsbjc9m11li8i4rln712ysza";
   };
 
   installPhase = ''
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://dbeaver.jkiss.org;
+    homepage = https://dbeaver.io/;
     description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more";
     longDescription = ''
       Free multi-platform database tool for developers, SQL programmers, database
-- 
GitLab


From 9346d1373bf0e8c83032934e7cf316ed3b0f6f9f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 13 May 2018 19:45:28 -0700
Subject: [PATCH 0685/1085] xonsh: 0.6.1 -> 0.6.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/.xonsh-wrapped -h’ got 0 exit code
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/.xonsh-wrapped --help’ got 0 exit code
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/.xonsh-wrapped help’ got 0 exit code
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/.xonsh-wrapped -V’ and found version 0.6.3
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/.xonsh-wrapped --version’ and found version 0.6.3
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/xonsh -h’ got 0 exit code
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/xonsh --help’ got 0 exit code
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/xonsh help’ got 0 exit code
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/xonsh -V’ and found version 0.6.3
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/xonsh --version’ and found version 0.6.3
- found 0.6.3 with grep in /nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3
- directory tree listing: https://gist.github.com/c4698aa16268961773b245a4b849a9f0
- du listing: https://gist.github.com/db7c65ccf5f4bf3c4457401c300d1862
---
 pkgs/shells/xonsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index a923602cdd7..8f117b788e7 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "xonsh-${version}";
-  version = "0.6.1";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "scopatz";
     repo = "xonsh";
     rev = version;
-    sha256= "0lxjklwj267q0ikqab8p743sjvm44gq1w7mp80c7hgrn2ndvrypg";
+    sha256= "1893kkxvalx8ycjl27gixkh979kkp4ra00zb7m6a8cdllx6yhsgi";
   };
 
   LC_ALL = "en_US.UTF-8";
-- 
GitLab


From d0d15f7ffc21e6c6c1ae3a3526ec08362260077f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 13 May 2018 23:03:52 -0700
Subject: [PATCH 0686/1085] osrm-backend: 5.17.2 -> 5.18.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-extract -h’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-extract --help’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-extract -v’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-extract --version’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-partition -h’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-partition --help’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-partition -v’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-partition --version’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-customize -h’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-customize --help’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-customize -v’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-customize --version’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-contract -h’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-contract --help’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-contract -v’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-contract --version’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-datastore -h’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-datastore --help’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-datastore -v’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-datastore --version’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-routed -h’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-routed --help’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-routed -v’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-routed --version’ and found version 5.18.0
- found 5.18.0 with grep in /nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0
- directory tree listing: https://gist.github.com/dfbc55be9a7c8ad0f9dc070af96865e2
- du listing: https://gist.github.com/8791bb0044495bd4d8dbf95ab3f97175
---
 pkgs/servers/osrm-backend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 3b11f26d6ce..04fd2e37b35 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "osrm-backend-${version}";
-  version = "5.17.2";
+  version = "5.18.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner  = "Project-OSRM";
     repo   = "osrm-backend";
-    sha256 = "0ar94wpsc2vr6pn4x5wy7mkpjlilgnyw545wm0l78174q43460y9";
+    sha256 = "0ffdw02rgjb4z7xi8fk97c0hl1i7z04csjh3yd18zsb19bk1mkva";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From 18ae1b6d314bf4fb30cf7a901e6ef357795a6323 Mon Sep 17 00:00:00 2001
From: Ben Creasy <ben@bencreasy.com>
Date: Sun, 13 May 2018 23:22:16 -0700
Subject: [PATCH 0687/1085] docs: fix broken link to staging policy

---
 doc/submitting-changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
index ffa3a90b5eb..6c6f808f631 100644
--- a/doc/submitting-changes.xml
+++ b/doc/submitting-changes.xml
@@ -476,7 +476,7 @@ Additional information.
      <para>
       It's only for non-breaking mass-rebuild commits. That means it's not to
       be used for testing, and changes must have been well tested already.
-      <link xlink:href="http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read
+      <link xlink:href="https://web.archive.org/web/20160528180406/http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read
       policy here</link>.
      </para>
     </listitem>
-- 
GitLab


From 79d39de93a1d2420cf9cd8cec933a7f4fdcc6320 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 00:12:44 -0700
Subject: [PATCH 0688/1085] ocamlPackages.ocurl: 0.8.0 -> 0.8.1

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.8.1 with grep in /nix/store/g76kv7vaw650ibv0rv7544biwpzrdisw-ocurl-0.8.1
- directory tree listing: https://gist.github.com/3093abaf0dd2e39a2eb0d107f14fe8db
- du listing: https://gist.github.com/6e66e0fd5554664ca460eaa3e19a44aa
---
 pkgs/development/ocaml-modules/ocurl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix
index 73ffd7f41ea..4b6bea31b40 100644
--- a/pkgs/development/ocaml-modules/ocurl/default.nix
+++ b/pkgs/development/ocaml-modules/ocurl/default.nix
@@ -1,10 +1,10 @@
 { stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ocurl-0.8.0";
+  name = "ocurl-0.8.1";
   src = fetchurl {
     url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz";
-    sha256 = "0292knvm9g038br0dc03lcsnbjqycyiqha256dp4bxkz3vmmz4wr";
+    sha256 = "08ldzbx1k3mbjc01fmzsn86ll4paf331bcjss6iig6y6hgc9q3ry";
   };
 
   buildInputs = [ pkgconfig ocaml findlib ncurses ];
-- 
GitLab


From 0db951db83fba507899a2db163255f67a95d3440 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 14 May 2018 09:40:13 +0200
Subject: [PATCH 0689/1085] elan: 0.3.2 -> 0.5.0

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

diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index a59528b86b0..ff737de0cc4 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   name = "elan-${version}";
-  version = "0.3.2";
+  version = "0.5.0";
 
   cargoSha256 = "01d3s47fjszxx8s5gr3haxq3kz3hswkrkr8x97wx8l4nfhm8ndd2";
 
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     owner = "kha";
     repo = "elan";
     rev = "v${version}";
-    sha256 = "13r110382dh7848lpn3mrhc5bgmj373sbpx1326ryx3wl5kfp8rs";
+    sha256 = "13zcqlyz0nwvd574llndrs7kvkznj6njljkq3v5j7kb3vndkj6i9";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 6b93c2e7fffb9ce1eb4670d81d5119fbb94dccd4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 00:46:53 -0700
Subject: [PATCH 0690/1085] neomutt: 20180323 -> 20180512
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/ww06xw1m1b0r4fy308kwa6vvj4cyy1yk-neomutt-20180512/bin/neomutt -h’ got 0 exit code
- ran ‘/nix/store/ww06xw1m1b0r4fy308kwa6vvj4cyy1yk-neomutt-20180512/bin/neomutt --help’ got 0 exit code
- ran ‘/nix/store/ww06xw1m1b0r4fy308kwa6vvj4cyy1yk-neomutt-20180512/bin/.neomutt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/ww06xw1m1b0r4fy308kwa6vvj4cyy1yk-neomutt-20180512/bin/.neomutt-wrapped --help’ got 0 exit code
- found 20180512 with grep in /nix/store/ww06xw1m1b0r4fy308kwa6vvj4cyy1yk-neomutt-20180512
- directory tree listing: https://gist.github.com/8d13b2cd77148163ee7c664ce4cdba07
- du listing: https://gist.github.com/9755eddec256452bf53913477fd2bebb
---
 .../applications/networking/mailreaders/neomutt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 7bd0ea70dc6..2ae58721188 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -15,14 +15,14 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  version = "20180323";
+  version = "20180512";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = "neomutt-${version}";
-    sha256 = "0wxk1fqxk9pf2s43mw7diixv3hpwdry1cyr2xh119gqjc27lrc5w";
+    sha256 = "12779h2ich6w79bm2wgaaxd9hr6kpxavj4bdrnvm44a0r02kk2vl";
   };
 
   buildInputs = [
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
       --replace /etc/mime.types ${mime-types}/etc/mime.types
 
     # The string conversion tests all fail with the first version of neomutt
-    # that has tests (20180223) as well as 20180323 so we disable them for now.
+    # that has tests (20180223) as well as 20180512 so we disable them for now.
     # I don't know if that is related to the tests or our build environment.
     # Try again with a later release.
     sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c
-- 
GitLab


From b15375130fefc66e2cf8314515cb430c79c657db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Mon, 14 May 2018 09:51:59 +0200
Subject: [PATCH 0691/1085] clojure: 1.9.0.375 -> 1.9.0.381

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

diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 4340b68d8f7..4843653e5dc 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "clojure-${version}";
-  version = "1.9.0.375";
+  version = "1.9.0.381";
 
   src = fetchurl {
     url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "17a82dw5akhzlz4az9bh6s8rnz6nfgq50d8si0lwg212niq3c599";
+    sha256 = "18aqfjm6vbhlflxdnpcr9gib00zg2ys5hck4kfxr9rc4aylnn9pi";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From d6974a11b2d0b4c5c92c40a2ef9f4ebe8abf86bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 00:58:38 -0700
Subject: [PATCH 0692/1085] mate.mate-panel: 1.20.1 -> 1.21.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/mate-desktop-item-edit -h’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/mate-desktop-item-edit --help’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/mate-panel-test-applets -h’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/mate-panel-test-applets --help’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/.mate-desktop-item-edit-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/.mate-desktop-item-edit-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/.mate-panel-test-applets-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/.mate-panel-test-applets-wrapped --help’ got 0 exit code
- found 1.21.0 with grep in /nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0
- directory tree listing: https://gist.github.com/ea7810820311098527d7248a349b1657
- du listing: https://gist.github.com/967206660f695b80197cc7440dee23d5
---
 pkgs/desktops/mate/mate-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index df1c15bddd3..c0c3cd48376 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-panel-${version}";
-  version = "1.20.1";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1vmvn93apvq6r9m823zyrncbxgsjr4nmigw9k4s4n05z8zd8wy8k";
+    sha256 = "0vn523jscmxhyv80fmrnvk1wmyp4kdzr4g7yypqnsg4kg2gmr7x0";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 32af5711895551fdf6804d2684f7e5e9ae503b60 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 01:02:44 -0700
Subject: [PATCH 0693/1085] links: 2.15 -> 2.16

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.16 with grep in /nix/store/bqfvaiwnj8bg69d0amarchz9yq7hsg8l-links2-2.16
- directory tree listing: https://gist.github.com/63794d9062d2bfacd2eb8e3d67b1e882
- du listing: https://gist.github.com/d1615a45d8130ac6fdfa50f96b788387
---
 pkgs/applications/networking/browsers/links2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 7c007e228f8..bb8eb83d6bf 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.15";
+  version = "2.16";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "1jp3xyvp87a188b4kg5ycqahrazj7928zncgsznzn54w8d5iqahy";
+    sha256 = "0gsa2gpb1grhssl5jzpc5pa0zi21mxi8g25rh5bacl70slw31w42";
   };
 
   buildInputs = with stdenv.lib;
-- 
GitLab


From c56dcb430d8c4c279699e0358bb09dc6e34278b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 01:08:45 -0700
Subject: [PATCH 0694/1085] libsForQt5.mlt: 6.6.0 -> 6.8.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0/bin/melt -h’ got 0 exit code
- ran ‘/nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0/bin/melt --help’ got 0 exit code
- ran ‘/nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0/bin/melt help’ got 0 exit code
- ran ‘/nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0/bin/.melt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0/bin/.melt-wrapped --help’ got 0 exit code
- ran ‘/nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0/bin/.melt-wrapped help’ got 0 exit code
- found 6.8.0 with grep in /nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0
- directory tree listing: https://gist.github.com/486acd53034e92704cc044a92c6e32ef
- du listing: https://gist.github.com/ff98100a51f78de609043361454df0b1
---
 pkgs/development/libraries/mlt/qt-5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix
index 27f7cf31cbf..96b21601cca 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in
 
 stdenv.mkDerivation rec {
   name = "mlt-${version}";
-  version = "6.6.0";
+  version = "6.8.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     rev = "v${version}";
-    sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q";
+    sha256 = "0hmxlz3i9yasw5jdkrczak8shzlnpi1acaahn50lvgg9b14kg7b8";
   };
 
   buildInputs = [
-- 
GitLab


From 5d78859c15843cdbb1751806f5087c3cd5f887f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 01:53:22 -0700
Subject: [PATCH 0695/1085] libmediainfo: 18.03.1 -> 18.05

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 18.05 with grep in /nix/store/5qyyi56b38pqwkrz245xv8skn3bsflzg-libmediainfo-18.05
- directory tree listing: https://gist.github.com/74cf8ceacead58990e67775b627a172a
- du listing: https://gist.github.com/a515ce2cc6f6d9f886c1948aa1d3e561
---
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 8c204ba4006..3ba513f9078 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "18.03.1";
+  version = "18.05";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "183gcb6h81blgvssfl5lxsv8h5izkgg6b86z0jy9g699adgkchq2";
+    sha256 = "08ajrmbvqn2cvfq3jjdh64lma77kx4di5vg632c6bmbir89rcxbn";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From fe501325560db749caab02e9987f8ea51d0d26a8 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 14 May 2018 17:32:10 +0800
Subject: [PATCH 0696/1085] kde-applications: 18.04.0 -> 18.04.1

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 1696 ++++++++++++++++----------------
 2 files changed, 849 insertions(+), 849 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index a2feeac7cd9..0646e258b40 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/18.04.0/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/18.04.1/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 36c18a3f997..5514345057d 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1699 +3,1699 @@
 
 {
   akonadi = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-18.04.0.tar.xz";
-      sha256 = "1scbc6k2w23qmw4qa147ji7r6p88b97yi9wr46xlshgcn2kj684d";
-      name = "akonadi-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-18.04.1.tar.xz";
+      sha256 = "0dg0r49angzkp5b09zbxjygjaxn1d50db15rwm7v9xsnz6fmc6hv";
+      name = "akonadi-18.04.1.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-18.04.0.tar.xz";
-      sha256 = "09fk8n69f83ygwfsdjx4mv9hwqpifpv9nbdnl19pjgw2ffp99rna";
-      name = "akonadi-calendar-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-calendar-18.04.1.tar.xz";
+      sha256 = "0anmy67dc85afc0aq6y813c6xjr0jnkzsh56889zyz8z7k9xpg2q";
+      name = "akonadi-calendar-18.04.1.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-tools-18.04.0.tar.xz";
-      sha256 = "1b10kybjj803qwsz74dhism6q7q0lmslqvsb8b9ma8wqk9ajs33f";
-      name = "akonadi-calendar-tools-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-calendar-tools-18.04.1.tar.xz";
+      sha256 = "1935d5nwq2s8ijc9nzp7rdsmbyl2b42xwx0vj7cz1835y4w3k2vn";
+      name = "akonadi-calendar-tools-18.04.1.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadiconsole-18.04.0.tar.xz";
-      sha256 = "053w5ywm8wlv7ssbvyq0z36jsir9mk0ywlqb0ybnlbvr5dawxnnz";
-      name = "akonadiconsole-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadiconsole-18.04.1.tar.xz";
+      sha256 = "032r5r5ksifigx8bk82yygvhji1xjx3dd6i7z7mpx5qlc1zmqjpk";
+      name = "akonadiconsole-18.04.1.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-contacts-18.04.0.tar.xz";
-      sha256 = "01cfxia8vnwizzavk1vbrxbszsyg1sa3qbz79fab7iw8380zqdm2";
-      name = "akonadi-contacts-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-contacts-18.04.1.tar.xz";
+      sha256 = "1y1qcndsrdphii048cpwnfnd185mywcaw1h1szq71q2ww2aapcmp";
+      name = "akonadi-contacts-18.04.1.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-import-wizard-18.04.0.tar.xz";
-      sha256 = "123gaxs5zi5b8x1ripr8ldjipx6rpmr3f51mgv40ibx1h967in19";
-      name = "akonadi-import-wizard-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-import-wizard-18.04.1.tar.xz";
+      sha256 = "150i8m7ngb6kdyixvzfgnjwyrs2xpsd53gy2x28091kg2kqb0nl4";
+      name = "akonadi-import-wizard-18.04.1.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-mime-18.04.0.tar.xz";
-      sha256 = "14xgi5saylbp19gg0lnqpasz5x335wz6dnmpfsicz0j5452yfznw";
-      name = "akonadi-mime-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-mime-18.04.1.tar.xz";
+      sha256 = "0ypfbrr8h2nypdyg8xxs4d53qlbq4kd3ph2yhafp80577xwhqgmw";
+      name = "akonadi-mime-18.04.1.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-notes-18.04.0.tar.xz";
-      sha256 = "0ahr185jjyh68qf57vaja6c867rm0iy8jp78g4nmzf3dc6y7r01v";
-      name = "akonadi-notes-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-notes-18.04.1.tar.xz";
+      sha256 = "0f4q6ls7z5ikf46v7m0wazdczay8y3yvscw1lnmq5qwnvdfyqcpd";
+      name = "akonadi-notes-18.04.1.tar.xz";
     };
   };
   akonadi-search = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-search-18.04.0.tar.xz";
-      sha256 = "1jn23rr9yah2c4cccbkcvxn4rr6p0q4327b0kwjqzag4lkwd2fy0";
-      name = "akonadi-search-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-search-18.04.1.tar.xz";
+      sha256 = "01mfj7s3kx5kcjbvj4hljfrmsbpfmfiq0r87cgzg6734c4mzjqsl";
+      name = "akonadi-search-18.04.1.tar.xz";
     };
   };
   akregator = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akregator-18.04.0.tar.xz";
-      sha256 = "10hid155gszwh7gxp4pqbcfch6hrf0bsikj8ah2fvdgii96dn9gc";
-      name = "akregator-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akregator-18.04.1.tar.xz";
+      sha256 = "0h5pdbrwxa3n086yywqsm0m8x9p1s5jy2hgjivdilxgwnqcj6zpv";
+      name = "akregator-18.04.1.tar.xz";
     };
   };
   analitza = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/analitza-18.04.0.tar.xz";
-      sha256 = "1yx18mbxvkswpn120rhi092l5wz6s60194q076wdgimx71ngn2v2";
-      name = "analitza-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/analitza-18.04.1.tar.xz";
+      sha256 = "09y3zz6zn3cs5nn0i0dcx71jrm0lzz3g8af6nz118m6rz71wndnq";
+      name = "analitza-18.04.1.tar.xz";
     };
   };
   ark = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ark-18.04.0.tar.xz";
-      sha256 = "19bh71j5dvz80mz9xff4ygd0qdvjwsihyx5cb5ay6a2gdf1fhm12";
-      name = "ark-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ark-18.04.1.tar.xz";
+      sha256 = "10gpm90zsssygl65280z4p43ma75qjswiyv4drlrksydakxvvxk3";
+      name = "ark-18.04.1.tar.xz";
     };
   };
   artikulate = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/artikulate-18.04.0.tar.xz";
-      sha256 = "1fqv71przn3yfv4dk511bh5bd0cdmwkixwcg17r037nmj3z0xdhg";
-      name = "artikulate-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/artikulate-18.04.1.tar.xz";
+      sha256 = "0brpb7ijqib7qp5ypvz9gkai7mwdxf915a7makklgzg80mdqnxpv";
+      name = "artikulate-18.04.1.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/audiocd-kio-18.04.0.tar.xz";
-      sha256 = "0rf8gk8wymk6lff5g4ivx5lfl31rml1ag40fq78nrvnw0sxkm2b1";
-      name = "audiocd-kio-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/audiocd-kio-18.04.1.tar.xz";
+      sha256 = "1g3waj7xb14fgb75b0zzhbai93yqv5r1p0n0j3rwhfg9bvkgqgpa";
+      name = "audiocd-kio-18.04.1.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/baloo-widgets-18.04.0.tar.xz";
-      sha256 = "1y1wxgwyjdarw6sj7mrsqgljh2fib0vcwwd0nzbnn8ys1v8gqyxj";
-      name = "baloo-widgets-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/baloo-widgets-18.04.1.tar.xz";
+      sha256 = "1bq2n7lpldi2qiwdgx6l78m41whdjd41n1247985d1cr62bsn5cq";
+      name = "baloo-widgets-18.04.1.tar.xz";
     };
   };
   blinken = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/blinken-18.04.0.tar.xz";
-      sha256 = "19chf9d9d537a5daqca1i4a58gmxz98x4i5palqs3635w1655ln9";
-      name = "blinken-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/blinken-18.04.1.tar.xz";
+      sha256 = "0sgaipxfzwjfikyj2r47vp0192s8v0zll2x61i9z6p6lzq7glw0j";
+      name = "blinken-18.04.1.tar.xz";
     };
   };
   bomber = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/bomber-18.04.0.tar.xz";
-      sha256 = "1vzqmjkxlw2v63f49ix63p6ypjgg31j8r0rzmq8m41262m3pp0sn";
-      name = "bomber-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/bomber-18.04.1.tar.xz";
+      sha256 = "13ivb42jq2864vdpajds3cwjhhml7ikww66z1r6j4wp8mlmdlnal";
+      name = "bomber-18.04.1.tar.xz";
     };
   };
   bovo = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/bovo-18.04.0.tar.xz";
-      sha256 = "1p4s7kjrjndcqkrkk3y7dqvyfdrn1yy5id3z3wj06ciwpygvv500";
-      name = "bovo-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/bovo-18.04.1.tar.xz";
+      sha256 = "1lm465vcmf4glql9krxl36sr6msgayqkzinammw9ian1wmih9qbn";
+      name = "bovo-18.04.1.tar.xz";
     };
   };
   calendarsupport = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/calendarsupport-18.04.0.tar.xz";
-      sha256 = "0hd1pbqjd75d8fm86b358xd8dni019b2190ly2r3armanjcmdc4r";
-      name = "calendarsupport-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/calendarsupport-18.04.1.tar.xz";
+      sha256 = "02zw1hyqwy031bg0nyxjvayjfamm0z9iw9v9f71hfrsi9siyf77a";
+      name = "calendarsupport-18.04.1.tar.xz";
     };
   };
   cantor = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/cantor-18.04.0.tar.xz";
-      sha256 = "1zkpa0ihkylzdf5wlywdvnf34dk21nj5cyczjyh9x5psbr6q0151";
-      name = "cantor-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/cantor-18.04.1.tar.xz";
+      sha256 = "1hcdf755yzs8kz6qbxan47gn622pg137sqabfbvqjflnphzz7f08";
+      name = "cantor-18.04.1.tar.xz";
     };
   };
   cervisia = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/cervisia-18.04.0.tar.xz";
-      sha256 = "1ji8i0k6rzmgshpgpk613vkn6kvdwb0ns32cp19j0bd5ljr701wq";
-      name = "cervisia-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/cervisia-18.04.1.tar.xz";
+      sha256 = "03slkk30k747f73dk98q4b930m7w1cimim053hl9y50n1c63n021";
+      name = "cervisia-18.04.1.tar.xz";
     };
   };
   dolphin = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/dolphin-18.04.0.tar.xz";
-      sha256 = "0lvdpa3mq6mhfl97a4q1wwg22zccwjf7ja1mbz1dlbjfnck8l1mm";
-      name = "dolphin-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/dolphin-18.04.1.tar.xz";
+      sha256 = "11wm2wqmkni798xj6g8z7r6qyfy6db9k7xwnp90k2g1qb5n0xnsh";
+      name = "dolphin-18.04.1.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/dolphin-plugins-18.04.0.tar.xz";
-      sha256 = "10kdf2h8i1jnbsnx9j4c8zs6ryakinhxrggrid038xqgxm4fyxcq";
-      name = "dolphin-plugins-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/dolphin-plugins-18.04.1.tar.xz";
+      sha256 = "00azpyy8xh0d62vayj04l3cbwxgxax430wh35jbv828vng3d2pfc";
+      name = "dolphin-plugins-18.04.1.tar.xz";
     };
   };
   dragon = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/dragon-18.04.0.tar.xz";
-      sha256 = "0maxlhac9znqsm7qf3c9g7vlramivy63wd8c9aj64c78jqj6l54w";
-      name = "dragon-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/dragon-18.04.1.tar.xz";
+      sha256 = "1phrgssp3x11dmg07yvyi1hsmigfw8q6bblsizr9xm0pvmgrdjl0";
+      name = "dragon-18.04.1.tar.xz";
     };
   };
   eventviews = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/eventviews-18.04.0.tar.xz";
-      sha256 = "0ai0259ygriza057dn3l6kfapqc2zdp7prv7qrz0x2akssnvn5f3";
-      name = "eventviews-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/eventviews-18.04.1.tar.xz";
+      sha256 = "0jq1adi764a4w1kszhbdm49dylbwai4ipasjyrkqnf85xly48g40";
+      name = "eventviews-18.04.1.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ffmpegthumbs-18.04.0.tar.xz";
-      sha256 = "08hirsm7gbk51i76kkavv50z3289zvphmkfh26lh6rg123f003i6";
-      name = "ffmpegthumbs-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ffmpegthumbs-18.04.1.tar.xz";
+      sha256 = "06ls31wxgvnc4c7bc3ba14w4w64b9x37q3zmcnslyydghhnr0qnn";
+      name = "ffmpegthumbs-18.04.1.tar.xz";
     };
   };
   filelight = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/filelight-18.04.0.tar.xz";
-      sha256 = "1mk46a9x40yj7vfjgprhdhmx151lhkv8zb1i4rks01zjpq8bpa43";
-      name = "filelight-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/filelight-18.04.1.tar.xz";
+      sha256 = "1w169433m5823h1axn4ami9hk4rimi87ypiqagyyl13bncb7s6as";
+      name = "filelight-18.04.1.tar.xz";
     };
   };
   granatier = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/granatier-18.04.0.tar.xz";
-      sha256 = "1vfp4wqv13qxj5vaiqd6hn07hvmdkyrcdicxn693yprn32gqrn33";
-      name = "granatier-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/granatier-18.04.1.tar.xz";
+      sha256 = "0q5a2w2bz40qnk7jpcknsc4758k91cd1rh3rxa4v4wlq51id7lzz";
+      name = "granatier-18.04.1.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/grantlee-editor-18.04.0.tar.xz";
-      sha256 = "04mw1mskfaqp7klwc0bdwfm3j365pwkwi0yhp86dggxzyisqbx9h";
-      name = "grantlee-editor-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/grantlee-editor-18.04.1.tar.xz";
+      sha256 = "0ysirk51y993jxvvk98h2r9awsc4zyijavfja6zl0gsnvwwrjnjs";
+      name = "grantlee-editor-18.04.1.tar.xz";
     };
   };
   grantleetheme = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/grantleetheme-18.04.0.tar.xz";
-      sha256 = "1i3axg318skx2ifg8fln5blpyj6qnzb0r7frqb9prm0rawk6cr03";
-      name = "grantleetheme-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/grantleetheme-18.04.1.tar.xz";
+      sha256 = "0gzsxxywaqs6lc111hsw736p6gz55xs77v9bpk48igk37r9a0rs8";
+      name = "grantleetheme-18.04.1.tar.xz";
     };
   };
   gwenview = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/gwenview-18.04.0.tar.xz";
-      sha256 = "0i87k3f1g9w36rzr60c2xw6r41k7zgnbda51mpd3i8q5mvi8r4z5";
-      name = "gwenview-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/gwenview-18.04.1.tar.xz";
+      sha256 = "0wyxwqsf2nynz4h87lgy1xla8nj7mi94b997pmp70jzy4936l8bi";
+      name = "gwenview-18.04.1.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/incidenceeditor-18.04.0.tar.xz";
-      sha256 = "1z76lz8h0f6h81xvk690h1pz6i1ca4k2kcdvxxj99xm3fxdw5gi4";
-      name = "incidenceeditor-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/incidenceeditor-18.04.1.tar.xz";
+      sha256 = "0kc18pml59mhn9bn0g96mw46dmxq7crgn4033dxsfczak0kdr474";
+      name = "incidenceeditor-18.04.1.tar.xz";
     };
   };
   juk = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/juk-18.04.0.tar.xz";
-      sha256 = "0k0kiksqmnp14y3ymfiwg0amv4wyk2ls4cbdimbwg0mvpyvfnnqa";
-      name = "juk-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/juk-18.04.1.tar.xz";
+      sha256 = "01zgxxx00hxag29883xfgw4r0m4j66iwr83bap55ni018xgkf4c3";
+      name = "juk-18.04.1.tar.xz";
     };
   };
   k3b = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/k3b-18.04.0.tar.xz";
-      sha256 = "167x2mcxj4zq05brxzvhm157sis13xahkv79i9pzbgjb1zx17s3l";
-      name = "k3b-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/k3b-18.04.1.tar.xz";
+      sha256 = "0py84q63r40mh8pp0r70gzwidfxv9kj5firvr7pp59rk9fsxznl7";
+      name = "k3b-18.04.1.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kaccounts-integration-18.04.0.tar.xz";
-      sha256 = "09l1ycy4000mxx86hkqigbg803190r159d2yjsfrs7q5i2jrsl09";
-      name = "kaccounts-integration-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kaccounts-integration-18.04.1.tar.xz";
+      sha256 = "1abyhaa7gj2admk6kf555sbwzc7yha3ql41dhw4j3k6kpzkqk9zj";
+      name = "kaccounts-integration-18.04.1.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kaccounts-providers-18.04.0.tar.xz";
-      sha256 = "07ra8pjd89qklvb771wcczbxwll86caz07v43a7fhs3f70nwizia";
-      name = "kaccounts-providers-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kaccounts-providers-18.04.1.tar.xz";
+      sha256 = "15ygghq434qkj1z5iislm8fz0m8z6rkpiyrcjbmqs0cw4s0mqzp6";
+      name = "kaccounts-providers-18.04.1.tar.xz";
     };
   };
   kaddressbook = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kaddressbook-18.04.0.tar.xz";
-      sha256 = "0fi5nxhp93i1j4dym2yjsnvbxkqvqlanka3cnzbya4abdzrjd9ir";
-      name = "kaddressbook-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kaddressbook-18.04.1.tar.xz";
+      sha256 = "0w02gc9l8jhzf15ljig83ddbkzf430k1qbqp821b3rz5s20gg4m5";
+      name = "kaddressbook-18.04.1.tar.xz";
     };
   };
   kajongg = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kajongg-18.04.0.tar.xz";
-      sha256 = "0cbgy6zkjd5yd6ybm9v7gvp2hs99m7m8w2my36fqp1sczghjs7x5";
-      name = "kajongg-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kajongg-18.04.1.tar.xz";
+      sha256 = "1vpkj42ylzpakrqy84hkp0hvj4q4x7wnarwwqqj8xp4xi40na481";
+      name = "kajongg-18.04.1.tar.xz";
     };
   };
   kalarm = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kalarm-18.04.0.tar.xz";
-      sha256 = "0v4zfv48n116j68cfd34vlgk9jyr1zfc8i36i7gjkaq2x9m80g02";
-      name = "kalarm-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kalarm-18.04.1.tar.xz";
+      sha256 = "0v6maszs79959jkciy5j9xnqggr9ymjzvsibr1j5s30kynlzpxkm";
+      name = "kalarm-18.04.1.tar.xz";
     };
   };
   kalarmcal = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kalarmcal-18.04.0.tar.xz";
-      sha256 = "0npvwjzrxyf447xyq4kbx5wh94fv7clfjvikwnla9l0s8xwv9gf7";
-      name = "kalarmcal-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kalarmcal-18.04.1.tar.xz";
+      sha256 = "1j04wdb6vg2896hb8y28lm8sna0lil8021i2kw97crfhramldvjk";
+      name = "kalarmcal-18.04.1.tar.xz";
     };
   };
   kalgebra = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kalgebra-18.04.0.tar.xz";
-      sha256 = "0qk9dchqlklbxssmhfz38s792nidlfh1bkhrmxh5kvpkjziqg7k6";
-      name = "kalgebra-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kalgebra-18.04.1.tar.xz";
+      sha256 = "0gg1fb4cgnnrxyrm554847kpa1bs57zgi9ia8f9wmcivyd35vvyf";
+      name = "kalgebra-18.04.1.tar.xz";
     };
   };
   kalzium = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kalzium-18.04.0.tar.xz";
-      sha256 = "02c51r4pqj9iyy2wzrilpzd5z8b1lvbv2mian2qr1psi56l3magv";
-      name = "kalzium-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kalzium-18.04.1.tar.xz";
+      sha256 = "00x2jql639rmbvcfj72yjmfb98f9msfwi2g2mqyww43ja3c835ic";
+      name = "kalzium-18.04.1.tar.xz";
     };
   };
   kamera = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kamera-18.04.0.tar.xz";
-      sha256 = "07p51jjp0lj04gfs1mfbg6k6cdh6ms55yjcag7qhcz32ism0y1vc";
-      name = "kamera-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kamera-18.04.1.tar.xz";
+      sha256 = "1ra7hdvs6fnkbzqvm5sryk6ymlgj0ngsg98yhznda0qvrrkgfahg";
+      name = "kamera-18.04.1.tar.xz";
     };
   };
   kamoso = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kamoso-18.04.0.tar.xz";
-      sha256 = "1d7989jr3g02yh10hmnf8mlqypp35xll52v5q6jjqrzbfcmna7dk";
-      name = "kamoso-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kamoso-18.04.1.tar.xz";
+      sha256 = "1rd08647zx2k7xq8jclxsk0dgjgdaih6fxmnrd7awzjmj0qh89a7";
+      name = "kamoso-18.04.1.tar.xz";
     };
   };
   kanagram = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kanagram-18.04.0.tar.xz";
-      sha256 = "1drz8641ns1c1070a98w2wasyvf5nc6jrpn1pzfqmv9bljxrmyrc";
-      name = "kanagram-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kanagram-18.04.1.tar.xz";
+      sha256 = "0g4zmr10jq9vw92z9nbfvigz6pbjg1p1zc1aspwlh38ajk8sr3gb";
+      name = "kanagram-18.04.1.tar.xz";
     };
   };
   kapman = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kapman-18.04.0.tar.xz";
-      sha256 = "0cpsm35sah99rxy42v5isd90w0j839537jmjck4lg40dx38sdz7m";
-      name = "kapman-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kapman-18.04.1.tar.xz";
+      sha256 = "14s2kg50r9nlg53vsi1x59kc8z1rgnqcq028a6zwfnv0sdsa7pw5";
+      name = "kapman-18.04.1.tar.xz";
     };
   };
   kapptemplate = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kapptemplate-18.04.0.tar.xz";
-      sha256 = "1w61s7bj34vq3s9ca3d6kyv9k43qirnyj4mw73wfpxf6ldx19yzp";
-      name = "kapptemplate-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kapptemplate-18.04.1.tar.xz";
+      sha256 = "064pw1fkbm52pkcg9hyay8mkraw3fdlycgx306p9brahvxb9xjsb";
+      name = "kapptemplate-18.04.1.tar.xz";
     };
   };
   kate = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kate-18.04.0.tar.xz";
-      sha256 = "04kb8ynkq6xwmjbrgfg4zv652p3zgr2127f6sb8sq0j9qy55pvq5";
-      name = "kate-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kate-18.04.1.tar.xz";
+      sha256 = "1xbckjsp5imxcda8vrdb5flgb5sjmdylwy1yr5v01nilmqgpmwa8";
+      name = "kate-18.04.1.tar.xz";
     };
   };
   katomic = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/katomic-18.04.0.tar.xz";
-      sha256 = "119v88k2l1bpmf1gm9njkfv90pv595wwjlzkap06c6rx95scpi0q";
-      name = "katomic-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/katomic-18.04.1.tar.xz";
+      sha256 = "0g3kkibgnxkg5zxgja7rqad57fpw28qapf8rlbczkmxls581ifw6";
+      name = "katomic-18.04.1.tar.xz";
     };
   };
   kbackup = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kbackup-18.04.0.tar.xz";
-      sha256 = "0vayj48zgblsphwffs6b0xphzair6sywy0ksp6ab9x64n8f1mw5q";
-      name = "kbackup-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kbackup-18.04.1.tar.xz";
+      sha256 = "1gv5m4d6zcadamcicllfp8smm7k4846a2qy4pgm006lhk390bsyz";
+      name = "kbackup-18.04.1.tar.xz";
     };
   };
   kblackbox = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kblackbox-18.04.0.tar.xz";
-      sha256 = "1gpjnic6n4kyh7b6x0mb9162qv223fs6lm7iqh6qxwkixcp06qlx";
-      name = "kblackbox-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kblackbox-18.04.1.tar.xz";
+      sha256 = "0hv6ziw2dy88fbc1z0vlflagsrr7x97r9c5l4w9v4acr0ih7ms7h";
+      name = "kblackbox-18.04.1.tar.xz";
     };
   };
   kblocks = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kblocks-18.04.0.tar.xz";
-      sha256 = "1y2h1nwgr67b05ggl2v34jh097mzbljhz9ji332xv4vf2rffwqar";
-      name = "kblocks-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kblocks-18.04.1.tar.xz";
+      sha256 = "12339f1g73h3qg9a21kqmkqp6ywiw1gvnwdww45dzflf4w931lsw";
+      name = "kblocks-18.04.1.tar.xz";
     };
   };
   kblog = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kblog-18.04.0.tar.xz";
-      sha256 = "1jnsd6fw3pyip71a2cw65y9yrm4zwczh0770n15jcg5yn5whswgs";
-      name = "kblog-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kblog-18.04.1.tar.xz";
+      sha256 = "1gndfvny1zh2w1daxmpix5sn2wlbc2430m3a21lvgp3qmhb5rwkr";
+      name = "kblog-18.04.1.tar.xz";
     };
   };
   kbounce = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kbounce-18.04.0.tar.xz";
-      sha256 = "15926m75gysd6gl2vg7d08y4m0cnfazc9jlyx0cnb8a5nfzh5z21";
-      name = "kbounce-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kbounce-18.04.1.tar.xz";
+      sha256 = "0qjbzmjgcvxbpvbqxyyh02pk5hr6z871n13awsq770xwbr1pdnwc";
+      name = "kbounce-18.04.1.tar.xz";
     };
   };
   kbreakout = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kbreakout-18.04.0.tar.xz";
-      sha256 = "0i5pbiimrn2bkq94ggwlx7jhfw4wna5srgffa5531jpn28gq456n";
-      name = "kbreakout-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kbreakout-18.04.1.tar.xz";
+      sha256 = "0yr9hwlwdp1fi2parzniyq5rfv4fxbxxs63xfggaz7ndbm1h8bif";
+      name = "kbreakout-18.04.1.tar.xz";
     };
   };
   kbruch = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kbruch-18.04.0.tar.xz";
-      sha256 = "0s7r0hqy4nyrg0ndrb93pd8akldc5k8xx31m4jc8gi23aqvz5wwk";
-      name = "kbruch-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kbruch-18.04.1.tar.xz";
+      sha256 = "08wb7f2jhz3dkx22sj2k4sairl715nrk7c2swd88dcaskcy411nk";
+      name = "kbruch-18.04.1.tar.xz";
     };
   };
   kcachegrind = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcachegrind-18.04.0.tar.xz";
-      sha256 = "0f6f8wx0kffhhzjjcdn47m3428jbh95nzajm8vhbs789h69ax2a0";
-      name = "kcachegrind-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcachegrind-18.04.1.tar.xz";
+      sha256 = "1mig7xm67w3vwslymbfm51w8w9cnqzk41kqp998j6g7dfrh8476g";
+      name = "kcachegrind-18.04.1.tar.xz";
     };
   };
   kcalc = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcalc-18.04.0.tar.xz";
-      sha256 = "03q09q5whg1wfgm30p426hlljignjs0lvwfak2n4ka9ggyk3vc9d";
-      name = "kcalc-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcalc-18.04.1.tar.xz";
+      sha256 = "14j2w9w31cqmsls3zrgifywbz5bxkzkryggfd1jxiz9q526ylpxy";
+      name = "kcalc-18.04.1.tar.xz";
     };
   };
   kcalcore = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcalcore-18.04.0.tar.xz";
-      sha256 = "0g4gm47yniy4f11v6rhs3gp2lk8dcrnw8ajchz88s7spii0riv2m";
-      name = "kcalcore-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcalcore-18.04.1.tar.xz";
+      sha256 = "0q23pb9pkii6czk3angl3xzlzc90fck1pwc05695rz90iwbxq62x";
+      name = "kcalcore-18.04.1.tar.xz";
     };
   };
   kcalutils = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcalutils-18.04.0.tar.xz";
-      sha256 = "1hh3gd81bfkbyr7qvppk8iaywac77y55rwkpvbvin62snipw6ap1";
-      name = "kcalutils-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcalutils-18.04.1.tar.xz";
+      sha256 = "05ma56f0ly8nq62p6nlzkscdq5m93142kakhqrsl17c902bvkcmm";
+      name = "kcalutils-18.04.1.tar.xz";
     };
   };
   kcharselect = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcharselect-18.04.0.tar.xz";
-      sha256 = "08qgwfz23634wv0fw0rx162rcav5fivsp63srdf4c6my5151nxa9";
-      name = "kcharselect-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcharselect-18.04.1.tar.xz";
+      sha256 = "0pv22v1x3n73rxzpihsxz5xxy1c37lq72jcscwylwmwfyszmvdwx";
+      name = "kcharselect-18.04.1.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcolorchooser-18.04.0.tar.xz";
-      sha256 = "02lqg4ra2nrkfnlhirs148bsd3b5a1j81s9z84wg11z8havrabfn";
-      name = "kcolorchooser-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcolorchooser-18.04.1.tar.xz";
+      sha256 = "1wzy9a3pz0jwwmgbqxqlfii0faascrxnxq398wzrnx955shlksbm";
+      name = "kcolorchooser-18.04.1.tar.xz";
     };
   };
   kcontacts = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcontacts-18.04.0.tar.xz";
-      sha256 = "0ja9xbpvv6klwwg0rzppxhfj2nfb7dydadxw5f9471rzniywn1xb";
-      name = "kcontacts-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcontacts-18.04.1.tar.xz";
+      sha256 = "0725cad646qzpgpvxl0vyb1a4hpbk0b6zb3wbdim4al56y7x1rxh";
+      name = "kcontacts-18.04.1.tar.xz";
     };
   };
   kcron = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcron-18.04.0.tar.xz";
-      sha256 = "0pm532pajm7kbzg7w7azi5qx5xnkc9k5crxbahpw8n32lq34lm18";
-      name = "kcron-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcron-18.04.1.tar.xz";
+      sha256 = "1wlk36s6i53vk4crrvijbfmagh5d8sjbmcacdwdcf4vlb56kxphr";
+      name = "kcron-18.04.1.tar.xz";
     };
   };
   kdav = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdav-18.04.0.tar.xz";
-      sha256 = "159bll2b3anxj5i7i92cqsz7hqm66n5ihlzk1g7waqdc9b429hr2";
-      name = "kdav-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdav-18.04.1.tar.xz";
+      sha256 = "16abp767h4rs35yj0j8kgmhm4k09cidnsmh1ihx2b53ya1ivmv9b";
+      name = "kdav-18.04.1.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdebugsettings-18.04.0.tar.xz";
-      sha256 = "0fr5a0k9jv8zkzv7fl7r71c2gbd1jj3c0vwpyf5riskymznnrx9g";
-      name = "kdebugsettings-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdebugsettings-18.04.1.tar.xz";
+      sha256 = "1bz5wcap6kqjv6164zm7wcm31q634785lqlarsc5hqld5xjgr7ig";
+      name = "kdebugsettings-18.04.1.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kde-dev-scripts-18.04.0.tar.xz";
-      sha256 = "0nnrzpqgzmfg3msx6vqc8js7yzdpscm9599pr4xs4jl4cx5m8vp8";
-      name = "kde-dev-scripts-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kde-dev-scripts-18.04.1.tar.xz";
+      sha256 = "08wsj1h44lmvvv43k9l3mxvi2hr498hz3d22z0bwcdjaqgvy60r5";
+      name = "kde-dev-scripts-18.04.1.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kde-dev-utils-18.04.0.tar.xz";
-      sha256 = "020dyzf078l91rs7sl1dkdbd08viizinsmbvf1f0kfbkfysccfci";
-      name = "kde-dev-utils-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kde-dev-utils-18.04.1.tar.xz";
+      sha256 = "13wpa4xrkm3711vdwjkklibaf7as64klw4hpq9s9vx33ma73sf9a";
+      name = "kde-dev-utils-18.04.1.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdeedu-data-18.04.0.tar.xz";
-      sha256 = "0rx9ymyv6x29fwl6hvznvylq6gvw992rg3l8mk4qmmzjs4rbjb5q";
-      name = "kdeedu-data-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdeedu-data-18.04.1.tar.xz";
+      sha256 = "1ccf8bjd2fc2chgf63bwg91c0r4acxf40w81rssi83wjvnhg4d5j";
+      name = "kdeedu-data-18.04.1.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-mobipocket-18.04.0.tar.xz";
-      sha256 = "01g00k3yqsrahslshybd1azd9w0vgmacfs0yrz5ia93amw4azfhn";
-      name = "kdegraphics-mobipocket-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdegraphics-mobipocket-18.04.1.tar.xz";
+      sha256 = "1y9bjnpbpriyhs007wli7m0q5g9wv2d7izp0qxk4xzmrrw7k5v51";
+      name = "kdegraphics-mobipocket-18.04.1.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-thumbnailers-18.04.0.tar.xz";
-      sha256 = "1j04bwp9hc9jc7si6jgg4y61jqic27zj094nv2xpwrxnnaz4y4nh";
-      name = "kdegraphics-thumbnailers-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdegraphics-thumbnailers-18.04.1.tar.xz";
+      sha256 = "06798hwxyd2xvf3aiigwzd53frzi0mqxsbxliznqxxjvk5lcp1ha";
+      name = "kdegraphics-thumbnailers-18.04.1.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdenetwork-filesharing-18.04.0.tar.xz";
-      sha256 = "1qfd7jr171bc4alm139hhdiv9q0x8y7mhrkyb7qspr7a8ki8j5cg";
-      name = "kdenetwork-filesharing-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdenetwork-filesharing-18.04.1.tar.xz";
+      sha256 = "18dilp18312v1zbrfq5rq223s6cy2lmdmgvp2hg5a25rmldw1yiw";
+      name = "kdenetwork-filesharing-18.04.1.tar.xz";
     };
   };
   kdenlive = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdenlive-18.04.0.tar.xz";
-      sha256 = "0v54cisilijdq0hyl38fhz0m7lpvphqjvx046ighcqxbrcg6pgah";
-      name = "kdenlive-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdenlive-18.04.1.tar.xz";
+      sha256 = "059xqybn3r1w432mbnxx5ds1whj5x23ym2lm90wg23b9hmmmhxl3";
+      name = "kdenlive-18.04.1.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdepim-addons-18.04.0.tar.xz";
-      sha256 = "0rcfx07cvpm22kskwry78wzhglpc0vzxavmjydi24lll9ac12mvc";
-      name = "kdepim-addons-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdepim-addons-18.04.1.tar.xz";
+      sha256 = "1qninnlhwmkw6nxxymjww1x7krm87nz5m6p66y3ghrgyl0q16k7b";
+      name = "kdepim-addons-18.04.1.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdepim-apps-libs-18.04.0.tar.xz";
-      sha256 = "1ax5y6cdw7klgxky121mk8ilpm257bc8h90pc89ziha888l39wgz";
-      name = "kdepim-apps-libs-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdepim-apps-libs-18.04.1.tar.xz";
+      sha256 = "1a41km8nhgrc24qlgh64560p8il6q9dlcmy25x92s1xmpn1zg1lc";
+      name = "kdepim-apps-libs-18.04.1.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdepim-runtime-18.04.0.tar.xz";
-      sha256 = "1pxbrr3rcm3yr7il5abz9r06xvd0j1hsphbskjyphylb3r0xv7mz";
-      name = "kdepim-runtime-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdepim-runtime-18.04.1.tar.xz";
+      sha256 = "0gl2wkkaxpz13rg6zyclcjkc0i7qwqwxcvamgb3cl6l6qkp869w1";
+      name = "kdepim-runtime-18.04.1.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdesdk-kioslaves-18.04.0.tar.xz";
-      sha256 = "18w55iism0b26m6v1j6qlpa4y8zdc12bbc8hi8rwz6nyra2a4r6h";
-      name = "kdesdk-kioslaves-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdesdk-kioslaves-18.04.1.tar.xz";
+      sha256 = "1mx3pg36mx0b6v2kq3a3spxm40rdk4bgkhzzjwphppqkxc57bgln";
+      name = "kdesdk-kioslaves-18.04.1.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdesdk-thumbnailers-18.04.0.tar.xz";
-      sha256 = "1gsfn3km6dggnwav17vrbv077dj6xsxixjqrypqf8v5n29vzl72g";
-      name = "kdesdk-thumbnailers-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdesdk-thumbnailers-18.04.1.tar.xz";
+      sha256 = "0s07h5kfl2h2w0qarz28362n92jdbbq7iw4cy93p949mp6jz1xij";
+      name = "kdesdk-thumbnailers-18.04.1.tar.xz";
     };
   };
   kdf = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdf-18.04.0.tar.xz";
-      sha256 = "1dxm9q25a9vjja3cx7zd9afx08i84l498sykbnvflf56qq6p9jdv";
-      name = "kdf-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdf-18.04.1.tar.xz";
+      sha256 = "1hmq92vglivs9q536g3qx0b7v3g7nlvkly81p8brqs55cw0npf8d";
+      name = "kdf-18.04.1.tar.xz";
     };
   };
   kdialog = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdialog-18.04.0.tar.xz";
-      sha256 = "0ni5imk1a153j4n923im3rs3g691cwlw3g180wcarrg7iads6icn";
-      name = "kdialog-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdialog-18.04.1.tar.xz";
+      sha256 = "0xmdzwawa43xfv9a2sm2rijiiik7b0cvpbcxvwf7s37gwrw5fk05";
+      name = "kdialog-18.04.1.tar.xz";
     };
   };
   kdiamond = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdiamond-18.04.0.tar.xz";
-      sha256 = "0gzxpk3llgh45w3iwbqsshv4mc4whshv7zwaz8ik4wpp9kc72xj9";
-      name = "kdiamond-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdiamond-18.04.1.tar.xz";
+      sha256 = "12z0v4w8adlzsnymn5dsc1fpgqx2w3hx38chwc7l2l5bvgx5ycc1";
+      name = "kdiamond-18.04.1.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/keditbookmarks-18.04.0.tar.xz";
-      sha256 = "18x6cgligwqqj20q69ins33fvkz3is8a11nkp4zx3kb9q50xsdv7";
-      name = "keditbookmarks-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/keditbookmarks-18.04.1.tar.xz";
+      sha256 = "1qi8y5j9s9d4i6vqvw5h29b55q73zfgj4v76dxdl1z85ghcv0my4";
+      name = "keditbookmarks-18.04.1.tar.xz";
     };
   };
   kfind = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kfind-18.04.0.tar.xz";
-      sha256 = "11wgdyparz26gqxlbnawwmhjr2lkqa1j0qqwmiihs0pxfq6q9arw";
-      name = "kfind-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kfind-18.04.1.tar.xz";
+      sha256 = "15fha4k00s88n0k7ad0bnw9iyyjyxlhjmnlcr84hfbh6wiwn4l4k";
+      name = "kfind-18.04.1.tar.xz";
     };
   };
   kfloppy = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kfloppy-18.04.0.tar.xz";
-      sha256 = "039lryi6nk69d054svm0yq5x4yd8pja6f8fx0q2wqpnffrsis5yj";
-      name = "kfloppy-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kfloppy-18.04.1.tar.xz";
+      sha256 = "0rw3r09zil7121ssms1mvccw435nmmgmz0zx0rmfvpk6bks0cim9";
+      name = "kfloppy-18.04.1.tar.xz";
     };
   };
   kfourinline = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kfourinline-18.04.0.tar.xz";
-      sha256 = "101h7y2vmg966h92k6360qc3rrgcwvnhg2lz09yffgwf8mqyp19q";
-      name = "kfourinline-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kfourinline-18.04.1.tar.xz";
+      sha256 = "0gm8s8gi9nnilcvmnz4gk26wrszjg7y8xfq4dyqw87axwaqcv2z6";
+      name = "kfourinline-18.04.1.tar.xz";
     };
   };
   kgeography = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kgeography-18.04.0.tar.xz";
-      sha256 = "1syky2a8crh5vrn3419a1rzv37ld0kh9llkmcszm9h8jaqdsiw5v";
-      name = "kgeography-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kgeography-18.04.1.tar.xz";
+      sha256 = "16c2gidj8jc4xr35ph392gh4r75vfiqw7n07lpv30d6v3h1mq2jy";
+      name = "kgeography-18.04.1.tar.xz";
     };
   };
   kget = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kget-18.04.0.tar.xz";
-      sha256 = "16dj0w8rkiybhdcgp9cf4r50nh790psx4b9xxqgfnab3b8lq35mx";
-      name = "kget-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kget-18.04.1.tar.xz";
+      sha256 = "1kzvalb1a27bn9ac4iqkgar7fydspd9bhva3n0v9gzz34p3lv1f7";
+      name = "kget-18.04.1.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kgoldrunner-18.04.0.tar.xz";
-      sha256 = "0ydhz0pm0adwjrbsiqkq6d1cs6l8nw2cj4mxf36144gs333nly1z";
-      name = "kgoldrunner-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kgoldrunner-18.04.1.tar.xz";
+      sha256 = "0w1vppp0r1prciz6gg5srlj0z05m5wcbpp3wwz6wxh2vnpbm2lc1";
+      name = "kgoldrunner-18.04.1.tar.xz";
     };
   };
   kgpg = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kgpg-18.04.0.tar.xz";
-      sha256 = "1ayyzc7vwdrhp2pc41yh01lkc9n0q4icy05z6yg14si0c7a62s78";
-      name = "kgpg-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kgpg-18.04.1.tar.xz";
+      sha256 = "0b2kngq4dqs3qxkvxny72sfm2xlbsmhb986zmpp0wsm09gd6lhyh";
+      name = "kgpg-18.04.1.tar.xz";
     };
   };
   khangman = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/khangman-18.04.0.tar.xz";
-      sha256 = "01xmvljp3z4x4aihbz4b22avh10hhnvv8y8jy0nd3pggln4mj15c";
-      name = "khangman-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/khangman-18.04.1.tar.xz";
+      sha256 = "1vcr5gp3gz0dygkn8dhkg3fpyqny8vc61nymwii4v247znhg7hw4";
+      name = "khangman-18.04.1.tar.xz";
     };
   };
   khelpcenter = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/khelpcenter-18.04.0.tar.xz";
-      sha256 = "1pc6dd4rn4c636sn8lbkdq2svijrpp4fcgf76infk7dsqrxrgnsr";
-      name = "khelpcenter-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/khelpcenter-18.04.1.tar.xz";
+      sha256 = "00p3s5zmql82dwr4lmfy3yqyyn7h2209lhf49cajh01hd2nasig1";
+      name = "khelpcenter-18.04.1.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kidentitymanagement-18.04.0.tar.xz";
-      sha256 = "129a38ajkpzgm2z921riyawlnx70c41ln3z7hvx159x3ghcsacyw";
-      name = "kidentitymanagement-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kidentitymanagement-18.04.1.tar.xz";
+      sha256 = "1lb1vl3r7avj45lfrlabbbkq0f7anpx04g20ajn2n8ajfgjpns9q";
+      name = "kidentitymanagement-18.04.1.tar.xz";
     };
   };
   kig = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kig-18.04.0.tar.xz";
-      sha256 = "1djy20lcs50ykb99akhfw873br9q0x72r3pma6mv69dpv5jpk3v3";
-      name = "kig-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kig-18.04.1.tar.xz";
+      sha256 = "1ry2rgmy7y4wyxwwz2f7qrj5aw5sjgv46vs4x5203v514p625nzw";
+      name = "kig-18.04.1.tar.xz";
     };
   };
   kigo = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kigo-18.04.0.tar.xz";
-      sha256 = "0jqkab57z0xhbxf2hcagg5b0pgn2z4dnzirp6ccfybl835nwr4rp";
-      name = "kigo-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kigo-18.04.1.tar.xz";
+      sha256 = "1l2bdxjv5kiz6f0gmqwd43jghps5l2cvw8228ay4l7r4r9wp0ihr";
+      name = "kigo-18.04.1.tar.xz";
     };
   };
   killbots = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/killbots-18.04.0.tar.xz";
-      sha256 = "10j82a9yv5v21pp9249nzm42ys104ickwavqys5j43230h0qlyl2";
-      name = "killbots-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/killbots-18.04.1.tar.xz";
+      sha256 = "06vqgahirw01zfbhr2dj5z7fd2jay3kizvl04wwwp1fr8jsw3plw";
+      name = "killbots-18.04.1.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kimagemapeditor-18.04.0.tar.xz";
-      sha256 = "01cy4nfi9gzgyfqb16vsy3b15bgag0g3dz2l9v0d4fijxpf157br";
-      name = "kimagemapeditor-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kimagemapeditor-18.04.1.tar.xz";
+      sha256 = "1144z9zasc3x678q8xnk98nn5y0bzaal0lxc6xb51ib4q8q2lhn1";
+      name = "kimagemapeditor-18.04.1.tar.xz";
     };
   };
   kimap = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kimap-18.04.0.tar.xz";
-      sha256 = "1l22fzslf0zrr230hq17rfg88ifngfwcc1n0v3fzpxnia4cm68by";
-      name = "kimap-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kimap-18.04.1.tar.xz";
+      sha256 = "03y1n4rf7xdxb82716wijz196dk0rg8d50rs9kycymys9sgq5y0h";
+      name = "kimap-18.04.1.tar.xz";
     };
   };
   kio-extras = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kio-extras-18.04.0.tar.xz";
-      sha256 = "15icgvanjhvxi2k9hihadvxnx2jpjp2r3gy89brvdsh8lhj9kzil";
-      name = "kio-extras-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kio-extras-18.04.1.tar.xz";
+      sha256 = "0635iam41i5afjspw08x99irqfsj7pa1w8wz4nfbx9yv2iclq1rh";
+      name = "kio-extras-18.04.1.tar.xz";
     };
   };
   kiriki = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kiriki-18.04.0.tar.xz";
-      sha256 = "0m98fqnrk1vinkammf5fjkbvj5wwk45v8m4m951nvn0wpzrb0clf";
-      name = "kiriki-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kiriki-18.04.1.tar.xz";
+      sha256 = "0n258bvhd5cgb978zqqkig6is5fb9idvwa7n860q1r2nimsnch5y";
+      name = "kiriki-18.04.1.tar.xz";
     };
   };
   kiten = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kiten-18.04.0.tar.xz";
-      sha256 = "1xk58q89hdpy4fhk8ic2ybf60d0xgwfm6ay1gny4qb6klr5xx7ah";
-      name = "kiten-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kiten-18.04.1.tar.xz";
+      sha256 = "1f6z5assiz6gxvhcp08x71qk3hyc36ib2sr6bmq0q7cbb7xlhbac";
+      name = "kiten-18.04.1.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kjumpingcube-18.04.0.tar.xz";
-      sha256 = "1j9v6j3yams0azdc27g76x3baz6wcw173lam5r8z0q5f6xayv9zl";
-      name = "kjumpingcube-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kjumpingcube-18.04.1.tar.xz";
+      sha256 = "0p4manwh4pndhdnb45fczllpsvswwwgvz1wk8grx2axq0x6pjjln";
+      name = "kjumpingcube-18.04.1.tar.xz";
     };
   };
   kldap = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kldap-18.04.0.tar.xz";
-      sha256 = "1fjh6insnmnl4yk5n11bsp9xrhyzkb7cf3vsbx6yjn13gwg06xm9";
-      name = "kldap-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kldap-18.04.1.tar.xz";
+      sha256 = "0arriibg2flqr8rvd4fa8xd4rgr1rl3pwhxxskpfi4i3rl8w1a2i";
+      name = "kldap-18.04.1.tar.xz";
     };
   };
   kleopatra = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kleopatra-18.04.0.tar.xz";
-      sha256 = "1lqqhy0pyv8v9x20if6sjklbmfnjmip4nfm0adp5wh7r3n9c0908";
-      name = "kleopatra-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kleopatra-18.04.1.tar.xz";
+      sha256 = "0ayjxvm6sdg1waf44nw360nh740vi29c7m6frq2jyfbxn401x7p3";
+      name = "kleopatra-18.04.1.tar.xz";
     };
   };
   klettres = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/klettres-18.04.0.tar.xz";
-      sha256 = "0x2vj449dgzlyhyagdcs5f12rd3w025iq5q8qcsml7mnr5vy06n3";
-      name = "klettres-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/klettres-18.04.1.tar.xz";
+      sha256 = "1vzr8pf6m24ng3kg44ld5hiap7qqfp2w1q7npyr6sq28rrm8jilb";
+      name = "klettres-18.04.1.tar.xz";
     };
   };
   klickety = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/klickety-18.04.0.tar.xz";
-      sha256 = "1l81xk00bkbxm9fmqjyphf8wijgxp979kfsflvy7zyzga43k64fc";
-      name = "klickety-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/klickety-18.04.1.tar.xz";
+      sha256 = "1wk6g4a8gmd1z8qqgy30s3f2zgq651dv38gnbk3949j81k92084m";
+      name = "klickety-18.04.1.tar.xz";
     };
   };
   klines = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/klines-18.04.0.tar.xz";
-      sha256 = "1axp8mv1hxdddw86wsd6dkv7cbzk5b3lswqvwxdbbrpsq8j8vjz1";
-      name = "klines-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/klines-18.04.1.tar.xz";
+      sha256 = "0zslagiphj37i79896k71j40125nz74qknx75sp3iv2wafy0akgf";
+      name = "klines-18.04.1.tar.xz";
     };
   };
   kmag = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmag-18.04.0.tar.xz";
-      sha256 = "1yaryycwy5h3pafzsvn4xr96p96j3a3302x6y73i9xm94nz7a60f";
-      name = "kmag-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmag-18.04.1.tar.xz";
+      sha256 = "163i0axbnxkyqhbri6k48x9jsb5l5ll8hl0zvcsw0srh8bzswvgd";
+      name = "kmag-18.04.1.tar.xz";
     };
   };
   kmahjongg = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmahjongg-18.04.0.tar.xz";
-      sha256 = "191cl5cnq6q8b3fr22frfwrg0a2bqf9c2x454ab0ysc2qapblfkx";
-      name = "kmahjongg-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmahjongg-18.04.1.tar.xz";
+      sha256 = "1zl1mr8pg6sz2ydqilgdbh3758vw13af37s9g8pi7axva8adf0fp";
+      name = "kmahjongg-18.04.1.tar.xz";
     };
   };
   kmail = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmail-18.04.0.tar.xz";
-      sha256 = "1faw94imrr30bg155zs4hszfbv9fszywyk1v24d0l03vyh4w0x8r";
-      name = "kmail-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmail-18.04.1.tar.xz";
+      sha256 = "057727gsrdf0pkn5n17km5ryjiw5rimxixff0dax939d9403qwfg";
+      name = "kmail-18.04.1.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmail-account-wizard-18.04.0.tar.xz";
-      sha256 = "0sgasycw0ixh6c04kibyii6f5aygkhwanidnmidhgdnqhgcg31gp";
-      name = "kmail-account-wizard-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmail-account-wizard-18.04.1.tar.xz";
+      sha256 = "0qky1a0lrmy8mfiq0dqhrd8j7m1lc9p34ivx9vy4rr82r9g3y5jw";
+      name = "kmail-account-wizard-18.04.1.tar.xz";
     };
   };
   kmailtransport = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmailtransport-18.04.0.tar.xz";
-      sha256 = "122zcgz9vlqzmr2xy4msrzg9ajvyjlwcf7g4br7bja42f5nk704f";
-      name = "kmailtransport-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmailtransport-18.04.1.tar.xz";
+      sha256 = "09l79049dpkzc3iqdxv4jvglpynrq976gvr8n38k63mr5sajwg72";
+      name = "kmailtransport-18.04.1.tar.xz";
     };
   };
   kmbox = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmbox-18.04.0.tar.xz";
-      sha256 = "0qljbixj2jka8sngavi41jjcssy293acy1d6syjyagad7z5f0d0k";
-      name = "kmbox-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmbox-18.04.1.tar.xz";
+      sha256 = "05zcnykb7asamqf8iqs63bl7jk5myywdqydhxz56jr19fw32lyqq";
+      name = "kmbox-18.04.1.tar.xz";
     };
   };
   kmime = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmime-18.04.0.tar.xz";
-      sha256 = "03hwvwdkb1176d837hbwm8wqj0bl29fdfzirgrp1yri4vadmhrqx";
-      name = "kmime-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmime-18.04.1.tar.xz";
+      sha256 = "1jlhlxw31c9g7z6yhqjsp76xm85ywrr0in4qazidwb9k8lkqxa7g";
+      name = "kmime-18.04.1.tar.xz";
     };
   };
   kmines = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmines-18.04.0.tar.xz";
-      sha256 = "0jyrynqqzk5dwwfd05kdzx5lc6cjkbhhp5l8ijyfwdqs63wzj705";
-      name = "kmines-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmines-18.04.1.tar.xz";
+      sha256 = "0i88pc7j18xighw8ii6gh5gxq9k2zy372ggdyany91dcjgmwhgw7";
+      name = "kmines-18.04.1.tar.xz";
     };
   };
   kmix = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmix-18.04.0.tar.xz";
-      sha256 = "0xq5jd5nrjb95lhc38n0b6kmmdbr2hrnpq8kvdywv6xazhb0h9mg";
-      name = "kmix-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmix-18.04.1.tar.xz";
+      sha256 = "1jq71pgnlz95na5fbm504pkrrahiclqbb0cwsqpbpi10m2nzcrwd";
+      name = "kmix-18.04.1.tar.xz";
     };
   };
   kmousetool = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmousetool-18.04.0.tar.xz";
-      sha256 = "1n36myw2j43mnlawkymyv73l4xkpc5ynqalqka2jigdzqin87gr7";
-      name = "kmousetool-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmousetool-18.04.1.tar.xz";
+      sha256 = "08g5k9yfd5wrh47zp99hgq634vd9r23gjlr77xg86jqn8dj2lgqx";
+      name = "kmousetool-18.04.1.tar.xz";
     };
   };
   kmouth = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmouth-18.04.0.tar.xz";
-      sha256 = "03m4ia8s2qg6pnih6i8df3y2dxc8qcxwcnn7kyjd1ygw8i3gjkyk";
-      name = "kmouth-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmouth-18.04.1.tar.xz";
+      sha256 = "08m5r9vd0gb06izav2g21qkfmg1gjpj0kn0nh785bbhs0bbngrci";
+      name = "kmouth-18.04.1.tar.xz";
     };
   };
   kmplot = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmplot-18.04.0.tar.xz";
-      sha256 = "1bl0sw58p4qnbka1kss2w3p0w7r91c29hg3h3ljxlarj8yg7z95v";
-      name = "kmplot-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmplot-18.04.1.tar.xz";
+      sha256 = "01rxnc45jc6swsm2h8bw45n96lsalgbfzww18hlq1qpyjr20181h";
+      name = "kmplot-18.04.1.tar.xz";
     };
   };
   knavalbattle = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/knavalbattle-18.04.0.tar.xz";
-      sha256 = "0hw5syv8csnx1myjdfsd96bxvqcg2c21fpcgmb9dc8gj4nzqqabv";
-      name = "knavalbattle-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/knavalbattle-18.04.1.tar.xz";
+      sha256 = "1kr37qmb4577i12wghc0qcbbqpxr2wzww1cqv0wcd9jmjd3mq1xw";
+      name = "knavalbattle-18.04.1.tar.xz";
     };
   };
   knetwalk = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/knetwalk-18.04.0.tar.xz";
-      sha256 = "0r3a9pa9nwhfg5xbp062dsaq8n20mrykfbcp52m9wlln8rwjiz1x";
-      name = "knetwalk-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/knetwalk-18.04.1.tar.xz";
+      sha256 = "02zpndbbyffakdxxswpmb1hrszh78a3ip6mfr8bqwnwbvzh80cjy";
+      name = "knetwalk-18.04.1.tar.xz";
     };
   };
   knotes = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/knotes-18.04.0.tar.xz";
-      sha256 = "1gkz3vrsj9irzyhc1djvmkbikiqxn7bgv913ynax8akbbmlh9xlh";
-      name = "knotes-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/knotes-18.04.1.tar.xz";
+      sha256 = "0jc9mpnwgrbh8pra75gsiy9wm0aylm9a0ssw8bhfivb77dmqr44c";
+      name = "knotes-18.04.1.tar.xz";
     };
   };
   kolf = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kolf-18.04.0.tar.xz";
-      sha256 = "0cjvm5xg09wnx5n5hz9w3ckxfyhnwxn423f4hm5c8qwij4gnsfsn";
-      name = "kolf-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kolf-18.04.1.tar.xz";
+      sha256 = "1bahv98dskknyy8rxpnjxywpcw09x58bsdg0aqgh5xdm0ym992ik";
+      name = "kolf-18.04.1.tar.xz";
     };
   };
   kollision = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kollision-18.04.0.tar.xz";
-      sha256 = "03lkrdh11q4vmbc8a5hflsbk2w39ffr96r6rwazkas7svc2hky6i";
-      name = "kollision-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kollision-18.04.1.tar.xz";
+      sha256 = "0pr4f9inxp77d761byis30jski642bhcfvbpcpnj9fi3k1cgzcna";
+      name = "kollision-18.04.1.tar.xz";
     };
   };
   kolourpaint = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kolourpaint-18.04.0.tar.xz";
-      sha256 = "18b01w44bp7hyhxyj5cbfhlmhvcr1bbi1j6i0j62h67sm9fy65vr";
-      name = "kolourpaint-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kolourpaint-18.04.1.tar.xz";
+      sha256 = "1lfvmk9vhwa8j454pfh0x1klqb360zlsyydiiqm5a4dhc4wvcwzy";
+      name = "kolourpaint-18.04.1.tar.xz";
     };
   };
   kompare = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kompare-18.04.0.tar.xz";
-      sha256 = "019z54h9dlcxy7hfzxrh0nh3l2jzc993jhdw4s70h7mf2yddl6zi";
-      name = "kompare-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kompare-18.04.1.tar.xz";
+      sha256 = "0kmf245fbm32hdgmyiv51ham3py7jhc3zpwfcfxbjyi94ikx4n79";
+      name = "kompare-18.04.1.tar.xz";
     };
   };
   konqueror = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/konqueror-18.04.0.tar.xz";
-      sha256 = "0z7b8w47xs2wm13c82fkcf07qd7ikyi67dg8abfnxhvmri4bsxn2";
-      name = "konqueror-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/konqueror-18.04.1.tar.xz";
+      sha256 = "0798z1pm7sxi93xy4jibzhff8k37q88l59kyz524kl7m8wnw5scj";
+      name = "konqueror-18.04.1.tar.xz";
     };
   };
   konquest = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/konquest-18.04.0.tar.xz";
-      sha256 = "0344hjkhq5czxi3wl9vfavli79lh7mqhk8qby0hj53xp6mqh7xfx";
-      name = "konquest-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/konquest-18.04.1.tar.xz";
+      sha256 = "0h637lpmdsascp178fi5mpl9825n83r094ff8l5k4dnfks5imgv4";
+      name = "konquest-18.04.1.tar.xz";
     };
   };
   konsole = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/konsole-18.04.0.tar.xz";
-      sha256 = "0r2al3ja1fpkyyq7hrzis9pmkp54idivfmrj71rqk74jfjjjky2k";
-      name = "konsole-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/konsole-18.04.1.tar.xz";
+      sha256 = "0hnyi5361glmal69brqc9h6zcv8z4l8va6nv0hc2siafmj21yhw6";
+      name = "konsole-18.04.1.tar.xz";
     };
   };
   kontact = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kontact-18.04.0.tar.xz";
-      sha256 = "14kpnfa2bl92frz6vssfs1q3065vsgl5bfgrgyvbbpxfviy5ciaz";
-      name = "kontact-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kontact-18.04.1.tar.xz";
+      sha256 = "00xaizfnfvh39xnxq2jp9n9cl7f0a22hlndamjfhw126ji0mz052";
+      name = "kontact-18.04.1.tar.xz";
     };
   };
   kontactinterface = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kontactinterface-18.04.0.tar.xz";
-      sha256 = "12hmh1wxsxb1n1727qpmarhs83nziy93kb7a8xyahpkky82jn62x";
-      name = "kontactinterface-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kontactinterface-18.04.1.tar.xz";
+      sha256 = "1zywgcrwzgw56vx2x0f2f0235bs2aikvn2qfizv4m5ac7ydihnyd";
+      name = "kontactinterface-18.04.1.tar.xz";
     };
   };
   kopete = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kopete-18.04.0.tar.xz";
-      sha256 = "0p22yjpzrgqmdr74pw9pxasb25w9ikdgsrlbcq5yy95il1zppwfl";
-      name = "kopete-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kopete-18.04.1.tar.xz";
+      sha256 = "1isxabxxx48vjzihycv80fapx69qrvv5zlyfrdg42s9qxqkcgvi8";
+      name = "kopete-18.04.1.tar.xz";
     };
   };
   korganizer = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/korganizer-18.04.0.tar.xz";
-      sha256 = "02vyycpiqdfik2902pk97jz28s4nh2wax129y6n1mdxjjvw15gp2";
-      name = "korganizer-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/korganizer-18.04.1.tar.xz";
+      sha256 = "1x3n03200j79xrj4y7046l3sa3qqfys3z2d2b1nl22v8g3l8gyx2";
+      name = "korganizer-18.04.1.tar.xz";
     };
   };
   kpat = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kpat-18.04.0.tar.xz";
-      sha256 = "02s74cwyp3mpdc8xk6hky3p8s3svdwwkrdfbaxbkh6ysywbm7728";
-      name = "kpat-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kpat-18.04.1.tar.xz";
+      sha256 = "1fly7cd895v6k991hjvq4cv22dibzsvihzcj9cl9pzc7dk9vp70v";
+      name = "kpat-18.04.1.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kpimtextedit-18.04.0.tar.xz";
-      sha256 = "101jj454b4p52yxzcp837075fp3lh3wnkjw8spcfb6k1rjf0ss68";
-      name = "kpimtextedit-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kpimtextedit-18.04.1.tar.xz";
+      sha256 = "09513fv0kaa7x01lsnpm18vvxijcwb68hdglbw08n5f7135k79mn";
+      name = "kpimtextedit-18.04.1.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kqtquickcharts-18.04.0.tar.xz";
-      sha256 = "1ccfgbm1dbrf0nkkpg7qzrpa0sjdv46cvdn7qc86qqqmbb96zij8";
-      name = "kqtquickcharts-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kqtquickcharts-18.04.1.tar.xz";
+      sha256 = "08y0nc070pjmf07yifkfd6dm3frma752c42m3ms0ysz96l1x2gr1";
+      name = "kqtquickcharts-18.04.1.tar.xz";
     };
   };
   krdc = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/krdc-18.04.0.tar.xz";
-      sha256 = "11nk01vhpqlhgn7b928svvpdn5r9hbrc01248xzqkj16iwrdrqr9";
-      name = "krdc-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/krdc-18.04.1.tar.xz";
+      sha256 = "166990llgfkbysahrfralc6n2g7ix7h4w1fpzss0axfigz5ink1x";
+      name = "krdc-18.04.1.tar.xz";
     };
   };
   kreversi = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kreversi-18.04.0.tar.xz";
-      sha256 = "1jbvsldl1g1ljl4mzn1l93gi5kb8jrzwqjzfga4dbribif8shmq8";
-      name = "kreversi-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kreversi-18.04.1.tar.xz";
+      sha256 = "0g6jc7s54i4gzb5q9cg4qczwx9i4zir52zqnjl5akr1w9v8d2m34";
+      name = "kreversi-18.04.1.tar.xz";
     };
   };
   krfb = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/krfb-18.04.0.tar.xz";
-      sha256 = "1aq285jn4k0s9vwy99w2a1wm4nzwzjafz8a0gy47ydi0m29b1rkc";
-      name = "krfb-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/krfb-18.04.1.tar.xz";
+      sha256 = "1zd3rgp4265r1fi1kc2s09rrzpa22b9j56cq3l50mzkb80kyi6vl";
+      name = "krfb-18.04.1.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kross-interpreters-18.04.0.tar.xz";
-      sha256 = "15cbpq7cs0hnm42c03kyvyshfa10xdsajlbmsixzbmvks34c8b1y";
-      name = "kross-interpreters-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kross-interpreters-18.04.1.tar.xz";
+      sha256 = "1gybf7diq2amaqs7xaikfh1kp40iwfvxz4bms16b6flck8sja8va";
+      name = "kross-interpreters-18.04.1.tar.xz";
     };
   };
   kruler = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kruler-18.04.0.tar.xz";
-      sha256 = "0bm1d8n0v4qg8jaciws247bda7q5nab0i80qlg2xb20lygi2fwwr";
-      name = "kruler-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kruler-18.04.1.tar.xz";
+      sha256 = "0bkf1cm23582hwz4j3xygrwqwbfq27qycvnf2mqw921j08axa376";
+      name = "kruler-18.04.1.tar.xz";
     };
   };
   kshisen = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kshisen-18.04.0.tar.xz";
-      sha256 = "1m9wa59iz3p2x7zxngp2wqf99ab6p1gai3h0fb4zbqbib98jpmyf";
-      name = "kshisen-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kshisen-18.04.1.tar.xz";
+      sha256 = "098qqzii4wk0pv5388yighy381k5ffrb8wy4z461yxgxc75d77f7";
+      name = "kshisen-18.04.1.tar.xz";
     };
   };
   ksirk = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ksirk-18.04.0.tar.xz";
-      sha256 = "0msw4lkrjj5ihbdg9ibjrk7ddcw933kqhbf6aap5jc4lz0r6y1d8";
-      name = "ksirk-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ksirk-18.04.1.tar.xz";
+      sha256 = "0mxj4vp6da535ghnxisk6j7akhis0fh16kj6bycw8fxxl5jiy0sq";
+      name = "ksirk-18.04.1.tar.xz";
     };
   };
   ksmtp = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ksmtp-18.04.0.tar.xz";
-      sha256 = "1r89wm8q4vxaqdd1j8qb84qr7zg1dfb731r7qypilvkcc8z1samn";
-      name = "ksmtp-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ksmtp-18.04.1.tar.xz";
+      sha256 = "0imfcaisvh78s18x2w4iizr4vn6sndr1nk9585vs9dr8wcwbfrl3";
+      name = "ksmtp-18.04.1.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ksnakeduel-18.04.0.tar.xz";
-      sha256 = "04lpcp7l4xwnwk073yji84kaw16gi0ybkzlvcg1plpqj6w1y1y8w";
-      name = "ksnakeduel-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ksnakeduel-18.04.1.tar.xz";
+      sha256 = "07p9nil9x3cyzzxcr59h3rj9h6g1lfssrsi6iqwq0hpdc6h2zl73";
+      name = "ksnakeduel-18.04.1.tar.xz";
     };
   };
   kspaceduel = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kspaceduel-18.04.0.tar.xz";
-      sha256 = "04shgk89xfp3z26683mc9g612fmnqg01fp8qah7y8mbac3cv4f5i";
-      name = "kspaceduel-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kspaceduel-18.04.1.tar.xz";
+      sha256 = "0aar147l5bq1ij40ng5wbdixg91678r3d07lrnmdffb47wa1ly7n";
+      name = "kspaceduel-18.04.1.tar.xz";
     };
   };
   ksquares = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ksquares-18.04.0.tar.xz";
-      sha256 = "17siqdj6l2g2rnaswdzipxlxxx8x4q5wb4z2rc12gf08fggxfmgn";
-      name = "ksquares-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ksquares-18.04.1.tar.xz";
+      sha256 = "1vr9xdi0jfrjwvq5y04djmnax7q4d5amj8a7mzvvqq427zl6xc3c";
+      name = "ksquares-18.04.1.tar.xz";
     };
   };
   ksudoku = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ksudoku-18.04.0.tar.xz";
-      sha256 = "1slmfps0861n8p4rqc1ng4981v1jdyppzr990abadqzf344d3ab3";
-      name = "ksudoku-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ksudoku-18.04.1.tar.xz";
+      sha256 = "0habss3w7m3x8mhh70qq38nymynvihar9clpxmlp6pbyw8sl9v6n";
+      name = "ksudoku-18.04.1.tar.xz";
     };
   };
   ksystemlog = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ksystemlog-18.04.0.tar.xz";
-      sha256 = "164cfzfjya7yg5pzzpxzfr0r1yf6napvibpjs9y784fl4r2qb780";
-      name = "ksystemlog-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ksystemlog-18.04.1.tar.xz";
+      sha256 = "1yyrbdzjxrlf96l3bvj675fsbn6440lxr1nd5j4rs09d3fyvl6p1";
+      name = "ksystemlog-18.04.1.tar.xz";
     };
   };
   kteatime = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kteatime-18.04.0.tar.xz";
-      sha256 = "0sm4kcq618qp5ihnvcw2zp0frnj21mmjapksy7q63skh9ncjgmj3";
-      name = "kteatime-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kteatime-18.04.1.tar.xz";
+      sha256 = "02849i02h0zmsc3wifzgq9s0mgfdyzdrm61ngq944r260anizxhd";
+      name = "kteatime-18.04.1.tar.xz";
     };
   };
   ktimer = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktimer-18.04.0.tar.xz";
-      sha256 = "1mgjgs8j4wfkjq766w9lyc21h3l3cfv5qb5a3x1anc74y1vanksj";
-      name = "ktimer-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktimer-18.04.1.tar.xz";
+      sha256 = "13k0wmjh925sj7l8n4kc0adva1vfbgs6admh80ch0xwk8mmsdjvp";
+      name = "ktimer-18.04.1.tar.xz";
     };
   };
   ktnef = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktnef-18.04.0.tar.xz";
-      sha256 = "1rys8l7rmwzv79mwmm97yxfq8gsfz4sh6hf7bjq6zhc9q42n3r36";
-      name = "ktnef-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktnef-18.04.1.tar.xz";
+      sha256 = "1m6nbsnbh8apyqaw2kivkzhk7fp9y2xphmrblqdpf49qpbh6jqlq";
+      name = "ktnef-18.04.1.tar.xz";
     };
   };
   ktouch = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktouch-18.04.0.tar.xz";
-      sha256 = "10lwc2gz1gwghz95f1dgdv33n4rwly0f8maslv3hb47cr14c259v";
-      name = "ktouch-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktouch-18.04.1.tar.xz";
+      sha256 = "18piwwdq4hl8yaln7s7p4bw0lwkyjwnw8lknirj1352npycvq2n1";
+      name = "ktouch-18.04.1.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-accounts-kcm-18.04.0.tar.xz";
-      sha256 = "1arcg0wabjqla5mc773vrbwd2abl5zwhhchf88f1i4krcv2crn3s";
-      name = "ktp-accounts-kcm-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-accounts-kcm-18.04.1.tar.xz";
+      sha256 = "1ihxvngg6cp1vzhpf4hkf2zwxpa5gnlq11lc1ffnhy7fm7ig28nx";
+      name = "ktp-accounts-kcm-18.04.1.tar.xz";
     };
   };
   ktp-approver = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-approver-18.04.0.tar.xz";
-      sha256 = "0afgd08x857mi7s5br3m5q41k8rm77p6dnvb3idjsmv0m8324md4";
-      name = "ktp-approver-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-approver-18.04.1.tar.xz";
+      sha256 = "1749l1zklk1q7i3z4mbk24566vps74hj3as4ijybgymczr4rd3gz";
+      name = "ktp-approver-18.04.1.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-auth-handler-18.04.0.tar.xz";
-      sha256 = "1d7s1rqh231k57bygbyzxiz3cs9diqx4x2f7v66awm20la2p804y";
-      name = "ktp-auth-handler-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-auth-handler-18.04.1.tar.xz";
+      sha256 = "0llkw1yqi91s8iqdqz8pskccinmjsgbp1081pngpkqcg1iy7bara";
+      name = "ktp-auth-handler-18.04.1.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-call-ui-18.04.0.tar.xz";
-      sha256 = "1qffsq9nnhzlgmm42vg98g172361zra06wgpa7n8y3pvl9mwlrbm";
-      name = "ktp-call-ui-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-call-ui-18.04.1.tar.xz";
+      sha256 = "1pji4z8h7bk5npl279x5g9hx7zgdhnjdrv669nrd1gi9m20n6vi7";
+      name = "ktp-call-ui-18.04.1.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-common-internals-18.04.0.tar.xz";
-      sha256 = "0cvyw7rs8afi7c1dl58jmibzqy1jdnbkjqsxilnlkj5rmplg10av";
-      name = "ktp-common-internals-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-common-internals-18.04.1.tar.xz";
+      sha256 = "0jwkwznqcrk39k07srl7c0yznj9p9dp70lkfhjg3syscwm8drydv";
+      name = "ktp-common-internals-18.04.1.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-list-18.04.0.tar.xz";
-      sha256 = "1384rps2wp1qgqq0jj1p9rjkg3gdrsjid87jhdjv95kjxc1a7a1y";
-      name = "ktp-contact-list-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-contact-list-18.04.1.tar.xz";
+      sha256 = "1806fapr0pv15dmpqb0khdlgrmk9bsf45s1ab7x9pdnghnawn132";
+      name = "ktp-contact-list-18.04.1.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-runner-18.04.0.tar.xz";
-      sha256 = "02hr0g619h30hr49rxs5yvwna6skzkvca03p9yy70ib22gzpfxli";
-      name = "ktp-contact-runner-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-contact-runner-18.04.1.tar.xz";
+      sha256 = "0b9xm5p9w5kd67sh13h9caxqj89jzia79hfk9fzxpjbf0kifj72s";
+      name = "ktp-contact-runner-18.04.1.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-desktop-applets-18.04.0.tar.xz";
-      sha256 = "09jfw3sn6yn4znir0rcgwwc5h1zp2vc39y4i7fi1rznhdagwy1ji";
-      name = "ktp-desktop-applets-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-desktop-applets-18.04.1.tar.xz";
+      sha256 = "0jrdz8ccgrbwpb6k73wvsix3h3h16dxzgqy19lykd5igckq1v2qh";
+      name = "ktp-desktop-applets-18.04.1.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-filetransfer-handler-18.04.0.tar.xz";
-      sha256 = "1wc72ghl2v6bjrw1pb8h8ajigqhyb53nlhya2cqhdf1banpjv0n5";
-      name = "ktp-filetransfer-handler-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-filetransfer-handler-18.04.1.tar.xz";
+      sha256 = "03v0wgac6knprqi7mfzc3w1rrdkf9lgi2gpscc3k910dyswh1802";
+      name = "ktp-filetransfer-handler-18.04.1.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-kded-module-18.04.0.tar.xz";
-      sha256 = "1845csv2ci5589iws49ma5qrkgs5q6hqb2hzrk6znr6w3d1smbbj";
-      name = "ktp-kded-module-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-kded-module-18.04.1.tar.xz";
+      sha256 = "0d3vv1ngsbh87wxijvyd2hzhdzwr0r5vx5h3jdl3znjh9ysifwm4";
+      name = "ktp-kded-module-18.04.1.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-send-file-18.04.0.tar.xz";
-      sha256 = "137l6b4dpd78x8z99cpz0sp8f5lbdlvzkd2w742jsiylxchrjr5l";
-      name = "ktp-send-file-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-send-file-18.04.1.tar.xz";
+      sha256 = "1p3vgbsmam687bzp1h6xxv2qr2f6jz6mjbpk5jxjvvz66aq4dj8y";
+      name = "ktp-send-file-18.04.1.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-text-ui-18.04.0.tar.xz";
-      sha256 = "12hhfkjglqbd4qxhl10xczk9ha0j494vjldkg05lhm0l233zr9km";
-      name = "ktp-text-ui-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-text-ui-18.04.1.tar.xz";
+      sha256 = "1zsxyizm9vdlrxicxvgmy5irqi914szxkd38xrgspp2vdi4bnvb6";
+      name = "ktp-text-ui-18.04.1.tar.xz";
     };
   };
   ktuberling = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktuberling-18.04.0.tar.xz";
-      sha256 = "12mrb0a5k5z02mjwdn8vlcwr8jxwp7x2f04wzac749csyn0sj86d";
-      name = "ktuberling-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktuberling-18.04.1.tar.xz";
+      sha256 = "1rpval4rl63dfy2p6aq5902ifvv14x1zg8mzzci26kqq8k38jasc";
+      name = "ktuberling-18.04.1.tar.xz";
     };
   };
   kturtle = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kturtle-18.04.0.tar.xz";
-      sha256 = "0vm28xngj52l6fs7sd54wg4fhss131kh6ihs1ibnzi9in0hvga62";
-      name = "kturtle-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kturtle-18.04.1.tar.xz";
+      sha256 = "1s2n46nlzc63108gc43h14yjrcd12h93bvbg08ynhfaq26pqz1jk";
+      name = "kturtle-18.04.1.tar.xz";
     };
   };
   kubrick = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kubrick-18.04.0.tar.xz";
-      sha256 = "0as99qx9vi6zcx61kai7y3ym4vzm8r7ma4p0a2z8rxymps1nk3dy";
-      name = "kubrick-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kubrick-18.04.1.tar.xz";
+      sha256 = "1gqnfc8gnl96gz5i3ak7swhm36c9dv7n0c4b5f70pnsi5n7klbxr";
+      name = "kubrick-18.04.1.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kwalletmanager-18.04.0.tar.xz";
-      sha256 = "1f4124bm86aqbv36v961jca647vvxrlssq5ydnvi1yfx0saza94q";
-      name = "kwalletmanager-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kwalletmanager-18.04.1.tar.xz";
+      sha256 = "0vj0ch1dk265v6x8xzvskpv5mc564p10pn8m9jjv79wk2xy1vsjz";
+      name = "kwalletmanager-18.04.1.tar.xz";
     };
   };
   kwave = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kwave-18.04.0.tar.xz";
-      sha256 = "1bw6lcl95aqcvzp2z31krdaiq0hfhndicynarai58rcg2ngbsm53";
-      name = "kwave-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kwave-18.04.1.tar.xz";
+      sha256 = "0avbyyrhvzfxdib0d80rk7m6gk6kq9rjvv640s08y237m68fncap";
+      name = "kwave-18.04.1.tar.xz";
     };
   };
   kwordquiz = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kwordquiz-18.04.0.tar.xz";
-      sha256 = "1rfr1hc6xkciyx5wknzikf4ml1sgcqj8lflxpksdsg9m5nk7w73y";
-      name = "kwordquiz-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kwordquiz-18.04.1.tar.xz";
+      sha256 = "1yqynfmlargfwk7nlfzhlxd1df462ssw7qj3pdhym8277jfch58r";
+      name = "kwordquiz-18.04.1.tar.xz";
     };
   };
   libgravatar = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libgravatar-18.04.0.tar.xz";
-      sha256 = "1wzfvp5acdkpj37bg1hphy0fszvbakzx0azg56zk0h9526h6qrq1";
-      name = "libgravatar-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libgravatar-18.04.1.tar.xz";
+      sha256 = "19xrc70yh6baxg5jlr3v3d3af46vms28jzvkpgda5ffacnn3xnrj";
+      name = "libgravatar-18.04.1.tar.xz";
     };
   };
   libkcddb = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkcddb-18.04.0.tar.xz";
-      sha256 = "1967in5041lyjapi3avlns1g7ps8sqvq547gw13snhkjn0dbs1aa";
-      name = "libkcddb-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkcddb-18.04.1.tar.xz";
+      sha256 = "1nn80sflfgzd3d2kc4d4zwa09ix498svrinn27b9h8x3w3gsbg8f";
+      name = "libkcddb-18.04.1.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkcompactdisc-18.04.0.tar.xz";
-      sha256 = "01c1pmb2v7bd03jdkwdw4l37736ad8igrrwa9cf5jwg6q5ps9xgb";
-      name = "libkcompactdisc-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkcompactdisc-18.04.1.tar.xz";
+      sha256 = "12zb39zwvl8y2b48vjn34dxj4f65laswd67w5f7m4g0nczq218v1";
+      name = "libkcompactdisc-18.04.1.tar.xz";
     };
   };
   libkdcraw = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkdcraw-18.04.0.tar.xz";
-      sha256 = "04gc0m4ndkx02yavqmc5xh488rmxw5ppicv902iby0m9ywrjinik";
-      name = "libkdcraw-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkdcraw-18.04.1.tar.xz";
+      sha256 = "011q982rx5m8609i1zd6q186xw3ps81fnvhjk69hxy5w8pp44m6i";
+      name = "libkdcraw-18.04.1.tar.xz";
     };
   };
   libkdegames = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkdegames-18.04.0.tar.xz";
-      sha256 = "09wxdvd2ahhh11ncylh5il5fbx1jx6jpwzp1r18cx5k71fw2idp6";
-      name = "libkdegames-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkdegames-18.04.1.tar.xz";
+      sha256 = "03afnypmn8bz1cgc4lgfmid2hszsq564hsf9m5s57a29vfswnp6m";
+      name = "libkdegames-18.04.1.tar.xz";
     };
   };
   libkdepim = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkdepim-18.04.0.tar.xz";
-      sha256 = "0m3rlwdy010v4s3157w8jlb6ahcmn4frqxp1ibachpmz6y77gkkq";
-      name = "libkdepim-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkdepim-18.04.1.tar.xz";
+      sha256 = "02wrkn1h662dqzp7kyrhhhiyahhkgqz75jcd59haxyj66amlgcx6";
+      name = "libkdepim-18.04.1.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkeduvocdocument-18.04.0.tar.xz";
-      sha256 = "1g10c955gy0530xypr62x9dp4736s6qwr5afb90nlj8rhnq2zmbw";
-      name = "libkeduvocdocument-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkeduvocdocument-18.04.1.tar.xz";
+      sha256 = "14i25wjfak39bz0y5rkg25mvjxnzpak76sf5w163dmwx2hd7spzr";
+      name = "libkeduvocdocument-18.04.1.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkexiv2-18.04.0.tar.xz";
-      sha256 = "11ydba6jdvyvp3j3zzy7gjcmz20zv6nwg07r00xgs34y9n50rhzy";
-      name = "libkexiv2-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkexiv2-18.04.1.tar.xz";
+      sha256 = "0q6hmghivdj0aq00pg3z5i6mfdj3xgpdd6yw0vr9i4jnk0rfb349";
+      name = "libkexiv2-18.04.1.tar.xz";
     };
   };
   libkgapi = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkgapi-18.04.0.tar.xz";
-      sha256 = "0bp7y1wjajzzq6q3sygl2vxk685k5hmcvy1i42q5fph28q2b0dli";
-      name = "libkgapi-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkgapi-18.04.1.tar.xz";
+      sha256 = "0wpxn7qyf56rckarx52ic3yyhv8r043dxjir4f2yf05vkddwkshv";
+      name = "libkgapi-18.04.1.tar.xz";
     };
   };
   libkgeomap = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkgeomap-18.04.0.tar.xz";
-      sha256 = "0814ql6xpj02sirmz9crn649rabqclhzjnrlk47isgjwsgk5kqmh";
-      name = "libkgeomap-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkgeomap-18.04.1.tar.xz";
+      sha256 = "16rzw8r1i7isfh86rg86a0h25zwa8h3hnxbzf3fjmdn6mmdkp2va";
+      name = "libkgeomap-18.04.1.tar.xz";
     };
   };
   libkipi = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkipi-18.04.0.tar.xz";
-      sha256 = "10d7yb6psrj1xl34pkhw6fpmja7mk8bkq80id0snc5nxlr0v1jdb";
-      name = "libkipi-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkipi-18.04.1.tar.xz";
+      sha256 = "09rx85phr259anznvxyfp4rb51jsid76jrbcgv52vy9cfd7rr8pk";
+      name = "libkipi-18.04.1.tar.xz";
     };
   };
   libkleo = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkleo-18.04.0.tar.xz";
-      sha256 = "179abszgi7nm763cvyqi2274x7107vb4irblsdfkqmlp924xssdd";
-      name = "libkleo-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkleo-18.04.1.tar.xz";
+      sha256 = "06kyiv9bshyf2q0k7g7pm1ja35sxddgrzb5ayxnx03na86dm67j9";
+      name = "libkleo-18.04.1.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkmahjongg-18.04.0.tar.xz";
-      sha256 = "1grsyjsghjk3ikj7lpib3k94qcsz6r1l3czcawwamf2m83jydk2k";
-      name = "libkmahjongg-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkmahjongg-18.04.1.tar.xz";
+      sha256 = "09sqi1xyd8hk3x6w5ix6sa191ihil3zjq1qd6j50fr2rpqzfnbm0";
+      name = "libkmahjongg-18.04.1.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkomparediff2-18.04.0.tar.xz";
-      sha256 = "0vzq25q9hihv8np0l0jdyfipf3w86wm6y7n46dhhqkqw380wrxwy";
-      name = "libkomparediff2-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkomparediff2-18.04.1.tar.xz";
+      sha256 = "0d00r0h1fbmhkdn791f3i87ckc4l8wd5rljlm4lfzcr95lbmpzyv";
+      name = "libkomparediff2-18.04.1.tar.xz";
     };
   };
   libksane = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libksane-18.04.0.tar.xz";
-      sha256 = "1vc7z3dzr0nk3rrfq96p6phbb3rfnkn6wpjnzmc66f4mvq96hn7i";
-      name = "libksane-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libksane-18.04.1.tar.xz";
+      sha256 = "1k1ffki9gcgah7xymyzbwza00gw3dvkfghcbyy4dpvbb0q4ayw7c";
+      name = "libksane-18.04.1.tar.xz";
     };
   };
   libksieve = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libksieve-18.04.0.tar.xz";
-      sha256 = "16x419wzpyl9jj4q49rwmfm75x6minwrg0jvkad5kh541r52a5bn";
-      name = "libksieve-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libksieve-18.04.1.tar.xz";
+      sha256 = "0dsb1lj155y32avlgw6clxpbv00z3nrc7a7nlfh29l0wjl09mr50";
+      name = "libksieve-18.04.1.tar.xz";
     };
   };
   lokalize = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/lokalize-18.04.0.tar.xz";
-      sha256 = "19j0jqn3xzawsyy4fzsy3c2hrjp9920bihzpbq8yalws6w0v8li4";
-      name = "lokalize-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/lokalize-18.04.1.tar.xz";
+      sha256 = "1svwl30abycdq2jc4a688lbb4yk28dqscchi1zshdii6w00bcys9";
+      name = "lokalize-18.04.1.tar.xz";
     };
   };
   lskat = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/lskat-18.04.0.tar.xz";
-      sha256 = "1dk73c6v5h5abx5244rnjjfxi2cn2sya1jav3020nif111c2c9f7";
-      name = "lskat-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/lskat-18.04.1.tar.xz";
+      sha256 = "0isy9ibk93i4b72cdv5210n8gfwiydrw4i0bax2pkyxqymyfr5lj";
+      name = "lskat-18.04.1.tar.xz";
     };
   };
   mailcommon = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/mailcommon-18.04.0.tar.xz";
-      sha256 = "10psdddw3wzyalh5662rvq68l8i9sxmcl5pavgn03np3g3fws8fd";
-      name = "mailcommon-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/mailcommon-18.04.1.tar.xz";
+      sha256 = "0s0c4swm1q331hzqg0fqb2r9dwx4aamwan3s5p71vjnibxzbmqck";
+      name = "mailcommon-18.04.1.tar.xz";
     };
   };
   mailimporter = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/mailimporter-18.04.0.tar.xz";
-      sha256 = "0wwclx24bfczqxvcf5jdfpqa9cx0dv9ygsj5blaqk9g5pgych5hi";
-      name = "mailimporter-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/mailimporter-18.04.1.tar.xz";
+      sha256 = "1qzc7yjjscbxkinby9carp02wqppx95hirq0m5ihly7avn5cn6dz";
+      name = "mailimporter-18.04.1.tar.xz";
     };
   };
   marble = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/marble-18.04.0.tar.xz";
-      sha256 = "0q1dr2p4qwcik86fcr0jqvplkwfnj14fysqcqk2pwwdkfnqlsppv";
-      name = "marble-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/marble-18.04.1.tar.xz";
+      sha256 = "04aa32qnr585lq3s3hmxqlwqranr3wr1zr1xm99pbsb32k2yyyjn";
+      name = "marble-18.04.1.tar.xz";
     };
   };
   mbox-importer = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/mbox-importer-18.04.0.tar.xz";
-      sha256 = "1kai38svb4bsj1kfhyv94sgxqavj4fgb4laxl2sxvwah3rk6avd5";
-      name = "mbox-importer-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/mbox-importer-18.04.1.tar.xz";
+      sha256 = "06735201365rpp3lr877pqdkz9206zfzhvbbr432fvg6lx3p5z4s";
+      name = "mbox-importer-18.04.1.tar.xz";
     };
   };
   messagelib = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/messagelib-18.04.0.tar.xz";
-      sha256 = "14nn6aw1831j0iwwb7d4swxh6i4855izglmifq2ijsbpbdqsq5p2";
-      name = "messagelib-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/messagelib-18.04.1.tar.xz";
+      sha256 = "1fznlxl1j1n5pbg3v7rmd4lhfjhr1r95b62gyqydlrrwgzzs92b2";
+      name = "messagelib-18.04.1.tar.xz";
     };
   };
   minuet = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/minuet-18.04.0.tar.xz";
-      sha256 = "0fdyv0qbj04pxsbyvrmbqs7bff7cld28iyw7n8lgv2gdm3n45vbh";
-      name = "minuet-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/minuet-18.04.1.tar.xz";
+      sha256 = "0fans0fpghdckmp6ww8api4d7kfna1w20yjgssvfqxgyxxni0vps";
+      name = "minuet-18.04.1.tar.xz";
     };
   };
   okular = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/okular-18.04.0.tar.xz";
-      sha256 = "1ywzpdahnfc0ydvpidphdyh61ql7zwk4m6cpfj2zg9njh276w1d8";
-      name = "okular-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/okular-18.04.1.tar.xz";
+      sha256 = "0fhfbjlwa4xzf2q2wnidprj7qqizs26i959k61k4j66y66d2za0g";
+      name = "okular-18.04.1.tar.xz";
     };
   };
   palapeli = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/palapeli-18.04.0.tar.xz";
-      sha256 = "0m4h5h15qcqdhlrsi73c8jxkb3zhz07m2jw3r37603w4g6jk9g8b";
-      name = "palapeli-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/palapeli-18.04.1.tar.xz";
+      sha256 = "01p1xipacb8w7lcd3n8387c7axjxswvv62rn7sphp736l23wri5c";
+      name = "palapeli-18.04.1.tar.xz";
     };
   };
   parley = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/parley-18.04.0.tar.xz";
-      sha256 = "0h87zfqssbbvwyvar9yf8hv53bdpv7arncs63l6hfr6ajspla9if";
-      name = "parley-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/parley-18.04.1.tar.xz";
+      sha256 = "1qh7bg38bvq8drnd7plkdxxqsl6rgd37g3iqnxwljxf723s6hcz5";
+      name = "parley-18.04.1.tar.xz";
     };
   };
   picmi = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/picmi-18.04.0.tar.xz";
-      sha256 = "1pxa4xql2c78n0jqswgll2hpfn33fgw6yz7g8ydgn5nnbcsfhs6r";
-      name = "picmi-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/picmi-18.04.1.tar.xz";
+      sha256 = "095xm4nkd0kg0pvbbp3vasll1lfpk491frspk2463q0zhd04hpmi";
+      name = "picmi-18.04.1.tar.xz";
     };
   };
   pimcommon = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/pimcommon-18.04.0.tar.xz";
-      sha256 = "0xnh0xys4sfqashimc1zsdxbssd3821bp9cx6hb0d8l3bq5x2vrp";
-      name = "pimcommon-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/pimcommon-18.04.1.tar.xz";
+      sha256 = "0zyd0ja6ir6nbkvf4hk6hi93qr19kns8hgww15y2xmdhdcyf52ja";
+      name = "pimcommon-18.04.1.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/pim-data-exporter-18.04.0.tar.xz";
-      sha256 = "0isr1hv74n9mbihirk4qr109d4shh42k8jgcy9v2hmkplq72vwc7";
-      name = "pim-data-exporter-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/pim-data-exporter-18.04.1.tar.xz";
+      sha256 = "0k69nmjp0n2mmg1nsghghk2ybnvyr01gnrhqwvknpbncb2cnkgcg";
+      name = "pim-data-exporter-18.04.1.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/pim-sieve-editor-18.04.0.tar.xz";
-      sha256 = "0q1f72mb925qzikqfpv74dcc5f9ipxszvm0z05lsp1dhrmz1pf9a";
-      name = "pim-sieve-editor-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/pim-sieve-editor-18.04.1.tar.xz";
+      sha256 = "076hzkia8l61nn3gwma88lsx02d1fb6d00jbibvghqp7raa9f0fx";
+      name = "pim-sieve-editor-18.04.1.tar.xz";
     };
   };
   poxml = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/poxml-18.04.0.tar.xz";
-      sha256 = "1rwr1ldrkwyfxm56i16mpq0vmqiq2397gcbzg4skqpc727s55nlv";
-      name = "poxml-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/poxml-18.04.1.tar.xz";
+      sha256 = "1ha1dy5j40269nv5ygb0idd9kkizni3zq4vz64i2y29lvbrqdgh1";
+      name = "poxml-18.04.1.tar.xz";
     };
   };
   print-manager = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/print-manager-18.04.0.tar.xz";
-      sha256 = "1x70xia2rph40flx4r3cpxcvxfzny83v87l4kgc1n0khavhp9lpx";
-      name = "print-manager-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/print-manager-18.04.1.tar.xz";
+      sha256 = "10l2w1fyym4nflmqnfsxdnnbllvliwyx7z7ylmi4i4rkcpaafyqx";
+      name = "print-manager-18.04.1.tar.xz";
     };
   };
   rocs = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/rocs-18.04.0.tar.xz";
-      sha256 = "0q0q9bnmsw23jdbrxrkmmjvyr5jv4s1z8v9h7nsaxqs1k2prflp4";
-      name = "rocs-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/rocs-18.04.1.tar.xz";
+      sha256 = "1bsm1kjkp9x2rh4n682kjyljisri7mniw5yap4ifksq5lk2vbn8z";
+      name = "rocs-18.04.1.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/signon-kwallet-extension-18.04.0.tar.xz";
-      sha256 = "04r92pc8l2vw1dc916n658484v14smqrgg4ngx6rccffm58jfvk0";
-      name = "signon-kwallet-extension-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/signon-kwallet-extension-18.04.1.tar.xz";
+      sha256 = "0xhvah1xq60wiz6pyjkc66sxsz1v3vdzjbjdr5kklpr98pg9xlib";
+      name = "signon-kwallet-extension-18.04.1.tar.xz";
     };
   };
   spectacle = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/spectacle-18.04.0.tar.xz";
-      sha256 = "1slqgp1rgzcw4nikh6zmxpp3yc04dfbjcqqx2j4wpa1p2xwfv0c2";
-      name = "spectacle-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/spectacle-18.04.1.tar.xz";
+      sha256 = "0k8vl79gwm4sj0f5pshz99l6cq323hk7a4r1jqzkdmbdv1mc0rgc";
+      name = "spectacle-18.04.1.tar.xz";
     };
   };
   step = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/step-18.04.0.tar.xz";
-      sha256 = "048f4n24819vj41a0hdabmqvw6k7wkwwicz0q0slvfqws5c3h1l4";
-      name = "step-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/step-18.04.1.tar.xz";
+      sha256 = "1zwxjsjv72wjvzwj7cdz3lclw92bp9306bcpm4bpfrlcnr3xny1z";
+      name = "step-18.04.1.tar.xz";
     };
   };
   svgpart = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/svgpart-18.04.0.tar.xz";
-      sha256 = "1yf535ry8xc7lqhcavn2kjmjs0ngkwinm369q0qp7hfddcpsyfbp";
-      name = "svgpart-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/svgpart-18.04.1.tar.xz";
+      sha256 = "14qf9xfgvgk8d49qz6vhfivzw8hsmj6q2scjk6vg3i16y62qlym9";
+      name = "svgpart-18.04.1.tar.xz";
     };
   };
   sweeper = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/sweeper-18.04.0.tar.xz";
-      sha256 = "1yf1xfbv516ia3aqj3l8qcdsbjac9pnm8qb23l26g6n3jnq4b331";
-      name = "sweeper-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/sweeper-18.04.1.tar.xz";
+      sha256 = "0f8nyxdw2arpa85vwl834jqbydvsx7dswjl8cdy66frx5jyqirim";
+      name = "sweeper-18.04.1.tar.xz";
     };
   };
   syndication = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/syndication-18.04.0.tar.xz";
-      sha256 = "11fx8f9sfc51w5dg6mylbvk0yaaxvc9y2dsg9xxasiw8v6rjjq3n";
-      name = "syndication-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/syndication-18.04.1.tar.xz";
+      sha256 = "1gcas0aqgzr6r571d66yn7hw86hdb4akd5vgk5jh3liww25y8qm5";
+      name = "syndication-18.04.1.tar.xz";
     };
   };
   umbrello = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/umbrello-18.04.0.tar.xz";
-      sha256 = "1lbf82j04j8qax7qnsqwsjrz1m4yq0ca6xc9fdhmvkpnzn5z9ydp";
-      name = "umbrello-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/umbrello-18.04.1.tar.xz";
+      sha256 = "1vw8py5nm7mpv3qa0lxi72cvbvslxppag6aqhbp2zsnz6b152qhy";
+      name = "umbrello-18.04.1.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/zeroconf-ioslave-18.04.0.tar.xz";
-      sha256 = "0lqh70bmlrj22d82vhm5a9ylm2yj9rz4zgncfwrh9952q1xkzl22";
-      name = "zeroconf-ioslave-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/zeroconf-ioslave-18.04.1.tar.xz";
+      sha256 = "09nvkcq924v3f8jl36618j0hx2b1dzkvbvspf98mnx9lsliyzsc3";
+      name = "zeroconf-ioslave-18.04.1.tar.xz";
     };
   };
 }
-- 
GitLab


From 140680846826943ce2399b8543b80ba322562e6b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 14 May 2018 17:32:43 +0800
Subject: [PATCH 0697/1085] kde-frameworks: 5.45 -> 5.46

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/ki18n.nix        |   8 +-
 .../libraries/kde-frameworks/srcs.nix         | 624 +++++++++---------
 3 files changed, 314 insertions(+), 320 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index ede76323347..70363e6d2e6 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.45/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.46/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index ee7d13af5b1..3b9ca74bbd0 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, fetchpatch,
+  mkDerivation, lib,
   extra-cmake-modules, gettext, python,
   qtbase, qtdeclarative, qtscript,
 }:
@@ -13,10 +13,4 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedNativeBuildInputs = [ gettext python ];
   buildInputs = [ qtdeclarative qtscript ];
-  patches = [
-    (fetchpatch {
-      url = "https://phabricator.kde.org/D12216?download=true";
-      sha256 = "04gpyb11vlgivqjx3lqdwgqb4ss5bphy5zmh65k57bbv4rnlsm15";
-    })
-  ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 8e2187f2957..7f4c42a5d18 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,627 +3,627 @@
 
 {
   attica = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/attica-5.45.0.tar.xz";
-      sha256 = "1vzbajj2ldhg26ssxh0vkahj7fw5v9nhrv000vbxlhsrcczq81n5";
-      name = "attica-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/attica-5.46.0.tar.xz";
+      sha256 = "0xj4wn7nd28hfvbcpx4gfgf00vdg3kyfvqy0vk4js49xq14q9j09";
+      name = "attica-5.46.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/baloo-5.45.0.tar.xz";
-      sha256 = "0zr2pg946q3wc6bhsbngpmca0ylhw8ckfdrs6ym36v7xz3h5fhds";
-      name = "baloo-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/baloo-5.46.0.tar.xz";
+      sha256 = "01ww9yqw9zi2r71i8gh87vs20k3kmvc1mq9a3di21zk5glb8hdy3";
+      name = "baloo-5.46.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/bluez-qt-5.45.0.tar.xz";
-      sha256 = "056xl29yf7bkqrn655c9b2wdx69021q7cz176rx4daid70i8nx49";
-      name = "bluez-qt-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/bluez-qt-5.46.0.tar.xz";
+      sha256 = "0hgqxpxx1b2vpr5fxhgk8s4m1njc9i080zqb62bh4vvsdayzib6l";
+      name = "bluez-qt-5.46.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/breeze-icons-5.45.0.tar.xz";
-      sha256 = "0nzi4wy0p7lkb76nynmwbgnrsrfbhfxn3269mkbqwakq6i4mxsj8";
-      name = "breeze-icons-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/breeze-icons-5.46.0.tar.xz";
+      sha256 = "1sq7j0clqc1zm330p49ny76jasn0dvvf1lszclfldg540n376343";
+      name = "breeze-icons-5.46.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/extra-cmake-modules-5.45.0.tar.xz";
-      sha256 = "0g7njdz6bqjcswq100mb2jr4l1mdicqq24wdw3a8f63syg5rvm76";
-      name = "extra-cmake-modules-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/extra-cmake-modules-5.46.0.tar.xz";
+      sha256 = "0xf232d9znln6a7i8mcff4nr0kd5x6qpp1hxbf5pp7g1cwdkxnp5";
+      name = "extra-cmake-modules-5.46.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/frameworkintegration-5.45.0.tar.xz";
-      sha256 = "0s300vp674rq2dinhjjsp7v4gmv6ybxsk1r3asv3x789zwz1lr3i";
-      name = "frameworkintegration-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/frameworkintegration-5.46.0.tar.xz";
+      sha256 = "1nb5b81b5g1y8crn6mwkjhkf8dzamyfpcl49c3ml34i1d68jbil3";
+      name = "frameworkintegration-5.46.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kactivities-5.45.0.tar.xz";
-      sha256 = "0h3hym4am055f9kyhg98gabw00nb1h10b9dvbs3hs3178dyi5gjg";
-      name = "kactivities-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kactivities-5.46.0.tar.xz";
+      sha256 = "1a1339i0zag6zsp7mq2w86v7h2fz3bc5jd6w7kb5yphagnwdp9kk";
+      name = "kactivities-5.46.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kactivities-stats-5.45.0.tar.xz";
-      sha256 = "0jcvikr7yvjik8zdz46mkrxf2c3ydns194a07njw7hd15x1czqjl";
-      name = "kactivities-stats-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kactivities-stats-5.46.0.tar.xz";
+      sha256 = "18mdx8fxrq71rwz7zgx7j30k5ch0yjiyh86nwx9a4yrf6d2ykxwj";
+      name = "kactivities-stats-5.46.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kapidox-5.45.0.tar.xz";
-      sha256 = "1996akdnhrky1bk63xraj0qawx6ar1vk6ia4rmdgq0bqjk804g1p";
-      name = "kapidox-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kapidox-5.46.0.tar.xz";
+      sha256 = "16kn5mka2mzvqpdfa7w82zgj7vi0ig611qa16flgazzrcbl2m827";
+      name = "kapidox-5.46.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/karchive-5.45.0.tar.xz";
-      sha256 = "0gl86ybjkmjz6sl4s00j8mi43admj7xnjnmv92q5lngk75k1zbhq";
-      name = "karchive-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/karchive-5.46.0.tar.xz";
+      sha256 = "1xphgm8lxicws4bss5svq7r81n1j1zssgfq35vmlms22cpr7pr28";
+      name = "karchive-5.46.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kauth-5.45.0.tar.xz";
-      sha256 = "1j6pgbkqjw70lnpk84wqi9m81hc55f1z4cfxkd8hhdk578pry56i";
-      name = "kauth-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kauth-5.46.0.tar.xz";
+      sha256 = "0w0zvaxzv6bl76hr8wxhg6w0cfp3sdcqdpimspyc7dvddvq3vbr3";
+      name = "kauth-5.46.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kbookmarks-5.45.0.tar.xz";
-      sha256 = "0ii0gi4vlngp0qypyn2780dnqpkg24k0wb5jpngllrvrf37132md";
-      name = "kbookmarks-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kbookmarks-5.46.0.tar.xz";
+      sha256 = "1i7dsw5rskf7fb8bylwnnysppgmrzizw35wl8n5rw2lkk814a7xl";
+      name = "kbookmarks-5.46.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kcmutils-5.45.0.tar.xz";
-      sha256 = "0w082wr9h2rpk9jyads9bwdimhqjl6f68l710miwjglzcmfy4dgq";
-      name = "kcmutils-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kcmutils-5.46.0.tar.xz";
+      sha256 = "0bwvsn3fm53d3wqsapakkg0v791vx9kxla973576mlaqpk1zgn1v";
+      name = "kcmutils-5.46.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kcodecs-5.45.0.tar.xz";
-      sha256 = "0si694a64dbb65m7gzcvz474gd61nyvj71wh77chsbsh6hvl1xzx";
-      name = "kcodecs-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kcodecs-5.46.0.tar.xz";
+      sha256 = "0ywj61zmfr09nwd9v8x11jnlymkv2r3bvvkbar1p4wc8291n7cfd";
+      name = "kcodecs-5.46.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kcompletion-5.45.0.tar.xz";
-      sha256 = "0lqp0m715hqh8ci1cq7r1y00828ajjzz5y04xpxw78gk9gprakf8";
-      name = "kcompletion-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kcompletion-5.46.0.tar.xz";
+      sha256 = "01rj0z26ppv2m3a7h4gh5kz96q877afk79354bvmwqi5w99iqv5a";
+      name = "kcompletion-5.46.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kconfig-5.45.0.tar.xz";
-      sha256 = "00r7vh2myh518wfngfr1gmz6svmnvjfx9bxv8px5z1ap0yda181p";
-      name = "kconfig-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kconfig-5.46.0.tar.xz";
+      sha256 = "1yx2f81mik3c3hdr424j92drqs3zmsqcjryfyzczxsbllsmf6zma";
+      name = "kconfig-5.46.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kconfigwidgets-5.45.0.tar.xz";
-      sha256 = "0kj0a2x6f27hkzyl7pfz20b0mv4625nxr7iqdq130wdy5x0wv71l";
-      name = "kconfigwidgets-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kconfigwidgets-5.46.0.tar.xz";
+      sha256 = "0d4x323j6yrjjf191vf25g4fl9iad652y0kgqdqv4r2sszb7w3bp";
+      name = "kconfigwidgets-5.46.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kcoreaddons-5.45.0.tar.xz";
-      sha256 = "15zgz8yhw7z31rljgj63hd949sp48syd1ggbay5nmnsb91ly0z92";
-      name = "kcoreaddons-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kcoreaddons-5.46.0.tar.xz";
+      sha256 = "13chb3xh9xyacf72kzvw6rkc9i54p1gifcnk7wx5g223bdym7h3z";
+      name = "kcoreaddons-5.46.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kcrash-5.45.0.tar.xz";
-      sha256 = "1ny3m1jqazf7b2qrh4dlprwyf60cddk2c88dxhmzr02a8040gckv";
-      name = "kcrash-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kcrash-5.46.0.tar.xz";
+      sha256 = "0d9k9i7lk5cj9j91av87x5gjahzs2lhkk6m1q27675sadp9hb6ih";
+      name = "kcrash-5.46.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdbusaddons-5.45.0.tar.xz";
-      sha256 = "071zr5d95j1cd1djqd5nkfz5n224dmzsbx2a446dsp9liklhqaz6";
-      name = "kdbusaddons-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdbusaddons-5.46.0.tar.xz";
+      sha256 = "07h3n06ld1p3gspky3xsx89vpl46hq5apjqr4f2ccahscmyk1fn3";
+      name = "kdbusaddons-5.46.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdeclarative-5.45.0.tar.xz";
-      sha256 = "0h84nla5symfdyrv5dvgs8b1mz0czclipiki16xglzdsja9z9xpl";
-      name = "kdeclarative-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdeclarative-5.46.0.tar.xz";
+      sha256 = "10r20wx36q4kzr973kgwr7j2wq140xiarjawnqpmszcp1gm9qv8c";
+      name = "kdeclarative-5.46.0.tar.xz";
     };
   };
   kded = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kded-5.45.0.tar.xz";
-      sha256 = "0qr4ycqqz2g5k9pzllahc7aj1b6fyh0zidvaxvbw600wjr5v3acw";
-      name = "kded-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kded-5.46.0.tar.xz";
+      sha256 = "0is8x8r2dpam2m83pylyb3wfjdnn6nnrdaqkpglmbrq3r71n002r";
+      name = "kded-5.46.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/portingAids/kdelibs4support-5.45.0.tar.xz";
-      sha256 = "0kil35fj9p8g99jmmkvch326j32wfjqrhypzwg0sa0d74vc2pv5s";
-      name = "kdelibs4support-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/portingAids/kdelibs4support-5.46.0.tar.xz";
+      sha256 = "19jjn5dxgayi9m3kglalg473zslbxc0818fqckichxxn4a0wmylz";
+      name = "kdelibs4support-5.46.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdesignerplugin-5.45.0.tar.xz";
-      sha256 = "0gqvga5akilmqldhzmgjyngbz2dmxmkcjq2g5diq6pijiafsx8kj";
-      name = "kdesignerplugin-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdesignerplugin-5.46.0.tar.xz";
+      sha256 = "11xvl7vjmwv5s9bhkywcapc4h4g8sdrnkwgwzgjf528mfhysi76a";
+      name = "kdesignerplugin-5.46.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdesu-5.45.0.tar.xz";
-      sha256 = "0znncn74vmczcqffc0n6q39q3mk4vsfwj3zn5kglzzsg0x730aly";
-      name = "kdesu-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdesu-5.46.0.tar.xz";
+      sha256 = "0jm4cyy85afq69qaxxzvgfv59y80i76skvwrpa59w8sl173xh8di";
+      name = "kdesu-5.46.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdewebkit-5.45.0.tar.xz";
-      sha256 = "0jdxaaysgdgp15yn2fnxf6m22djyvnl4jcyyrjxz7mz0s0lc4pg9";
-      name = "kdewebkit-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdewebkit-5.46.0.tar.xz";
+      sha256 = "0vr4smvj34yycxrwzhaqd8kmh6jfjxf4a0y2c1j5k41m1w0wdppl";
+      name = "kdewebkit-5.46.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdnssd-5.45.0.tar.xz";
-      sha256 = "181slqgyp7xsg6xz92zris6yjmzysglvkbiyiii4245z1ms9pf0x";
-      name = "kdnssd-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdnssd-5.46.0.tar.xz";
+      sha256 = "1rpf9hjqcv3k8dcwdzdlbyx5shwmjkvck59cgfmzzh6jl81w9z6d";
+      name = "kdnssd-5.46.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdoctools-5.45.0.tar.xz";
-      sha256 = "0b2bkn9a7nxyynn5cy53kb62khfklayj8fwgfdh3sr5a15yjycm5";
-      name = "kdoctools-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdoctools-5.46.0.tar.xz";
+      sha256 = "1zkxnib2b08nb1mxc7sjij07nk0bbylfrrd7p1h8jrx0m4gip7ik";
+      name = "kdoctools-5.46.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kemoticons-5.45.0.tar.xz";
-      sha256 = "1981430xbypxswayrjf5c9bvk65dd2gsima8k0rvysbcqlnyqq7s";
-      name = "kemoticons-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kemoticons-5.46.0.tar.xz";
+      sha256 = "0yxi72x1acjpmkpnkpy8m4y7il095bmmrgnkc9yrax4lmr9hksil";
+      name = "kemoticons-5.46.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kfilemetadata-5.45.0.tar.xz";
-      sha256 = "0wcgsbpkvi8pls9zh24z4c328dl7lq8km4r7dag9vw4200bncwa6";
-      name = "kfilemetadata-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kfilemetadata-5.46.0.tar.xz";
+      sha256 = "15panysvxn7di38dplslpii9xskich09j9x7s79p43pxyczmq0l3";
+      name = "kfilemetadata-5.46.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kglobalaccel-5.45.0.tar.xz";
-      sha256 = "1iwmwpdxrymsyryvp007n3kz2w9syhl4h9jk6x77hprnmwj62cym";
-      name = "kglobalaccel-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kglobalaccel-5.46.0.tar.xz";
+      sha256 = "0xnljxkp9rcl3y22mzlz7zlq923ngyvihg6s7mqpfh97ayfh3pvv";
+      name = "kglobalaccel-5.46.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kguiaddons-5.45.0.tar.xz";
-      sha256 = "16cgi9a9laiwzg2fbp5hl3qlxjmhq0l7dw5kjpkzm7xvlj0rm5cn";
-      name = "kguiaddons-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kguiaddons-5.46.0.tar.xz";
+      sha256 = "02x9aqdvy3gl1y25g03cpk340xzhrmdi84v5xw8y7i2xbmgax244";
+      name = "kguiaddons-5.46.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kholidays-5.45.0.tar.xz";
-      sha256 = "02bcybzkzp26sz6rjnsh60jmwidmjg8wnixzxs5fk7h8qfygm4ra";
-      name = "kholidays-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kholidays-5.46.0.tar.xz";
+      sha256 = "10xb35zinriah3q214qhdwx3riqfj7w0dvn2ds5kcfa070q694yq";
+      name = "kholidays-5.46.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/portingAids/khtml-5.45.0.tar.xz";
-      sha256 = "1ligyb5hpp53q13r9a2w1xi7b5dc1xqqi9bf3jri01n9pf5d4ynq";
-      name = "khtml-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/portingAids/khtml-5.46.0.tar.xz";
+      sha256 = "0cdq8y09qbciwaxvkln03n9jy91li0yp2g440sd580hd3n4zvs09";
+      name = "khtml-5.46.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/ki18n-5.45.0.tar.xz";
-      sha256 = "1xjwwlr46x0wr26xn4z086rlzm2bgzyi1ck91cbcc0jv6p6n43mp";
-      name = "ki18n-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/ki18n-5.46.0.tar.xz";
+      sha256 = "0lwjmxkfqhxwjm0m86f0saa3irzv70psl5y8pv1qib82q3fv73ns";
+      name = "ki18n-5.46.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kiconthemes-5.45.0.tar.xz";
-      sha256 = "0wir8drhv5lx00f4n984yh5xavpi75vg1vpyrf68dd490klwzg45";
-      name = "kiconthemes-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kiconthemes-5.46.0.tar.xz";
+      sha256 = "1y8f2piy258n0k8jrlyhgflafxcqax18fi46719av29ls48cgcap";
+      name = "kiconthemes-5.46.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kidletime-5.45.0.tar.xz";
-      sha256 = "0057az4a9jvn120j94jsmf78lxw03c6s534mjn4r8ns9j46c060i";
-      name = "kidletime-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kidletime-5.46.0.tar.xz";
+      sha256 = "0hvgvmgfrnfmfgi19mjc1cg31yli7pzr9fq2ny9pk63is6zgq3vm";
+      name = "kidletime-5.46.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kimageformats-5.45.0.tar.xz";
-      sha256 = "0kdcrlpj56sw9gy9wf6dxlrsa11k3hv6ayvv6irry3iv1akfx7yp";
-      name = "kimageformats-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kimageformats-5.46.0.tar.xz";
+      sha256 = "0gkmd5ma0dh06vdr8kzw5v9hqw6xqiizzvq7aya2y9lk42p4hay3";
+      name = "kimageformats-5.46.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kinit-5.45.0.tar.xz";
-      sha256 = "0phqwp60368vynnkh0hl3kdz6p0kisa5ab6fvgvks5p9h1nb6l2h";
-      name = "kinit-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kinit-5.46.0.tar.xz";
+      sha256 = "0szpvni3ff50i5w4c2jdi8wsb2i4dfhdna7wcmrzc5qd2l62yi6m";
+      name = "kinit-5.46.0.tar.xz";
     };
   };
   kio = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kio-5.45.0.tar.xz";
-      sha256 = "05bb27jfinpfdh3vz76prkdvpp574sx1sr41b6qk267y37l14x9y";
-      name = "kio-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kio-5.46.0.tar.xz";
+      sha256 = "19fkijl7h1p92sngsqypsd2ni9qld9cxwh8c7diq0ybp8qzpjspb";
+      name = "kio-5.46.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kirigami2-5.45.0.tar.xz";
-      sha256 = "00miz1zwhq5ikwyqvvl6ha8w1dra7rxgw59wfg1ac74kjpb964ng";
-      name = "kirigami2-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kirigami2-5.46.0.tar.xz";
+      sha256 = "1d6w4kc6kf0jlgji83r8zn0r5rdggygi28938wyb3wz4pgaz8m8d";
+      name = "kirigami2-5.46.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kitemmodels-5.45.0.tar.xz";
-      sha256 = "08mbvs6lcfwbprk51fjswig0sprn5pcgrhy34qbbnim5ijf8gkw1";
-      name = "kitemmodels-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kitemmodels-5.46.0.tar.xz";
+      sha256 = "0xy8bqbaqnkxk34p7hfslm42dm98ka86fwi77pz04gw9r6048wq2";
+      name = "kitemmodels-5.46.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kitemviews-5.45.0.tar.xz";
-      sha256 = "19cm7vxkp7qiqhjj7ma2nx4lvp2hiffnakiic26jqzb9sb0vkq2n";
-      name = "kitemviews-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kitemviews-5.46.0.tar.xz";
+      sha256 = "1ni3c2ivqr5vczl7z5707nv469xbwys1vz625ypwfh8py2b9nnwz";
+      name = "kitemviews-5.46.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kjobwidgets-5.45.0.tar.xz";
-      sha256 = "1946wqa6dpi82771nw70nz123w1xa9znhn9kgb0q5ypzc89498gj";
-      name = "kjobwidgets-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kjobwidgets-5.46.0.tar.xz";
+      sha256 = "129mxv7c0fmqdmzg1j8r0cb8sr9masrmkjl4dp8i6yark49k61hf";
+      name = "kjobwidgets-5.46.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/portingAids/kjs-5.45.0.tar.xz";
-      sha256 = "1xmc57fv3692vk0pzmrs1wyzgd69dhp6by0i1kw4a76w8h0lh5sr";
-      name = "kjs-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/portingAids/kjs-5.46.0.tar.xz";
+      sha256 = "002k1jbcwxyv8dcmz3x4m7zv1ry2gdzg5gl466vf5hlc5cwgjac5";
+      name = "kjs-5.46.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/portingAids/kjsembed-5.45.0.tar.xz";
-      sha256 = "15jlbr5nw3c3p4cylr01c6w8isf78wnljsym8fsl9513k8cfabif";
-      name = "kjsembed-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/portingAids/kjsembed-5.46.0.tar.xz";
+      sha256 = "13l2i0i8qlzs993nfbcgaijkhy7w9npn5358d5hfkxjlay7imcq2";
+      name = "kjsembed-5.46.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/portingAids/kmediaplayer-5.45.0.tar.xz";
-      sha256 = "0p3fm448xdcw7qmpbadx9rb6q1zx8bbap0a3xm11ni27s7dpvwgf";
-      name = "kmediaplayer-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/portingAids/kmediaplayer-5.46.0.tar.xz";
+      sha256 = "0y4cn63fa5g35vrdx2hfhrw1fzwg5k3lxgx84r3c33cybxswcigi";
+      name = "kmediaplayer-5.46.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/knewstuff-5.45.0.tar.xz";
-      sha256 = "0jk2zsxkj558rf2ar120mljjv13f261js9p27272wr6ily55navn";
-      name = "knewstuff-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/knewstuff-5.46.0.tar.xz";
+      sha256 = "12r38m7p86b2dfhp8nybm335cvizma4p26gxrwn7jg1kcvbg3hf5";
+      name = "knewstuff-5.46.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/knotifications-5.45.0.tar.xz";
-      sha256 = "0rnqlfg7n86g7fdmx32l337xjr03g1ri88dg94wci3v9rpffy839";
-      name = "knotifications-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/knotifications-5.46.0.tar.xz";
+      sha256 = "0hyf3wv3iy3v7l134pmb623bfa9j578rdymhz4sm5fix4mv23g5z";
+      name = "knotifications-5.46.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/knotifyconfig-5.45.0.tar.xz";
-      sha256 = "0qxfzrw8pmnm6jrl98d50d12x9azgj3f9bin2irim2w6zcsfqs37";
-      name = "knotifyconfig-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/knotifyconfig-5.46.0.tar.xz";
+      sha256 = "0wr0kliagkbpv89h9qviib6b16s2cw5j9jq4gpk3j5ij9zli4lkj";
+      name = "knotifyconfig-5.46.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kpackage-5.45.0.tar.xz";
-      sha256 = "0ddmpn688dil3sdlr91iqczi52rz58nwifij00c0gvj5pgp6agvg";
-      name = "kpackage-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kpackage-5.46.0.tar.xz";
+      sha256 = "1q45zjh0a741f1w1g0vggbcygzzvkzpwj0iy13fwhgf4g7qrdp8c";
+      name = "kpackage-5.46.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kparts-5.45.0.tar.xz";
-      sha256 = "0mhmy6sq21c4rgl4lfz9sr3r4zhzn2wfapm3g7qzf8554rinzs5z";
-      name = "kparts-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kparts-5.46.0.tar.xz";
+      sha256 = "1hr0hy1jsi00rfnjy1wf59skricib6cc0c4bw0h0gw0rdy1vv80j";
+      name = "kparts-5.46.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kpeople-5.45.0.tar.xz";
-      sha256 = "1dm8nb9ckivww867541w6bfjvhg6hi64drzx61ak1ix3ha6n24g1";
-      name = "kpeople-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kpeople-5.46.0.tar.xz";
+      sha256 = "1gkm9ylwm4ajpw6lv78qy4zkmqirm4xnrf0nld3x7jrbpiadfrni";
+      name = "kpeople-5.46.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kplotting-5.45.0.tar.xz";
-      sha256 = "1fdvbd57f8aikgi6xa5qb16a32398zkn83xb6vq5rjd3jrzyk4bi";
-      name = "kplotting-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kplotting-5.46.0.tar.xz";
+      sha256 = "1vkwv2khww1v13r2ys06nfb6c0fwyn152wrfc9vqzcdcv6znq48n";
+      name = "kplotting-5.46.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kpty-5.45.0.tar.xz";
-      sha256 = "0g8daxvybiraax0395sb05468qfzdg0cjgq810kz78512carsg7f";
-      name = "kpty-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kpty-5.46.0.tar.xz";
+      sha256 = "1m1spwgrgjiazkxwddh5xcii482bvxf015x70wnkyyygilbn6871";
+      name = "kpty-5.46.0.tar.xz";
     };
   };
   kross = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/portingAids/kross-5.45.0.tar.xz";
-      sha256 = "1s8y36cn9nj5lqf8f667yyqdk0m4ankqb0fr3s9c7llb87ca8iqn";
-      name = "kross-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/portingAids/kross-5.46.0.tar.xz";
+      sha256 = "0wnj01ml3j3ij4f6plw8d1by8k9fkbslq0finiyxrn64zqfkr1sd";
+      name = "kross-5.46.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/krunner-5.45.0.tar.xz";
-      sha256 = "18rq5nzdxr8x55s3hqp5b3mibfa51sbybirhdp49igz9x2la2j9x";
-      name = "krunner-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/krunner-5.46.0.tar.xz";
+      sha256 = "1nvcprp1b5npzvcdbwzi1yn6953f8kjyfnavhjjp9vfafp4jgdca";
+      name = "krunner-5.46.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kservice-5.45.0.tar.xz";
-      sha256 = "0qrawj6hvy6q68k278nqkmdnjqk1cwr6iym9wmiq3lphsab08nl7";
-      name = "kservice-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kservice-5.46.0.tar.xz";
+      sha256 = "0q502wqvqb61gwy07byg35nk9ac12d02hhqa0qhil6qkv9f7dx57";
+      name = "kservice-5.46.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/ktexteditor-5.45.0.tar.xz";
-      sha256 = "1gp5f9v01f0824j96wmv7a48561wkcndnk75q1qdbkknxk4cmnnp";
-      name = "ktexteditor-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/ktexteditor-5.46.0.tar.xz";
+      sha256 = "1yjyni3f123i2yx20gj13yw0v6cqwwdvk6x8f3maqqdzrfnqmm8b";
+      name = "ktexteditor-5.46.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/ktextwidgets-5.45.0.tar.xz";
-      sha256 = "1r76qvn02m6b1rvzmp966xfxr6ifflzd7g7ln0sxccsd9c46lh2b";
-      name = "ktextwidgets-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/ktextwidgets-5.46.0.tar.xz";
+      sha256 = "1bniracp5q6p4k1ji0gn1a51sylbgxh0bqdlrfkd953mp35rh1wf";
+      name = "ktextwidgets-5.46.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kunitconversion-5.45.0.tar.xz";
-      sha256 = "0alm5s3c6g3w66gzii7jjsb0cn4naiimsnm5dag6idhix79wa1kr";
-      name = "kunitconversion-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kunitconversion-5.46.0.tar.xz";
+      sha256 = "14db0835zd375sn3d4v6d2pa5yp67gn9p8dxfs8111minmraqk43";
+      name = "kunitconversion-5.46.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kwallet-5.45.0.tar.xz";
-      sha256 = "1yis49k3wyk8vhmdhgjrn42jq5kah5z7dg8wgy09dhq61w50sdi9";
-      name = "kwallet-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kwallet-5.46.0.tar.xz";
+      sha256 = "15fvbyfdbmdq7zvsbj1c7xzyyhfd5mhv9zvgiss00ranhghsbbzh";
+      name = "kwallet-5.46.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kwayland-5.45.0.tar.xz";
-      sha256 = "0pk242h8ggd3szyw6jlk0zz8q4rw4ppbbidkilzv3lx340jr1qkq";
-      name = "kwayland-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kwayland-5.46.0.tar.xz";
+      sha256 = "1dwvxhpa93k9l2iqbpyf6s7hkmi91kc56hm0v5q6k2mgb43g32nj";
+      name = "kwayland-5.46.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kwidgetsaddons-5.45.0.tar.xz";
-      sha256 = "0ywya6fa0q7vdwj7almkvdi16m839c48ma7j9sd87rc0dhigv0p0";
-      name = "kwidgetsaddons-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kwidgetsaddons-5.46.0.tar.xz";
+      sha256 = "0h8n4hiyzynpg59bfrk3wgdc1w0b3pdbvimykgjvrrmn4wi6h8f9";
+      name = "kwidgetsaddons-5.46.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kwindowsystem-5.45.0.tar.xz";
-      sha256 = "0139413wk8ifyfwadln87ik55jrp5bccy3lbz6ya191fygglx16k";
-      name = "kwindowsystem-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kwindowsystem-5.46.0.tar.xz";
+      sha256 = "0rxhi8wjjxkqsspx0mqn5049f75s3jihkp73hdgxwwdp1qc66kx3";
+      name = "kwindowsystem-5.46.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kxmlgui-5.45.0.tar.xz";
-      sha256 = "1vb5izjp27qb9685haidagjg2p14a335fwzagzal20z3j2a7j3hv";
-      name = "kxmlgui-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kxmlgui-5.46.0.tar.xz";
+      sha256 = "0wwxry3kf2xsw40dhjpa8gh1qbh4wdnd1hp1g9mmh8l0wpfv289l";
+      name = "kxmlgui-5.46.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kxmlrpcclient-5.45.0.tar.xz";
-      sha256 = "0kfkai1cc4xb7vcspbmf6zd951dfz2yxiyjdar4d21s5krvcfh5l";
-      name = "kxmlrpcclient-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kxmlrpcclient-5.46.0.tar.xz";
+      sha256 = "05wf844ipikikhxcri0xpdwfxs8h3m677frsqkimf778g8vf7crh";
+      name = "kxmlrpcclient-5.46.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/modemmanager-qt-5.45.0.tar.xz";
-      sha256 = "16qdvy19q5pjk82amn3mncwgvk3g2qrbdzl9wpfxhqcny18xbwdd";
-      name = "modemmanager-qt-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/modemmanager-qt-5.46.0.tar.xz";
+      sha256 = "1h9hj1v4js02gyxbh1cizz69vh8pdwb93k9pi334a2s0lxbn5205";
+      name = "modemmanager-qt-5.46.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/networkmanager-qt-5.45.0.tar.xz";
-      sha256 = "00ipzc92v229bz9vv6kga37qhpcnqrxn2h47v9n5myfr1p6acgw0";
-      name = "networkmanager-qt-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/networkmanager-qt-5.46.0.tar.xz";
+      sha256 = "1pp5sgp76fjd62iqki3cc7b2drmfgq2fjhab9ai44r852ydgkzpn";
+      name = "networkmanager-qt-5.46.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/oxygen-icons5-5.45.0.tar.xz";
-      sha256 = "1va0296118x7apb7idjf0qjx5f0flamspmzicc03znbh4hx1fxyc";
-      name = "oxygen-icons5-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/oxygen-icons5-5.46.0.tar.xz";
+      sha256 = "141qhbk6rakvh2clxyfhinzka3ap99ac8y90qplgss31ww0wxbb5";
+      name = "oxygen-icons5-5.46.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/plasma-framework-5.45.0.tar.xz";
-      sha256 = "1db8pyq1bdkswi59aihaqgas3xzzlfsfd9yn34g4q00gzc17ird5";
-      name = "plasma-framework-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/plasma-framework-5.46.0.tar.xz";
+      sha256 = "0zpv6b128ll9yf23ys8hv35a95igmlbk3zid5k4385b6h0j4h367";
+      name = "plasma-framework-5.46.0.tar.xz";
     };
   };
   prison = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/prison-5.45.0.tar.xz";
-      sha256 = "1g6rnyx84sz28cf427y9yp0lcbdhrlgx4ns80jz34gyzcgi4bxi0";
-      name = "prison-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/prison-5.46.0.tar.xz";
+      sha256 = "1508pcqvyjfqg0yxk2jx32cqlvvz658z001n6iaf4c7hwclkyspg";
+      name = "prison-5.46.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/purpose-5.45.0.tar.xz";
-      sha256 = "0mfx2gl78w2wwkykl0zch88i7d10zq5cm2xqwxjfpkpdjwb7pflb";
-      name = "purpose-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/purpose-5.46.0.tar.xz";
+      sha256 = "1mrssw484hb3nk9hafys0ns1ixd8h3l6m8qnyry9ky964xqmbkg1";
+      name = "purpose-5.46.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/qqc2-desktop-style-5.45.0.tar.xz";
-      sha256 = "1dc20wkh2cfyhd7wkg1v1b5f6asz70m8ksml6r5hzs807sdqvrsa";
-      name = "qqc2-desktop-style-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/qqc2-desktop-style-5.46.0.tar.xz";
+      sha256 = "0hfl0qk4nadz2jykn0xaphppiqva0h83br4ym6zf2wc3c5sd6w91";
+      name = "qqc2-desktop-style-5.46.0.tar.xz";
     };
   };
   solid = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/solid-5.45.0.tar.xz";
-      sha256 = "175hsj2hdsdnz4wkg1l56275390nn1kjpwcyb7ryzzqabn7hdqmd";
-      name = "solid-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/solid-5.46.0.tar.xz";
+      sha256 = "0ywx5nbms6nk7dmcbbgjfm8w3lchhf90wlhv077yhmxlnqciv3im";
+      name = "solid-5.46.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/sonnet-5.45.0.tar.xz";
-      sha256 = "0msrwxfvc4vr4xqpwavnj0w4cwkflfjql8nhgm5bvk6cpcxs92ss";
-      name = "sonnet-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/sonnet-5.46.0.tar.xz";
+      sha256 = "13jmyiqfwcc7r5y2mb2hwwnn28bq1l0pjlfv8g963r0agzyap424";
+      name = "sonnet-5.46.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/syntax-highlighting-5.45.0.tar.xz";
-      sha256 = "1v73jzansk6z0kwq65gxvkcm7vcmgw2jvl7916aqzj8xjx8kp433";
-      name = "syntax-highlighting-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/syntax-highlighting-5.46.0.tar.xz";
+      sha256 = "18b7v6l3ckqkhp5mxpfvyzl89yl3w9hcqbvfvbzzr9pd0lg09xxx";
+      name = "syntax-highlighting-5.46.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/threadweaver-5.45.0.tar.xz";
-      sha256 = "16s1pgyxhs6v1w7pwg3rr97xkd24xmf23x24pcm15ybd9g38a5yp";
-      name = "threadweaver-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/threadweaver-5.46.0.tar.xz";
+      sha256 = "0zndyxj3kkxs4mlznykf3lm5bq3mmwanxd80pb7y0rymnzsd2n7q";
+      name = "threadweaver-5.46.0.tar.xz";
     };
   };
 }
-- 
GitLab


From 9e1017de2269e1a43088832c1adfcf88ffcdb6f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 03:21:24 -0700
Subject: [PATCH 0698/1085] feh: 2.26 -> 2.26.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/n3q1mfdip3l49wx7dh293pwrxqhlrqgd-feh-2.26.1/bin/feh -h’ got 0 exit code
- ran ‘/nix/store/n3q1mfdip3l49wx7dh293pwrxqhlrqgd-feh-2.26.1/bin/feh --help’ got 0 exit code
- ran ‘/nix/store/n3q1mfdip3l49wx7dh293pwrxqhlrqgd-feh-2.26.1/bin/.feh-wrapped -h’ got 0 exit code
- ran ‘/nix/store/n3q1mfdip3l49wx7dh293pwrxqhlrqgd-feh-2.26.1/bin/.feh-wrapped --help’ got 0 exit code
- found 2.26.1 with grep in /nix/store/n3q1mfdip3l49wx7dh293pwrxqhlrqgd-feh-2.26.1
- directory tree listing: https://gist.github.com/1e8258220f00de69ea28c57fffe352aa
- du listing: https://gist.github.com/65e35fd7395eca9058de10721f96b7d3
---
 pkgs/applications/graphics/feh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 475c8de97b9..96d4a397c90 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.26";
+  version = "2.26.1";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "11kckzwk3b734l0n4j41k40liq1v2lbbj1gzir5qc386g7fvzmmi";
+    sha256 = "155clzkrzs7fh5nx924851di30hilcg16g192ldqqc12p5z5gikd";
   };
 
   outputs = [ "out" "man" "doc" ];
-- 
GitLab


From 8e6e8953df2ab720551988d0a8adb74192207f62 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 03:05:26 -0700
Subject: [PATCH 0699/1085] keepass: 2.39 -> 2.39.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1/bin/.keepass-wrapped -h’ got 0 exit code
- ran ‘/nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1/bin/.keepass-wrapped --help’ got 0 exit code
- ran ‘/nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1/bin/.keepass-wrapped help’ got 0 exit code
- ran ‘/nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1/bin/keepass -h’ got 0 exit code
- ran ‘/nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1/bin/keepass --help’ got 0 exit code
- ran ‘/nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1/bin/keepass help’ got 0 exit code
- found 2.39.1 with grep in /nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1
- directory tree listing: https://gist.github.com/78c15efa16b6307a93c5f5336a99df32
- du listing: https://gist.github.com/c18c593ba095ab336bc0102838e529ca
---
 pkgs/applications/misc/keepass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 8676ba70858..53b965a1bb7 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -3,11 +3,11 @@
 
 with builtins; buildDotnetPackage rec {
   baseName = "keepass";
-  version = "2.39";
+  version = "2.39.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "05mrbzlkr2h42cls6xhas76dg8kyic4fijwckrh0b0qv5pp71c11";
+    sha256 = "0y69w9zzxqj7xrn632bw6bibrknjbx1k3qcvi9axn67sqmzaka00";
   };
 
   sourceRoot = ".";
-- 
GitLab


From d71cde319855e43087f3026c2c2e6ffefa5fc72e Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Mon, 14 May 2018 10:46:00 +0000
Subject: [PATCH 0700/1085] taskwarrior: install zsh completion (#40454)

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

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 80e1b9b69ef..1018a53ce21 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -4,10 +4,8 @@ stdenv.mkDerivation rec {
   name = "taskwarrior-${version}";
   version = "2.5.1";
 
-  enableParallelBuilding = true;
-
   src = fetchurl {
-    url = "http://www.taskwarrior.org/download/task-${version}.tar.gz";
+    url = "https://taskwarrior.org/download/task-${version}.tar.gz";
     sha256 = "059a9yc58wcicc6xxsjh1ph7k2yrag0spsahp1wqmsq6h7jwwyyq";
   };
 
@@ -20,11 +18,13 @@ stdenv.mkDerivation rec {
     ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash"
     mkdir -p "$out/share/fish/vendor_completions.d"
     ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/"
+    mkdir -p "$out/share/zsh/site-functions"
+    ln -s "../../../share/doc/task/scripts/zsh/_task" "$out/share/zsh/site-functions/"
   '';
 
   meta = with stdenv.lib; {
     description = "Highly flexible command-line tool to manage TODO lists";
-    homepage = http://taskwarrior.org;
+    homepage = https://taskwarrior.org;
     license = licenses.mit;
     maintainers = with maintainers; [ marcweber jgeerds ];
     platforms = platforms.linux ++ platforms.darwin;
-- 
GitLab


From 053d1e033968c6c835246cf295e363431be4b06e Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <eisfreak7@gmail.com>
Date: Mon, 14 May 2018 12:47:45 +0200
Subject: [PATCH 0701/1085] giac: re-add lapack without atlas (#40 (#40458)

giac: re-add lapack without atlas
---
 pkgs/applications/science/math/giac/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index f6e1deb8606..d32beeef4f4 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, texlive, bison, flex
+{ stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapackWithoutAtlas
 , gmp, mpfr, pari, ntl, gsl, blas, mpfi
 , readline, gettext, libpng, libao, gfortran, perl
 , enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     # gfortran.cc default output contains static libraries compiled without -fPIC
     # we want libgfortran.so.3 instead
     (stdenv.lib.getLib gfortran.cc)
+    liblapackWithoutAtlas
   ] ++ stdenv.lib.optionals enableGUI [
     libGLU_combined fltk xorg.libX11
   ];
-- 
GitLab


From 17ccab6b124183b90d4c5fd2c7252024ae10c978 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 03:58:18 -0700
Subject: [PATCH 0702/1085] gdal: 2.2.4 -> 2.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdal2tiles.py-wrapped -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdal2tiles.py-wrapped --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdal2tiles.py -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdal2tiles.py --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdalident.py-wrapped -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdalident.py-wrapped --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdalident.py-wrapped help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdalident.py -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdalident.py --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdalident.py help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.mkgraticule.py-wrapped help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/mkgraticule.py help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdalsrsinfo help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/ogrinfo help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/testepsg -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/testepsg --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/testepsg help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdal-config --version’ and found version 2.3.0
- found 2.3.0 with grep in /nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0
- directory tree listing: https://gist.github.com/b6bcad3891a98e65991899121540cc85
- du listing: https://gist.github.com/f89d55b943a68b1550b8eff3f204f27f
---
 pkgs/development/libraries/gdal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 562d79b0092..873d71d178b 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -8,12 +8,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.2.4";
+  version = "2.3.0";
   name = "gdal-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz";
-    sha256 = "0y1237m2wilxgrsd0cdjpbf1zj9z954sd8518g53hlmkmk8v27j4";
+    sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg";
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
-- 
GitLab


From d8c9aff5dcfc76e04fe7ff4bac5e83edbb96d1e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 05:21:53 -0700
Subject: [PATCH 0703/1085] chirp: 20180412 -> 20180512

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 20180512 with grep in /nix/store/hwlmx1k0a81j7mlvbmrw9lh85a9fg0p1-chirp-daily-20180512
- directory tree listing: https://gist.github.com/6c874faee515e55192c80420f78625dc
- du listing: https://gist.github.com/a39fb2733ffbb945eb83d739a8314d38
---
 pkgs/applications/misc/chirp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index b8fc63c2c9e..54f36663454 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
-  version = "20180412";
+  version = "20180512";
 
   src = fetchurl {
     url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
-    sha256 = "17wpxqzifz6grw9xzg9q9vr58vm2xd50fhd64c3ngdhxcnq2dpj9";
+    sha256 = "111pijr0v36n3yg0p58mgvfxvz088axnxvgfhs8cblssi931mimm";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 7d631f8978365d508dbe67d2156ecaa1b0d5e400 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 05:44:43 -0700
Subject: [PATCH 0704/1085] accountsservice: 0.6.47 -> 0.6.49

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.6.49 with grep in /nix/store/5n1xmzvhis54f8vahhwxv4pn2k82sqmc-accountsservice-0.6.49
- directory tree listing: https://gist.github.com/d4f52cc42677c263ff034c14fb7741e3
- du listing: https://gist.github.com/0a90eaba29c57c4f54c36a659416df96
---
 pkgs/development/libraries/accountsservice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 289bc45d203..ddff61dbed0 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "accountsservice-${version}";
-  version = "0.6.47";
+  version = "0.6.49";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
-    sha256 = "038k7p2fqqcycwbh1ik4rjlnzddkf9j9wf0risjabccqj33znkp3";
+    sha256 = "032ndvs18gla49dvc9vg35cwczg0wpv2wscp1m3yjfdqdpams7i5";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
-- 
GitLab


From b7a0f37c0df3b1519572fe4dc5af2024565cbd67 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 14 May 2018 08:03:17 -0700
Subject: [PATCH 0705/1085] byacc: 20170709 -> 20180510 (#40499)

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 20180510 with grep in /nix/store/z8i5f145zpz750hvcbjlncy8kqak8zv2-byacc-20180510
- directory tree listing: https://gist.github.com/328d2b1900cfb911e7567cabf95d80c3
- du listing: https://gist.github.com/cc161fe31193017387ae25b64829aaf2
---
 pkgs/development/tools/parsing/byacc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index 612196cba77..2f8c97ff271 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "byacc-${version}";
-  version = "20170709";
+  version = "20180510";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/byacc/${name}.tgz"
       "https://invisible-mirror.net/archives/byacc/${name}.tgz"
     ];
-    sha256 = "1syrg1nwh2qmlr5mh7c4vz9psdv4gf55h8i5ffw84q6whlcq1kr7";
+    sha256 = "14ynlrcsc2hwny3gxng19blfvglhqd4m7hl597fwksf7zfzhv56h";
   };
 
   doCheck = true;
-- 
GitLab


From 1de744647f3d7acdc855236023340d02e9fbfa45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Mon, 14 May 2018 17:11:44 +0200
Subject: [PATCH 0706/1085] sublime3: 3170 -> 3176 (#40494)

---
 pkgs/applications/editors/sublime/3/packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix
index 98cfc03c3d2..8ab7c814407 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/pkgs/applications/editors/sublime/3/packages.nix
@@ -5,14 +5,14 @@ let
 in
   rec {
     sublime3-dev = common {
-      buildVersion = "3170";
-      x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg";
-      x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx";
+      buildVersion = "3176";
+      x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23";
+      x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl";
     } {};
 
     sublime3 = common {
-      buildVersion = "3170";
-      x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg";
-      x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx";
+      buildVersion = "3176";
+      x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23";
+      x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl";
     } {};
   }
-- 
GitLab


From 2abd5916a7cf4ca49586472f35373a620c2ff485 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 14 May 2018 08:13:57 -0700
Subject: [PATCH 0707/1085] fstrm: 0.3.2 -> 0.4.0 (#40489)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/p9y2vcrsa056xibh0y1xaz750mdcc5yq-fstrm-0.4.0-bin/bin/fstrm_capture --version’ and found version 0.4.0
- found 0.4.0 with grep in /nix/store/p9y2vcrsa056xibh0y1xaz750mdcc5yq-fstrm-0.4.0-bin
- directory tree listing: https://gist.github.com/5cc213160a9ec091c9e767b95bfe2cdd
- du listing: https://gist.github.com/c4b1f58631938c0cad031ac2dc920011
---
 pkgs/development/libraries/fstrm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix
index 9c4bf00347c..372cb50d05c 100644
--- a/pkgs/development/libraries/fstrm/default.nix
+++ b/pkgs/development/libraries/fstrm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "fstrm-${version}";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "farsightsec";
     repo = "fstrm";
     rev = "v${version}";
-    sha256 = "135m0d4z1wbiaazs3bh6z53a35mgs33gvfki8pl4xfaw9cfcfpd2";
+    sha256 = "11i8b3wy6j3z3fcv816xccxxlrfkczdr8bm2gnan6yv4ppbji4ny";
   };
 
   outputs = [ "bin" "out" "dev" ];
-- 
GitLab


From 4edfc0e93d679a809a0db0c953096726fcb97a28 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 14 May 2018 08:21:22 -0700
Subject: [PATCH 0708/1085] ccnet: 6.1.7 -> 6.1.8 (#40495)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/k21v52qac99ppn2ba80ywki05cv6m65r-ccnet-6.1.8/bin/ccnet -h’ got 0 exit code
- ran ‘/nix/store/k21v52qac99ppn2ba80ywki05cv6m65r-ccnet-6.1.8/bin/ccnet --help’ got 0 exit code
- found 6.1.8 with grep in /nix/store/k21v52qac99ppn2ba80ywki05cv6m65r-ccnet-6.1.8
- directory tree listing: https://gist.github.com/275cfa6377f77e502dcc0309bb683687
- du listing: https://gist.github.com/f2f22837494355a9bf385b8432a4b210
---
 pkgs/tools/networking/ccnet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index 408fd0f8c8f..6fac4a282d0 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}:
 
 stdenv.mkDerivation rec {
-  version = "6.1.7";
-  seafileVersion = "6.1.7";
+  version = "6.1.8";
+  seafileVersion = "6.1.8";
   name = "ccnet-${version}";
 
   src = fetchurl {
     url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz";
-    sha256 = "1kkzdxa9r7sw1niwniznfkvilgvb7q039wq07cfk73qs3231bj7r";
+    sha256 = "0qlpnrz30ldrqnvbj59d54qdghxpxc5lsq6kf3dw2b93jnzkcmmm";
   };
 
   nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ];
-- 
GitLab


From efde5fefb3a55d3aeebf69332d7d1223e4432413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?=
 <arcadio@users.noreply.github.com>
Date: Mon, 14 May 2018 17:37:53 +0100
Subject: [PATCH 0709/1085] nixos: stumpwm: switch from package marked as
 broken to working quicklisp package (#40501)

---
 nixos/modules/services/x11/window-managers/stumpwm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/stumpwm.nix b/nixos/modules/services/x11/window-managers/stumpwm.nix
index 3d3f2e0028c..27a17178476 100644
--- a/nixos/modules/services/x11/window-managers/stumpwm.nix
+++ b/nixos/modules/services/x11/window-managers/stumpwm.nix
@@ -15,10 +15,10 @@ in
     services.xserver.windowManager.session = singleton {
       name = "stumpwm";
       start = ''
-        ${pkgs.stumpwm}/bin/stumpwm &
+        ${pkgs.lispPackages.stumpwm}/bin/stumpwm &
         waitPID=$!
       '';
     };
-    environment.systemPackages = [ pkgs.stumpwm ];
+    environment.systemPackages = [ pkgs.lispPackages.stumpwm ];
   };
 }
-- 
GitLab


From b14f809bb101b29964508857765e3638402e451a Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Mon, 14 May 2018 11:24:18 -0400
Subject: [PATCH 0710/1085] flent: init at 1.2.2

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

diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
new file mode 100644
index 00000000000..9a0bb0104d4
--- /dev/null
+++ b/pkgs/applications/networking/flent/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, netperf, procps, pyqt5 }:
+
+buildPythonApplication rec {
+  pname = "flent";
+  version = "1.2.2";
+  src = fetchFromGitHub {
+    owner = "tohojo";
+    repo = "flent";
+    rev = version;
+    sha256 = "0rl4ahynl6ymw7r04vpg9p90pplrxc41rjlzvm0swxsvpw40yvkm";
+  };
+
+  buildInputs = [ netperf ];
+  propagatedBuildInputs = [
+    matplotlib
+    procps
+    pyqt5
+  ];
+
+  meta = with stdenv.lib; {
+    description = "The FLExible Network Tester";
+    homepage = https://flent.org;
+    license = licenses.gpl3;
+
+    maintainers = [ maintainers.mmlb ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d11c94e868..3a4077267eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2332,6 +2332,8 @@ with pkgs;
 
   flashrom = callPackage ../tools/misc/flashrom { };
 
+  flent = python3Packages.callPackage ../applications/networking/flent { };
+
   flpsed = callPackage ../applications/editors/flpsed { };
 
   fluentd = callPackage ../tools/misc/fluentd { };
-- 
GitLab


From 3a9654bfe29ebd987b7426faa25f00af1fab02c5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 14 May 2018 13:13:11 -0400
Subject: [PATCH 0711/1085] gcc: Simplify this old Hurd condition

Steps towards getting rid of crossConfig.
---
 pkgs/development/compilers/gcc/4.5/default.nix      | 7 +------
 pkgs/development/compilers/gcc/4.8/default.nix      | 6 +-----
 pkgs/development/compilers/gcc/4.9/default.nix      | 6 +-----
 pkgs/development/compilers/gcc/5/default.nix        | 6 +-----
 pkgs/development/compilers/gcc/6/default.nix        | 6 +-----
 pkgs/development/compilers/gcc/7/default.nix        | 6 +-----
 pkgs/development/compilers/gcc/snapshot/default.nix | 6 +-----
 7 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 36b48b88021..70fbefb898e 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -151,12 +151,7 @@ stdenv.mkDerivation ({
     ;
 
   postPatch =
-    if (stdenv.system == "i586-pc-gnu"
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"
-            && libcCross != null))
+    if targetPlatform.isHurd
     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.
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index dea8b912b27..1fcad756eec 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -193,11 +193,7 @@ stdenv.mkDerivation ({
   libc_dev = stdenv.cc.libc_dev;
 
   postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
     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.
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 343d820fa23..009f28dc66b 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -188,11 +188,7 @@ stdenv.mkDerivation ({
   libc_dev = stdenv.cc.libc_dev;
 
   postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
     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.
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 0d9565de0a7..a695b6819a1 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -204,11 +204,7 @@ stdenv.mkDerivation ({
   '';
 
   postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
     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.
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 29f2bad7eac..c5ca1060894 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -204,11 +204,7 @@ stdenv.mkDerivation ({
   '';
 
   postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
     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.
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index e75e22efce1..9a0da5dbf6e 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -204,11 +204,7 @@ stdenv.mkDerivation ({
   '';
 
   postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
     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.
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 609d418693d..fcfc8f15f13 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -183,11 +183,7 @@ stdenv.mkDerivation ({
   hardeningDisable = [ "format" ];
 
   postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
     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.
-- 
GitLab


From 9d5b6b89f061cb416c19f4c49f04117d315328be Mon Sep 17 00:00:00 2001
From: Eric Bailey <e.bailey@sportradar.com>
Date: Mon, 14 May 2018 12:50:20 -0500
Subject: [PATCH 0712/1085] kubernetes: 1.9.1 -> 1.9.7

---
 .../networking/cluster/kubernetes/default.nix | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 1a7ba3cf93d..e1023afc7ab 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -16,13 +16,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.9.1";
+  version = "1.9.7";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk";
+    sha256 = "1dykh48c6bvypg51mlxjdyrggpjq597mjj83xgj1pfadsy6pp9bh";
   };
 
   # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60373
@@ -30,21 +30,6 @@ stdenv.mkDerivation rec {
 
   outputs = ["out" "man" "pause"];
 
-  patches = [
-    # patch is from https://github.com/kubernetes/kubernetes/pull/58207
-    (fetchpatch {
-      url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch";
-      sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w";
-    })
-    (fetchpatch {
-      # https://github.com/kubernetes/kubernetes/pull/60978
-      # Fixes critical kube-proxy failure on iptables-restore >= 1.6.2 and
-      # non-critical failures on prior versions.
-      url = "https://github.com/kubernetes/kubernetes/commit/34ce573e9992ecdbc06dff1b4e3d0e9baa8353dd.patch";
-      sha256 = "1sd9qgc28zr6fkk0441f89bw8kq2kadys0qs7bgivy9cmcpw5x5p";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
     substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
-- 
GitLab


From e4a2b70f91dd19535cc08c966b9ec612a0216827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?= <arc@well.ox.ac.uk>
Date: Mon, 14 May 2018 21:26:07 +0100
Subject: [PATCH 0713/1085] minimap2: init at 2.10

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

diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix
new file mode 100644
index 00000000000..ae278f76792
--- /dev/null
+++ b/pkgs/applications/science/biology/minimap2/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "minimap2";
+  version = "2.10";
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "lh3";
+    rev = "v${version}";
+    sha256 = "0b35w14j9h2q9qbh3sxc518mcx0ifsvwqr1nv70rv6mgy1cqqkw0";
+  };
+
+  buildInputs = [ zlib ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp minimap2 $out/bin
+    mkdir -p $out/share/man/man1
+    cp minimap2.1 $out/share/man/man1
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "A versatile pairwise aligner for genomic and spliced nucleotide sequences";
+    homepage = https://lh3.github.io/minimap2;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.arcadio ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d11c94e868..e269cbb956a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19927,6 +19927,8 @@ with pkgs;
     inherit (perlPackages) GetoptTabular MNI-Perllib;
   };
 
+  minimap2 = callPackage ../applications/science/biology/minimap2 { };
+
   ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };
 
   paml = callPackage ../applications/science/biology/paml { };
-- 
GitLab


From dd73ab00923a4b39fe7b3fbce31cadfd38d8177b Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Tue, 15 May 2018 00:18:49 +0200
Subject: [PATCH 0714/1085] nixos/tests: prevent stateVersion warnings in eval

... introduced by 1f0b6922d3c
continuation of 88fa50c2f2bbc472fe7169eac8f2a1b2312ef03b
---
 nixos/modules/installer/cd-dvd/installation-cd-base.nix | 2 ++
 nixos/modules/installer/virtualbox-demo.nix             | 1 +
 nixos/release.nix                                       | 1 +
 nixos/tests/containers-imperative.nix                   | 4 +++-
 nixos/tests/containers-ipv4.nix                         | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 756c8751d00..1ed56386e6e 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -31,4 +31,6 @@ with lib;
 
   # Allow the user to log in as root without a password.
   users.extraUsers.root.initialHashedPassword = "";
+
+  system.nixos.stateVersion = mkDefault "18.03";
 }
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index 13a0d7f4f6e..c40e3035420 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -21,4 +21,5 @@ with lib;
   services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ];
 
   powerManagement.enable = false;
+  system.nixos.stateVersion = mkDefault "18.03";
 }
diff --git a/nixos/release.nix b/nixos/release.nix
index 57fc245e57d..7ec41af4fd4 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -198,6 +198,7 @@ in rec {
         modules = singleton ({ config, pkgs, ... }:
           { fileSystems."/".device  = mkDefault "/dev/sda1";
             boot.loader.grub.device = mkDefault "/dev/sda";
+            system.nixos.stateVersion = mkDefault "18.03";
           });
       }).config.system.build.toplevel;
       preferLocalBuild = true;
diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 015b79b1cee..a548b17b1ff 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -17,7 +17,9 @@ import ./make-test.nix ({ pkgs, ...} : {
         emptyContainer = import ../lib/eval-config.nix {
           inherit (config.nixpkgs.localSystem) system;
           modules = lib.singleton {
-            containers.foo.config = {};
+            containers.foo.config = {
+              system.nixos.stateVersion = "18.03";
+            };
           };
         };
       in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ];
diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix
index 31d05990a67..821ce1cd07d 100644
--- a/nixos/tests/containers-ipv4.nix
+++ b/nixos/tests/containers-ipv4.nix
@@ -21,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
               services.httpd.adminAddr = "foo@example.org";
               networking.firewall.allowedTCPPorts = [ 80 ];
               networking.firewall.allowPing = true;
+              system.nixos.stateVersion = "18.03";
             };
         };
 
-- 
GitLab


From e1960e7314a6070bdc17a8f0ed466df0e373553e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 14 May 2018 20:34:37 -0300
Subject: [PATCH 0715/1085] terminology: 1.2.0 -> 1.2.1 (#40524)

---
 pkgs/desktops/enlightenment/terminology.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 1a15092c7e7..3b00ab55835 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
-    sha256 = "0kw34l5lahn1qaks3ah6x8k41d6hfywpqfak2p7qq1z87zj506mx";
+    sha256 = "1ii8332bl88l8md3gvz5dhi9bjpm6shyf14ck9kfyy7d56hp71mc";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 9be118223b641f85233805deabbe1fd52e927bad Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 14 May 2018 20:31:27 -0400
Subject: [PATCH 0716/1085] misc mingw: Get rid of crossConfig and clean up

Style of dual implementation and headers derivations is take from
bb7067f882bf3c53ea68780a8ec0a7117f563253.
---
 pkgs/os-specific/windows/mingwrt/common.nix  | 12 +++++++
 pkgs/os-specific/windows/mingwrt/default.nix | 32 +++---------------
 pkgs/os-specific/windows/mingwrt/headers.nix | 17 ++++++++++
 pkgs/os-specific/windows/w32api/common.nix   | 14 ++++++++
 pkgs/os-specific/windows/w32api/default.nix  | 34 +++-----------------
 pkgs/os-specific/windows/w32api/headers.nix  | 17 ++++++++++
 pkgs/top-level/all-packages.nix              | 18 +++--------
 7 files changed, 73 insertions(+), 71 deletions(-)
 create mode 100644 pkgs/os-specific/windows/mingwrt/common.nix
 create mode 100644 pkgs/os-specific/windows/mingwrt/headers.nix
 create mode 100644 pkgs/os-specific/windows/w32api/common.nix
 create mode 100644 pkgs/os-specific/windows/w32api/headers.nix

diff --git a/pkgs/os-specific/windows/mingwrt/common.nix b/pkgs/os-specific/windows/mingwrt/common.nix
new file mode 100644
index 00000000000..7dc2ae56aa8
--- /dev/null
+++ b/pkgs/os-specific/windows/mingwrt/common.nix
@@ -0,0 +1,12 @@
+{ lib, fetchurl }:
+
+rec {
+  name = "mingwrt-3.20";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz";
+    sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91pi";
+  };
+
+  meta.platforms = [ lib.systems.inspect.isMinGW ];
+}
diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix
index 98461d690d9..3429f7564ad 100644
--- a/pkgs/os-specific/windows/mingwrt/default.nix
+++ b/pkgs/os-specific/windows/mingwrt/default.nix
@@ -1,29 +1,7 @@
-{stdenv, fetchurl, binutils ? null, gccCross ? null, onlyHeaders ? false}:
-
-let
-  name = "mingwrt-3.20";
-in
-stdenv.mkDerivation (rec {
-  inherit name;
-
-  src = fetchurl {
-    url = "mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz";
-    sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91pi";
-  };
-
-} //
-(if onlyHeaders then {
-  name = name + "-headers";
-  phases = [ "unpackPhase" "installPhase" ];
-  installPhase = ''
-    mkdir -p $out
-    cp -R include $out
-  '';
-} else {
-  buildInputs = [ gccCross binutils ];
-
-  crossConfig = gccCross.crossConfig;
+{ stdenv, callPackage }:
 
+stdenv.mkDerivation {
+  inherit (callPackage ./common.nix {}) name src meta;
   dontStrip = true;
-})
-)
+  hardeningDisable = [ "stackprotector" "fortify" ];
+}
diff --git a/pkgs/os-specific/windows/mingwrt/headers.nix b/pkgs/os-specific/windows/mingwrt/headers.nix
new file mode 100644
index 00000000000..51180af0fc7
--- /dev/null
+++ b/pkgs/os-specific/windows/mingwrt/headers.nix
@@ -0,0 +1,17 @@
+{ stdenvNoCC, callPackage }:
+
+let
+  inherit (callPackage ./common.nix {}) name src meta;
+
+in stdenvNoCC.mkDerivation {
+  name = name + "-headers";
+
+  inherit src meta;
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R include $out
+  '';
+}
diff --git a/pkgs/os-specific/windows/w32api/common.nix b/pkgs/os-specific/windows/w32api/common.nix
new file mode 100644
index 00000000000..273ae2c8df4
--- /dev/null
+++ b/pkgs/os-specific/windows/w32api/common.nix
@@ -0,0 +1,14 @@
+{ fetchurl, xz }:
+
+rec {
+  name = "w32api-3.17-2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma";
+    sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";
+  };
+
+  nativeBuildInputs = [ xz ];
+
+  meta.platforms = [ lib.systems.inspect.isMinGW ];
+}
diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix
index 3443fff9668..51b88201998 100644
--- a/pkgs/os-specific/windows/w32api/default.nix
+++ b/pkgs/os-specific/windows/w32api/default.nix
@@ -1,32 +1,6 @@
-{ stdenv, fetchurl, xz, binutils ? null
-, gccCross ? null, onlyHeaders ? false }:
-
-let
-  name = "w32api-3.17-2";
-in
-stdenv.mkDerivation ({
-  inherit name;
-
-  src = fetchurl {
-    url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma";
-    sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";
-  };
-
-  nativeBuildInputs = [ xz ];
-
-} //
-(if onlyHeaders then {
-  name = name + "-headers";
-  phases = [ "unpackPhase" "installPhase" ];
-  installPhase = ''
-    mkdir -p $out
-    cp -R include $out
-  '';
-} else {
-  buildInputs = [ gccCross binutils ];
-
-  crossConfig = gccCross.crossConfig;
+{ stdenv, callPackage }:
 
+stdenv.mkDerivation {
+  inherit (callPackage ./common.nix {}) name src nativeBuildInputs meta;
   dontStrip = true;
-})
-)
+}
diff --git a/pkgs/os-specific/windows/w32api/headers.nix b/pkgs/os-specific/windows/w32api/headers.nix
new file mode 100644
index 00000000000..3083118bb36
--- /dev/null
+++ b/pkgs/os-specific/windows/w32api/headers.nix
@@ -0,0 +1,17 @@
+{ stdenvNoCC, callPackage }:
+
+let
+  inherit (callPackage ./common.nix {}) name src meta;
+
+in stdenvNoCC.mkDerivation {
+  name = name + "-headers";
+
+  inherit src nativeBuildInputs meta;
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R include $out
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d18e51772ce..65d1dc9dbb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13868,23 +13868,13 @@ with pkgs;
 
     jom = callPackage ../os-specific/windows/jom { };
 
-    w32api = callPackage ../os-specific/windows/w32api {
-      gccCross = gccCrossStageStatic;
-      binutils = binutils;
-    };
+    w32api = callPackage ../os-specific/windows/w32api { };
 
-    w32api_headers = w32api.override {
-      onlyHeaders = true;
-    };
+    w32api_headers = callPackage ../os-specific/windows/w32api/headers { };
 
-    mingw_runtime = callPackage ../os-specific/windows/mingwrt {
-      gccCross = gccCrossMingw2;
-      binutils = binutils;
-    };
+    mingw_runtime = callPackage ../os-specific/windows/mingwrt { };
 
-    mingw_runtime_headers = mingw_runtime.override {
-      onlyHeaders = true;
-    };
+    mingw_runtime_headers = callPackage ../os-specific/windows/mingwrt/headers.nix { };
 
     mingw_headers1 = buildEnv {
       name = "mingw-headers-1";
-- 
GitLab


From 84868b8b06e54f0d1a9eb3140ed80b4d697f35d3 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 14 May 2018 20:33:54 -0400
Subject: [PATCH 0717/1085] misc hurd stuff: Get rid of crossConfig

This stuff is horribly bit-rotted anyways, but I'm getting rid of
crossConfig so it must be changed.
---
 pkgs/os-specific/gnu/hurd/default.nix       | 29 +++++++--------------
 pkgs/os-specific/gnu/libpthread/default.nix |  2 --
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index 5eccee62468..ae1c504fd19 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -75,25 +75,16 @@ stdenv.mkDerivation ({
 
 //
 
-(if !headersOnly && buildTarget != null
- then assert installTarget != null; {
-   # Use the default `buildPhase' and `installPhase' so that the usual hooks
-   # can still be used.
-   buildFlags = buildTarget;
-   installTargets = installTarget;
- }
- else {})
+stdenv.lib.optionalAttrs (!headersOnly && buildTarget != null) {
+  # Use the default `buildPhase' and `installPhase' so that the usual hooks
+  # can still be used.
+  buildFlags = buildTarget;
+  installTargets = assert installTarget != null; installTarget;
+}
 
 //
 
-(if headersOnly
- then { dontBuild = true; installPhase = "make install-headers"; }
- else (if (cross != null)
-       then {
-         crossConfig = cross.config;
-
-         # The `configure' script wants to build executables so tell it where
-         # to find `crt1.o' et al.
-         LDFLAGS = "-B${glibcCross}/lib";
-       }
-       else { })))
+stdenv.lib.optionalAttrs headersOnly {
+  dontBuild = true;
+  installPhase = "make install-headers";
+})
diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix
index 294a1548582..a2e1081a1e8 100644
--- a/pkgs/os-specific/gnu/libpthread/default.nix
+++ b/pkgs/os-specific/gnu/libpthread/default.nix
@@ -55,8 +55,6 @@ stdenv.mkDerivation ({
 
 (if cross != null
  then {
-   crossConfig = cross.config;
-
    # Tell gcc where to find `crt1.o' et al.  This is specified in two
    # different ways: one for gcc as run from `configure', and one for linking
    # libpthread.so (by default `libtool --mode=link' swallows `-B', hence
-- 
GitLab


From 669f9453dc94c5ab24a425536b98c7f4d5cce359 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 15 May 2018 03:28:39 +0200
Subject: [PATCH 0718/1085] haskellPackages.hnix: jailbreak & fix tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some of the new tests need the `nix` executable on `PATH`.
One also needs `hpack`, but we really don’t want to embiggen (heh) the closure
because of that.
---
 .../haskell-modules/configuration-common.nix      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c18c69f9a44..8278b4bdc5e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -208,6 +208,9 @@ self: super: {
   # https://github.com/jputcu/serialport/issues/25
   serialport = dontCheck super.serialport;
 
+  serialise = dontCheck super.serialise;
+  cryptohash-sha512 = dontCheck super.cryptohash-sha512;
+
   # https://github.com/kazu-yamamoto/simple-sendfile/issues/17
   simple-sendfile = dontCheck super.simple-sendfile;
 
@@ -247,7 +250,17 @@ self: super: {
   digit = doJailbreak super.digit;
 
   # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat
-  hnix = doJailbreak super.hnix;
+  hnix = doJailbreak (overrideCabal super.hnix (old: {
+    patches = old.patches or [] ++ [
+      # should land in hnix-5.2
+      (pkgs.fetchpatch {
+        url = "https://github.com/haskell-nix/hnix/commit/9cfe060a9dbe9e7c64867956a0523eed9661803a.patch";
+        sha256 = "0ci4n7nw2pzqw0gkmkp4szzvxjyb143a4znjm39jmb0s397a68sh";
+        name = "disable-hpack-test-by-default.patch";
+       })
+    ];
+    testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ];
+  }));
 
   # Fails for non-obvious reasons while attempting to use doctest.
   search = dontCheck super.search;
-- 
GitLab


From 29b62e07d66c6ee14c8b9a3428e413fc4dc1c223 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 14 May 2018 22:28:37 -0400
Subject: [PATCH 0719/1085] pam: Remove crossAttrs

It turns out none of this stuff is needed. The docs aren't evenly built
properly anyways so the build trivially succeeds either way, due to what
looks like upstream misunderstanding automake. If I try to build the
docs manually in a cross shell (before and after this change), there's a
make rule error such that some HTML files aren't even attempted to be
built and then a copy fails.

Even if this was all fixed, these been a good number of cross fixes
upstream getting them to use CC_FOR_BUILD and other good stuff, so I
doubt such hacks would be needed.

Progress towards #40531 and #33302.
---
 pkgs/os-specific/linux/pam/default.nix | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 5f92dfcc839..e2d34abb70c 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -33,21 +33,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  crossAttrs = {
-    propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ];
-    preConfigure = preConfigure + ''
-      $crossConfig-ar x ${flex.crossDrv}/lib/libfl.a
-      mv libyywrap.o libyywrap-target.o
-      ar x ${flex}/lib/libfl.a
-      mv libyywrap.o libyywrap-host.o
-      export LDFLAGS="$LDFLAGS $PWD/libyywrap-target.o"
-      sed -e 's/@CC@/gcc/' -i doc/specs/Makefile.in
-    '';
-    postConfigure = ''
-      sed -e "s@ $PWD/libyywrap-target.o@ $PWD/libyywrap-host.o@" -i doc/specs/Makefile
-    '';
-  };
-
   postInstall = ''
     mv -v $out/sbin/unix_chkpwd{,.orig}
     ln -sv /run/wrappers/bin/unix_chkpwd $out/sbin/unix_chkpwd
-- 
GitLab


From dd7f08a1a6440a157f82db4d91f67aa657d29879 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 12 May 2018 02:45:22 -0700
Subject: [PATCH 0720/1085] ffmpeg-full: 3.4.2 -> 4.0

init local package nv-codec-headers, which are external nvidia headers,
now used when nvenc is enabled
---
 .../libraries/ffmpeg-full/default.nix         | 20 ++++++++---------
 .../ffmpeg-full/nv-codec-headers.nix          | 22 +++++++++++++++++++
 pkgs/development/libraries/ffmpeg/4.0.nix     | 12 ++++++++++
 3 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix
 create mode 100644 pkgs/development/libraries/ffmpeg/4.0.nix

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index d2ef075beee..6bf7d0f68f8 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -25,7 +25,6 @@
 , ffmpegProgram ? true # Build ffmpeg executable
 , ffplayProgram ? true # Build ffplay executable
 , ffprobeProgram ? true # Build ffprobe executable
-, ffserverProgram ? true # Build ffserver executable
 , qtFaststartProgram ? true # Build qt-faststart executable
 /*
  *  Library options
@@ -98,13 +97,14 @@
 , libXv ? null # Xlib support
 , lzma ? null # xz-utils
 , nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support
+, callPackage # needed for NVENC to access external ffmpeg nvidia headers
 , openal ? null # OpenAL 1.1 capture support
 #, opencl ? null # OpenCL code
 , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
 #, opencv ? null # Video filtering
 , openglExtlib ? false, libGLU_combined ? null # OpenGL rendering
 #, openh264 ? null # H.264/AVC encoder
-, openjpeg_1 ? null # JPEG 2000 de/encoder
+, openjpeg ? null # JPEG 2000 de/encoder
 , opensslExtlib ? false, openssl ? null
 , libpulseaudio ? null # Pulseaudio input support
 , rtmpdump ? null # RTMP[E] support
@@ -159,7 +159,7 @@
  *   utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
  *
  * Need fixes to support Darwin:
- *   frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1,
+ *   frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg,
  *   pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs
  *
  * Not supported:
@@ -176,6 +176,8 @@
 let
   inherit (stdenv) isCygwin isFreeBSD isLinux;
   inherit (stdenv.lib) optional optionals optionalString enableFeature;
+
+  nv-codec-headers = callPackage ./nv-codec-headers.nix { };
 in
 
 /*
@@ -201,7 +203,6 @@ assert ffplayProgram -> avcodecLibrary
                      && swresampleLibrary
                      && SDL2 != null;
 assert ffprobeProgram -> avcodecLibrary && avformatLibrary;
-assert ffserverProgram -> avformatLibrary;
 /*
  *  Library dependencies
  */
@@ -231,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-full-${version}";
-  version = "3.4.2";
+  version = "4.0";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
-    sha256 = "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib";
+    sha256 = "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d";
   };
 
   prePatch = ''
@@ -286,7 +287,6 @@ stdenv.mkDerivation rec {
     (enableFeature ffmpegProgram "ffmpeg")
     (enableFeature ffplayProgram "ffplay")
     (enableFeature ffprobeProgram "ffprobe")
-    (enableFeature ffserverProgram "ffserver")
     /*
      *  Library flags
      */
@@ -365,7 +365,7 @@ stdenv.mkDerivation rec {
     #(enableFeature (opencv != null) "libopencv")
     (enableFeature openglExtlib "opengl")
     #(enableFeature (openh264 != null) "openh264")
-    (enableFeature (openjpeg_1 != null) "libopenjpeg")
+    (enableFeature (openjpeg != null) "libopenjpeg")
     (enableFeature (opensslExtlib && gplLicensing) "openssl")
     (enableFeature (libpulseaudio != null) "libpulse")
     #(enableFeature quvi "libquvi")
@@ -404,14 +404,14 @@ stdenv.mkDerivation rec {
     bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
     libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
     libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
-    libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr
+    libxcb libXv lzma openal openjpeg libpulseaudio rtmpdump opencore-amr
     samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore
     zeromq4 zlib
   ] ++ optional openglExtlib libGLU_combined
     ++ optionals nonfreeLicensing [ fdk_aac openssl ]
     ++ optional ((isLinux || isFreeBSD) && libva != null) libva
     ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
-    ++ optionals nvenc [ nvidia-video-sdk ]
+    ++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ]
     ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
                                    MediaToolbox VideoDecodeAcceleration
                                    libiconv ];
diff --git a/pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix b/pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix
new file mode 100644
index 00000000000..03599c91bf0
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "nv-codec-headers-${version}";
+  version = "n8.1.24.2";
+
+  src = fetchgit {
+    url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";
+    rev = "${version}";
+    sha256 = "122i3f6whiz5yp44dhk73ifr1973z8vvfbg4216vb782bl8b5bam";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    description = "ffmpeg nvidia headers for NVENC";
+    homepage = http://ffmpeg.org/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [ stdenv.lib.maintainers.MP2E ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/ffmpeg/4.0.nix b/pkgs/development/libraries/ffmpeg/4.0.nix
new file mode 100644
index 00000000000..a6e67052cd0
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/4.0.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, fetchpatch
+# Darwin frameworks
+, Cocoa, CoreMedia
+, ...
+}@args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}";
+  branch = "4.0";
+  sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii";
+  darwinFrameworks = [ Cocoa CoreMedia ];
+})
-- 
GitLab


From 0e6fb50954bda292bc5108307ffe06c733815dca Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 14 May 2018 21:06:39 -0700
Subject: [PATCH 0721/1085] ffmpeg: remove redundant nix expr from last commit

accidentally brought in from old local changes
---
 pkgs/development/libraries/ffmpeg/4.0.nix | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 pkgs/development/libraries/ffmpeg/4.0.nix

diff --git a/pkgs/development/libraries/ffmpeg/4.0.nix b/pkgs/development/libraries/ffmpeg/4.0.nix
deleted file mode 100644
index a6e67052cd0..00000000000
--- a/pkgs/development/libraries/ffmpeg/4.0.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, callPackage, fetchpatch
-# Darwin frameworks
-, Cocoa, CoreMedia
-, ...
-}@args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}";
-  branch = "4.0";
-  sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii";
-  darwinFrameworks = [ Cocoa CoreMedia ];
-})
-- 
GitLab


From 89a5e6db55e45994fa343ec91586065ce929b831 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Tue, 15 May 2018 14:30:37 +0900
Subject: [PATCH 0722/1085] rPackages.JuniperKernel: fix non-Darwin build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 451fc1dc6fe..cbaea0f0d85 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -757,7 +757,7 @@ let
     });
 
     JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: {
-      postPatch = ''
+      postPatch = lib.optionalString stdenv.isDarwin ''
         for file in {R,src}/*.R; do
             sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file
         done
-- 
GitLab


From e0a42d991cd30d3ebbc592dda34de2260b843773 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 31 Dec 2017 05:10:15 +0100
Subject: [PATCH 0723/1085] nixos/flatpak: init

---
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/services/desktops/flatpak.nix | 28 +++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 nixos/modules/services/desktops/flatpak.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6c4326046ef..428e2e434f3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -214,6 +214,7 @@
   ./services/desktops/accountsservice.nix
   ./services/desktops/dleyna-renderer.nix
   ./services/desktops/dleyna-server.nix
+  ./services/desktops/flatpak.nix
   ./services/desktops/geoclue2.nix
   ./services/desktops/pipewire.nix
   ./services/desktops/gnome3/at-spi2-core.nix
diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix
new file mode 100644
index 00000000000..d191eeff990
--- /dev/null
+++ b/nixos/modules/services/desktops/flatpak.nix
@@ -0,0 +1,28 @@
+# flatpak service.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  ###### interface
+  options = {
+    services.flatpak = {
+      enable = mkEnableOption "flatpak";
+    };
+  };
+
+
+  ###### implementation
+  config = mkIf config.services.flatpak.enable {
+    environment.systemPackages = [ pkgs.flatpak ];
+
+    services.dbus.packages = [ pkgs.flatpak ];
+
+    systemd.packages = [ pkgs.flatpak ];
+
+    environment.variables.PATH = [
+      "$HOME/.local/share/flatpak/exports/bin"
+      "/var/lib/flatpak/exports/bin"
+    ];
+  };
+}
-- 
GitLab


From 17dd7bcd89d568596f52356624be82201ea84779 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 3 Jan 2018 11:57:29 +0100
Subject: [PATCH 0724/1085] nixos/systemd-lib: fix conflict with dbus.service.d
 directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a package contains a directory in one of the systemd directories
(like flatpak does), it is symlinked into the *-units derivation.
Then later, the derivation will try to create the directory, which
will fail:

mkdir: cannot create directory '/nix/store/…-user-units/dbus.service.d': File exists
builder for '/nix/store/…-user-units.drv' failed with exit code 1

Closes: #33233
---
 nixos/modules/system/boot/systemd-lib.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index 7c01f8ea9b7..ae9ee8811f7 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -2,9 +2,10 @@
 
 with lib;
 
-let cfg = config.systemd; in
-
-rec {
+let
+  cfg = config.systemd;
+  lndir = "${pkgs.xorg.lndir}/bin/lndir";
+in rec {
 
   shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);
 
@@ -136,7 +137,13 @@ rec {
       for i in ${toString cfg.packages}; do
         for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do
           if ! [[ "$fn" =~ .wants$ ]]; then
-            ln -s $fn $out/
+            if [[ -d "$fn" ]]; then
+              targetDir="$out/$(basename "$fn")"
+              mkdir -p "$targetDir"
+              ${lndir} "$fn" "$targetDir"
+            else
+              ln -s $fn $out/
+            fi
           fi
         done
       done
@@ -151,7 +158,7 @@ rec {
           if [ "$(readlink -f $i/$fn)" = /dev/null ]; then
             ln -sfn /dev/null $out/$fn
           else
-            mkdir $out/$fn.d
+            mkdir -p $out/$fn.d
             ln -s $i/$fn $out/$fn.d/overrides.conf
           fi
        else
-- 
GitLab


From 2fc8b832829b9df30846042dde7a8a24aa79d415 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 3 Jan 2018 12:57:37 +0100
Subject: [PATCH 0725/1085] gnome3.gnome-software: build with flatpak support

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 21a1e1a1c4c..2d5080841a4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
-, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection
+, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection, flatpak
 , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
@@ -27,11 +27,10 @@ stdenv.mkDerivation rec {
     gnome3.gtk glib packagekit appstream-glib libsoup
     gnome3.gsettings-desktop-schemas gnome3.gnome-desktop
     gspell json-glib libsecret ostree
-    polkit
+    polkit flatpak
   ];
 
   mesonFlags = [
-    "-Denable-flatpak=false"
     "-Denable-rpm=false"
     "-Denable-fwupd=false"
     "-Denable-oauth=false"
-- 
GitLab


From 843bc0f73a648426b2206cda88c5bf49563c3990 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Feb 2018 01:53:39 +0100
Subject: [PATCH 0726/1085] flatpak-builder: init add 0.10.10

---
 .../tools/flatpak-builder/default.nix         | 103 ++++++++++++++++
 .../tools/flatpak-builder/fix-paths.patch     | 116 ++++++++++++++++++
 .../respect-xml-catalog-files-var.patch       |  13 ++
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 234 insertions(+)
 create mode 100644 pkgs/development/tools/flatpak-builder/default.nix
 create mode 100644 pkgs/development/tools/flatpak-builder/fix-paths.patch
 create mode 100644 pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch

diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
new file mode 100644
index 00000000000..351ec2c77db
--- /dev/null
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -0,0 +1,103 @@
+{ stdenv
+, fetchurl
+, substituteAll
+
+, autoreconfHook
+, docbook_xml_dtd_412
+, docbook_xml_dtd_42
+, docbook_xml_dtd_43
+, docbook_xsl
+, gettext
+, libxml2
+, libxslt
+, pkgconfig
+, xmlto
+
+, acl
+, bazaar
+, binutils
+, bzip2
+, coreutils
+, cpio
+, elfutils
+, flatpak
+, gitMinimal
+, glib
+, gnutar
+, json_glib
+, libcap
+, libdwarf
+, libsoup
+, ostree
+, patch
+, rpm
+, unzip
+}:
+
+let
+  version = "0.10.10";
+in stdenv.mkDerivation rec {
+  name = "flatpak-builder-${version}";
+
+  outputs = [ "out" "doc" "man" ];
+
+  src = fetchurl {
+    url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
+    sha256 = "0b0c2rmf2vj596600blbhsiv2dg7qwpr33lgdcn0bnqc4ddri6f2";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    docbook_xml_dtd_412
+    docbook_xml_dtd_42
+    docbook_xml_dtd_43
+    docbook_xsl
+    gettext
+    libxml2
+    libxslt
+    pkgconfig
+    xmlto
+  ];
+
+  buildInputs = [
+    acl
+    bzip2
+    elfutils
+    flatpak
+    glib
+    json_glib
+    libcap
+    libdwarf
+    libsoup
+    libxml2
+    ostree
+  ];
+
+  patches = [
+    # patch taken from gtk_doc
+    ./respect-xml-catalog-files-var.patch
+    (substituteAll {
+      src = ./fix-paths.patch;
+      bzr = "${bazaar}/bin/bzr";
+      cp = "${coreutils}/bin/cp";
+      patch = "${patch}/bin/patch";
+      tar = "${gnutar}/bin/tar";
+      unzip = "${unzip}/bin/unzip";
+      rpm2cpio = "${rpm}/bin/rpm2cpio";
+      cpio = "${cpio}/bin/cpio";
+      git = "${gitMinimal}/bin/git";
+      rofilesfuse = "${ostree}/bin/rofiles-fuse";
+      strip = "${binutils}/bin/strip";
+      eustrip = "${elfutils}/bin/eu-strip";
+      euelfcompress = "${elfutils}/bin/eu-elfcompress";
+    })
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Tool to build flatpaks from source";
+    homepage = https://flatpak.org/;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/flatpak-builder/fix-paths.patch b/pkgs/development/tools/flatpak-builder/fix-paths.patch
new file mode 100644
index 00000000000..001ddd64568
--- /dev/null
+++ b/pkgs/development/tools/flatpak-builder/fix-paths.patch
@@ -0,0 +1,116 @@
+--- a/src/builder-context.c
++++ b/src/builder-context.c
+@@ -711,7 +711,7 @@
+   g_autoptr(GFile) rofiles_base = NULL;
+   g_autoptr(GFile) rofiles_dir = NULL;
+   g_autofree char *tmpdir_name = NULL;
+-  char *argv[] = { "rofiles-fuse",
++  char *argv[] = { "@rofilesfuse@",
+                    "-o",
+                    "kernel_cache,entry_timeout=60,attr_timeout=60,splice_write,splice_move",
+                    (char *)flatpak_file_get_path_cached (self->app_dir),
+--- a/src/builder-git.c
++++ b/src/builder-git.c
+@@ -44,7 +44,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (dir, output, flags, error, "git", ap);
++  res = flatpak_spawn (dir, output, flags, error, "@git@", ap);
+   va_end (ap);
+ 
+   return res;
+@@ -58,7 +58,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (NULL, NULL, 0, error, "cp", ap);
++  res = flatpak_spawn (NULL, NULL, 0, error, "@cp@", ap);
+   va_end (ap);
+ 
+   return res;
+--- a/src/builder-source-archive.c
++++ b/src/builder-source-archive.c
+@@ -401,7 +401,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (dir, NULL, 0, error, "tar", ap);
++  res = flatpak_spawn (dir, NULL, 0, error, "@tar@", ap);
+   va_end (ap);
+ 
+   return res;
+@@ -416,7 +416,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (dir, NULL, 0, error, "unzip", ap);
++  res = flatpak_spawn (dir, NULL, 0, error, "@unzip@", ap);
+   va_end (ap);
+ 
+   return res;
+@@ -428,7 +428,7 @@
+        GError **error)
+ {
+   gboolean res;
+-  const gchar *argv[] = { "sh", "-c", "rpm2cpio \"$1\" | cpio -i -d",
++  const gchar *argv[] = { "sh", "-c", "@rpm2cpio@ \"$1\" | @cpio@ -i -d",
+       "sh", /* shell's $0 */
+       rpm_path, /* shell's $1 */
+       NULL };
+--- a/src/builder-source-bzr.c
++++ b/src/builder-source-bzr.c
+@@ -124,7 +124,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (dir, output, 0, error, "bzr", ap);
++  res = flatpak_spawn (dir, output, 0, error, "@bzr@", ap);
+   va_end (ap);
+ 
+   return res;
+--- a/src/builder-source-patch.c
++++ b/src/builder-source-patch.c
+@@ -204,11 +204,11 @@
+ 
+   args = g_ptr_array_new ();
+   if (use_git) {
+-    g_ptr_array_add (args, "git");
++    g_ptr_array_add (args, "@git@");
+     g_ptr_array_add (args, "apply");
+     g_ptr_array_add (args, "-v");
+   } else {
+-    g_ptr_array_add (args, "patch");
++    g_ptr_array_add (args, "@patch@");
+   }
+   for (i = 0; extra_options != NULL && extra_options[i] != NULL; i++)
+     g_ptr_array_add (args, (gchar *) extra_options[i]);
+--- a/src/builder-utils.c
++++ b/src/builder-utils.c
+@@ -139,7 +139,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (NULL, NULL, 0, error, "strip", ap);
++  res = flatpak_spawn (NULL, NULL, 0, error, "@strip@", ap);
+   va_end (ap);
+ 
+   return res;
+@@ -153,7 +153,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (NULL, NULL, 0, error, "eu-strip", ap);
++  res = flatpak_spawn (NULL, NULL, 0, error, "@eustrip@", ap);
+   va_end (ap);
+ 
+   return res;
+@@ -167,7 +167,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (NULL, NULL, 0, error, "eu-elfcompress", ap);
++  res = flatpak_spawn (NULL, NULL, 0, error, "@euelfcompress@", ap);
+   va_end (ap);
+ 
+   return res;
diff --git a/pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch b/pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch
new file mode 100644
index 00000000000..0e259aebd8a
--- /dev/null
+++ b/pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch
@@ -0,0 +1,13 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -40,8 +40,8 @@
+ [
+   AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+   AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+-  if $jh_found_xmlcatalog && \
+-     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
++  # empty argument forces libxml to use XML_CATALOG_FILES variable
++  if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
+     AC_MSG_RESULT([found])
+     ifelse([$3],,,[$3
+ ])dnl
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51ac4297091..6bde66daf96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2299,6 +2299,8 @@ with pkgs;
 
   flatpak = callPackage ../development/libraries/flatpak { };
 
+  flatpak-builder = callPackage ../development/tools/flatpak-builder { };
+
   figlet = callPackage ../tools/misc/figlet { };
 
   file = callPackage ../tools/misc/file { };
-- 
GitLab


From ec80c5e4c48df8264e5e230bb81eb55e045382dc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Feb 2018 02:09:51 +0100
Subject: [PATCH 0727/1085] nixos/flatpak: allow specifying extra portals

---
 nixos/modules/services/desktops/flatpak.nix   | 35 +++++++--
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../libraries/xdg-desktop-portal/default.nix  |  4 +
 .../respect-path-env-var.patch                | 76 +++++++++++++++++++
 4 files changed, 108 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch

diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix
index d191eeff990..23480e65267 100644
--- a/nixos/modules/services/desktops/flatpak.nix
+++ b/nixos/modules/services/desktops/flatpak.nix
@@ -3,26 +3,45 @@
 
 with lib;
 
-{
+let
+  cfg = config.services.flatpak;
+in {
   ###### interface
   options = {
     services.flatpak = {
       enable = mkEnableOption "flatpak";
+
+      extraPortals = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        description = ''
+          List of additional portals to add to path. Portals allow interaction
+          with system, like choosing files or taking screenshots. At minimum,
+          a desktop portal implementation should be listed. GNOME already
+          adds <package>xdg-desktop-portal-gtk</package>; for KDE, there
+          is <package>xdg-desktop-portal-kde</package>. Other desktop
+          environments will probably want to do the same.
+        '';
+      };
     };
   };
 
 
   ###### implementation
-  config = mkIf config.services.flatpak.enable {
+  config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.flatpak ];
 
-    services.dbus.packages = [ pkgs.flatpak ];
+    services.dbus.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;
+
+    systemd.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;
 
-    systemd.packages = [ pkgs.flatpak ];
+    environment.variables = {
+      PATH = [
+        "$HOME/.local/share/flatpak/exports/bin"
+        "/var/lib/flatpak/exports/bin"
+      ];
 
-    environment.variables.PATH = [
-      "$HOME/.local/share/flatpak/exports/bin"
-      "/var/lib/flatpak/exports/bin"
-    ];
+      XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals;
+    };
   };
 }
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 10e8ef0ed38..27b62df7097 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -120,6 +120,7 @@ in {
     services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
     services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ];
     systemd.packages = [ pkgs.gnome3.vino ];
+    services.flatpak.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
 
     # If gnome3 is installed, build vim for gtk3 too.
     nixpkgs.config.vim.gui = "gtk3";
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 6721d5f00ac..98bd8ba23bb 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -14,6 +14,10 @@ in stdenv.mkDerivation rec {
     sha256 = "06gipd51snvlp2jp68v2c8rwbsv36kjzg9xacm81n1w4b2dpz4g0";
   };
 
+  patches = [
+    ./respect-path-env-var.patch
+  ];
+
   nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 ];
   buildInputs = [ glib pipewire fuse ];
 
diff --git a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch b/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch
new file mode 100644
index 00000000000..f884899ecd1
--- /dev/null
+++ b/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch
@@ -0,0 +1,76 @@
+--- a/src/xdg-desktop-portal.c
++++ b/src/xdg-desktop-portal.c
+@@ -177,38 +177,50 @@
+ static void
+ load_installed_portals (void)
+ {
+-  const char *portal_dir = PKGDATADIR "/portals";
+-  g_autoptr(GFile) dir = g_file_new_for_path (portal_dir);
+-  g_autoptr(GFileEnumerator) enumerator = NULL;
+ 
+-  enumerator = g_file_enumerate_children (dir, "*", G_FILE_QUERY_INFO_NONE, NULL, NULL);
++  g_auto(GStrv) portal_dir_list;
++  int i;
++  const char *portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_PATH");
++
++  if (portal_dir == NULL)
++    portal_dir = PKGDATADIR "/portals";
+ 
+-  if (enumerator == NULL)
+-    return;
++  portal_dir_list = g_strsplit (portal_dir, G_SEARCHPATH_SEPARATOR_S, 0);
+ 
+-  while (TRUE)
++  for (i = 0; portal_dir_list[i] != NULL; i++)
+     {
+-      g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL);
+-      g_autoptr(GFile) child = NULL;
+-      g_autofree char *path = NULL;
+-      const char *name;
+-      g_autoptr(GError) error = NULL;
++      portal_dir = portal_dir_list[i];
++      g_autoptr(GFile) dir = g_file_new_for_path (portal_dir);
++      g_autoptr(GFileEnumerator) enumerator = NULL;
++      enumerator = g_file_enumerate_children (dir, "*", G_FILE_QUERY_INFO_NONE, NULL, NULL);
+ 
+-      if (info == NULL)
+-        break;
++      if (enumerator == NULL)
++        continue;
+ 
+-      name = g_file_info_get_name (info);
++      while (TRUE)
++        {
++          g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL);
++          g_autoptr(GFile) child = NULL;
++          g_autofree char *path = NULL;
++          const char *name;
++          g_autoptr(GError) error = NULL;
+ 
+-      if (!g_str_has_suffix (name, ".portal"))
+-        continue;
++          if (info == NULL)
++            break;
+ 
+-      child = g_file_enumerator_get_child (enumerator, info);
+-      path = g_file_get_path (child);
++          name = g_file_info_get_name (info);
+ 
+-      if (!register_portal (path, &error))
+-        {
+-          g_warning ("Error loading %s: %s", path, error->message);
+-          continue;
++          if (!g_str_has_suffix (name, ".portal"))
++            continue;
++
++          child = g_file_enumerator_get_child (enumerator, info);
++          path = g_file_get_path (child);
++
++          if (!register_portal (path, &error))
++            {
++              g_warning ("Error loading %s: %s", path, error->message);
++              continue;
++            }
+         }
+     }
+ 
-- 
GitLab


From 91365cd23abc28395b78b53d67b280f5b159a906 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 15 May 2018 14:10:29 +0200
Subject: [PATCH 0728/1085] nexus: fix setup and nixos test (#40522)

The original `nexus` derivation required `/run/sonatype-work/nexus3`
which explicitly depended on the NixOS path structure.

This would break `nexus` for everyone using `nixpkgs` on a non-NixOS
system, additionally the module never created `/run/sonatype-work`, so
the systemd unit created in `services.nexus` fails as well. The issue
wasn't actively known as the `nixos/nexus` test wasn't registered in
Hydra (see #40257).

This patch contains the following changes:

* Adds `tests.nexus` to `release.nix` to run the test on Hydra.

* Makes JVM parameters configurable: by default all JVM options were located
  in `result/bin/nexus.vmoptions` which made it quite hard to patch
  these parameters. Now it's possible to override all parameters by
  running `VM_OPTS_FILE=custom-nexus.vmoptions ./result/bin/nexus run`
  (after patching the `nexus` shell script), additionally it's possible
  to override these parameters with `services.nexus.vmoptions`.

* Bumped Nexus from 3.5.1 to 3.11.0

* Run the `nexus` test on Hydra with `callTest` in `nixos/release.nix`,
  furthermore the test checks if the UI is available on the specified
  port.

* Added myself as maintainer for the NixOS test and the package to have
  some more people in case of further breakage.

* Added sufficient disk space to the `nexus` test, otherwise the service
  fails with the following errors:

  ```
  com.orientechnologies.orient.core.exception.ODatabaseException: Cannot create database 'accesslog'
  com.orientechnologies.orient.core.exception.OLowDiskSpaceException: Error occurred while executing
    a write operation to database 'accesslog' due to limited free space on the disk (242 MB). The database
    is now working in read-only mode. Please close the database (or stop OrientDB), make room on your hard
    drive and then reopen the database. The minimal required space is 256 MB. Required space is now set to
    256MB (you can change it by setting parameter storage.diskCache.diskFreeSpaceLimit) .
  ```

/cc @ironpinguin @xeji
---
 nixos/modules/services/web-apps/nexus.nix     | 40 ++++++++++++++++---
 nixos/release.nix                             |  1 +
 nixos/tests/nexus.nix                         | 16 ++++----
 .../repository-managers/nexus/default.nix     | 16 ++++----
 .../nexus/nexus-vm-opts.patch                 | 14 +++++++
 5 files changed, 63 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch

diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix
index f6a5ce73a12..d5bd0f12feb 100644
--- a/nixos/modules/services/web-apps/nexus.nix
+++ b/nixos/modules/services/web-apps/nexus.nix
@@ -42,6 +42,34 @@ in
         default = 8081;
         description = "Port to listen on.";
       };
+
+      jvmOpts = mkOption {
+        type = types.lines;
+        default = ''
+          -Xms1200M
+          -Xmx1200M
+          -XX:MaxDirectMemorySize=2G
+          -XX:+UnlockDiagnosticVMOptions
+          -XX:+UnsyncloadClass
+          -XX:+LogVMOutput
+          -XX:LogFile=${cfg.home}/nexus3/log/jvm.log
+          -XX:-OmitStackTraceInFastThrow
+          -Djava.net.preferIPv4Stack=true
+          -Dkaraf.home=${pkgs.nexus}
+          -Dkaraf.base=${pkgs.nexus}
+          -Dkaraf.etc=${pkgs.nexus}/etc/karaf
+          -Djava.util.logging.config.file=${pkgs.nexus}/etc/karaf/java.util.logging.properties
+          -Dkaraf.data=${cfg.home}/nexus3
+          -Djava.io.tmpdir=${cfg.home}/nexus3/tmp
+          -Dkaraf.startLocalConsole=false
+        '';
+
+        description = ''
+          Options for the JVM written to `nexus.jvmopts`.
+          Please refer to the docs (https://help.sonatype.com/repomanager3/installation/configuring-the-runtime-environment)
+          for further information.
+        '';
+      };
     };
   };
 
@@ -63,13 +91,13 @@ in
       environment = {
         NEXUS_USER = cfg.user;
         NEXUS_HOME = cfg.home;
+
+        VM_OPTS_FILE = pkgs.writeText "nexus.vmoptions" cfg.jvmOpts;
       };
 
       preStart = ''
         mkdir -p ${cfg.home}/nexus3/etc
 
-        ln -sf ${cfg.home} /run/sonatype-work
-
         chown -R ${cfg.user}:${cfg.group} ${cfg.home}
 
         if [ ! -f ${cfg.home}/nexus3/etc/nexus.properties ]; then
@@ -77,10 +105,10 @@ in
           echo "application-port=${toString cfg.listenPort}" >> ${cfg.home}/nexus3/etc/nexus.properties
           echo "application-host=${toString cfg.listenAddress}" >> ${cfg.home}/nexus3/etc/nexus.properties
         else
-          sed 's/^application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties 
-          sed 's/^# application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties 
-          sed 's/^application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties 
-          sed 's/^# application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties 
+          sed 's/^application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties
+          sed 's/^# application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties
+          sed 's/^application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties
+          sed 's/^# application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties
         fi
       '';
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 7ec41af4fd4..365f93b731e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -346,6 +346,7 @@ in rec {
   tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };
   # TODO: put in networking.nix after the test becomes more complete
   tests.networkingProxy = callTest tests/networking-proxy.nix {};
+  tests.nexus = callTest tests/nexus.nix { };
   tests.nfs3 = callTest tests/nfs.nix { version = 3; };
   tests.nfs4 = callTest tests/nfs.nix { version = 4; };
   tests.nginx = callTest tests/nginx.nix { };
diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix
index 1f19fc0867a..d12d06c2c00 100644
--- a/nixos/tests/nexus.nix
+++ b/nixos/tests/nexus.nix
@@ -1,12 +1,12 @@
 # verifies:
 #   1. nexus service starts on server
-#   2. nexus user can be extended on server
-#   3. nexus service not can startup on server (creating database and all other initial stuff)
+#   2. nexus service can startup on server (creating database and all other initial stuff)
+#   3. the web application is reachable via HTTP
 
 import ./make-test.nix ({ pkgs, ...} : {
   name = "nexus";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ ironpinguin ];
+    maintainers = [ ironpinguin ma27 ];
   };
 
   nodes = {
@@ -14,21 +14,19 @@ import ./make-test.nix ({ pkgs, ...} : {
     server =
       { config, pkgs, ... }:
       { virtualisation.memorySize = 2048;
+        virtualisation.diskSize = 2048;
 
         services.nexus.enable = true;
-
-        users.extraUsers.nexus.extraGroups = [ "users" ];
       };
+
   };
 
   testScript = ''
     startAll;
 
     $server->waitForUnit("nexus");
-
-    print $server->execute("sudo -u nexus groups");
-    $server->mustSucceed("sudo -u nexus groups | grep nexus | grep users");
-
     $server->waitForOpenPort(8081);
+
+    $server->succeed("curl -f 127.0.0.1:8081");
   '';
 })
diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
index 25dba0ac02f..fb7a6007074 100644
--- a/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchurl, makeWrapper, jre, gawk }:
+
 stdenv.mkDerivation rec {
   name = "nexus-${version}";
-  version = "3.5.1-02";
+  version = "3.11.0-01";
 
   src = fetchurl {
     url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-mac.tgz";
-    sha256 = "5ef3512c2bbdd45ef35921c1a0ba109b45bd9dad88311750196aa689262258b6";
+    sha256 = "1h5nfzb1sqhzb5j7w2dpmdi7vnnc9g6zx43a44f3zjvlxh1s0vim";
   };
 
   sourceRoot = name;
 
   nativeBuildInputs = [ makeWrapper ];
 
-  patches = [ ./nexus-bin.patch ];
+  patches = [ ./nexus-bin.patch ./nexus-vm-opts.patch ];
 
   postPatch = ''
     substituteInPlace bin/nexus.vmoptions \
-      --replace ../sonatype-work/nexus3 /run/sonatype-work/nexus3 \
       --replace etc/karaf $out/etc/karaf \
       --replace =. =$out
   '';
@@ -28,14 +28,12 @@ stdenv.mkDerivation rec {
     cp -rfv * .install4j $out
     rm -fv $out/bin/nexus.bat
 
-    runHook postInstall
-  '';
-
-  postInstall = ''
     wrapProgram $out/bin/nexus \
       --set JAVA_HOME ${jre} \
       --set ALTERNATIVE_NAME "nexus" \
       --prefix PATH "${stdenv.lib.makeBinPath [ gawk ]}"
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
@@ -43,6 +41,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.sonatype.org/nexus;
     license = licenses.epl10;
     platforms = platforms.all;
-    maintainers = with maintainers; [ aespinosa ironpinguin ];
+    maintainers = with maintainers; [ aespinosa ironpinguin ma27 ];
   };
 }
diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch b/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch
new file mode 100644
index 00000000000..744b4b96a56
--- /dev/null
+++ b/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch
@@ -0,0 +1,14 @@
+diff --git a/bin/nexus b/bin/nexus
+index e7ed3fb..8db766b 100755
+--- a/bin/nexus
++++ b/bin/nexus
+@@ -440,7 +440,8 @@ add_class_path "$app_home/lib/boot/org.apache.karaf.diagnostic.boot-4.0.9.jar"
+ add_class_path "$app_home/lib/boot/org.apache.karaf.jaas.boot-4.0.9.jar"
+ 
+ vmoptions_val=""
+-read_vmoptions "$prg_dir/$progname.vmoptions"
++VM_OPTS=${VM_OPTS_FILE:-"$prg_dir/$progname.vmoptions"}
++read_vmoptions "$VM_OPTS"
+ INSTALL4J_ADD_VM_PARAMS="$INSTALL4J_ADD_VM_PARAMS $vmoptions_val"
+ 
+ 
-- 
GitLab


From 1c043637140514df1205830e2ac860e57ef7a23a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Feb 2018 17:52:49 +0100
Subject: [PATCH 0729/1085] nixos/flatpak: add test

---
 nixos/release.nix                             |  1 +
 nixos/tests/flatpak.nix                       | 23 +++++
 .../libraries/flatpak/fix-test-paths.patch    | 86 +++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 nixos/tests/flatpak.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index ae70b535a5e..8151d1bac5e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -284,6 +284,7 @@ in rec {
   tests.env = callTest tests/env.nix {};
   tests.ferm = callTest tests/ferm.nix {};
   tests.firefox = callTest tests/firefox.nix {};
+  tests.flatpak = callTest tests/flatpak.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.fwupd = callTest tests/fwupd.nix {};
   #tests.gitlab = callTest tests/gitlab.nix {};
diff --git a/nixos/tests/flatpak.nix b/nixos/tests/flatpak.nix
new file mode 100644
index 00000000000..d1c7cf84314
--- /dev/null
+++ b/nixos/tests/flatpak.nix
@@ -0,0 +1,23 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, ... }:
+
+{
+  name = "flatpak";
+  meta = {
+    maintainers = pkgs.flatpak.meta.maintainers;
+  };
+
+  machine = { config, pkgs, ... }: {
+    imports = [ ./common/x11.nix ];
+    services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work
+    services.flatpak.enable = true;
+    environment.systemPackages = with pkgs; [ gnupg gnome-desktop-testing ostree python2 ];
+    virtualisation.memorySize = 2047;
+    virtualisation.diskSize = 1024;
+  };
+
+  testScript = ''
+    $machine->waitForX();
+    $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.flatpak.installedTests}/share' --timeout 3600");
+  '';
+})
diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch
index e0734009420..a548f388286 100644
--- a/pkgs/development/libraries/flatpak/fix-test-paths.patch
+++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch
@@ -33,6 +33,81 @@
      gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true
      fusermount -u $XDG_RUNTIME_DIR/doc || :
      if test -n "${TEST_SKIP_CLEANUP:-}"; then
+--- a/tests/make-test-runtime.sh
++++ b/tests/make-test-runtime.sh
+@@ -21,6 +21,7 @@
+ cat ${DIR}/metadata
+ 
+ # Add bash and dependencies
++mkdir -p ${DIR}/nix/store
+ mkdir -p ${DIR}/usr/bin
+ mkdir -p ${DIR}/usr/lib
+ ln -s ../lib ${DIR}/usr/lib64
+@@ -30,47 +31,27 @@
+ else
+     cp `which ldconfig` ${DIR}/usr/bin
+ fi
+-T=`mktemp`
+-for i in $@; do
+-    I=`which $i`
+-    cp $I ${DIR}/usr/bin
+-    ldd $I | sed "s/.* => //"  | awk '{ print $1}' | grep ^/ | grep ^/ >> $T
+-    if test $i == python2; then
+-        mkdir -p ${DIR}/usr/lib/python2.7/lib-dynload
+-        # This is a hardcoded minimal set of modules we need in the current tests.
+-        # Pretty hacky stuff. Add modules as needed.
+-        PYDIR=/usr/lib/python2.7
+-        if test -d /usr/lib64/python2.7; then PYDIR=/usr/lib64/python2.7; fi
+-        for py in site os stat posixpath genericpath warnings \
+-                       linecache types UserDict abc _abcoll \
+-                       _weakrefset copy_reg traceback sysconfig \
+-                       re sre_compile sre_parse sre_constants \
+-                       _sysconfigdata ; do
+-            cp ${PYDIR}/$py.py ${DIR}/usr/lib/python2.7
+-        done
+-        # These might not exist, depending how Python was configured; and the
+-        # part after ${so} might be "module" or ".x86_64-linux-gnu" or
+-        # something else
+-        for so in _locale strop ; do
+-            cp ${PYDIR}/lib-dynload/${so}*.so ${DIR}/usr/lib/python2.7/lib-dynload || :
+-        done
+-        for plat in $( cd ${PYDIR} && echo plat-* ); do
+-            test -e ${PYDIR}/${plat} || continue
+-            mkdir -p ${DIR}/usr/lib/python2.7/${plat}
+-            cp ${PYDIR}/${plat}/*.py ${DIR}/usr/lib/python2.7/${plat}/
+-        done
+-    fi
+-done
+ ln -s bash ${DIR}/usr/bin/sh
+-for i in `sort -u $T`; do
+-    cp "$i" ${DIR}/usr/lib/
++for i in $@; do
++    I=$(readlink -f $(which $i))
++    requisites=$(nix-store --query --requisites "$I")
++    for r in $requisites; do
++        # a single store item can be needed by multiple paths, no need to copy it again
++        if [ ! -e ${DIR}/$r ]; then
++            cp -r $r ${DIR}/$r
++        fi
++    done
++    ln -s $I ${DIR}/usr/bin/$i
+ done
+ 
+-# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but
+-# the real en_US locale is often not available, because its in the
+-# local archive.
++mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store
++chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed
++find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths
++find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets
++
++# We copy the whole locale archive because we do not have C.UTF8 locale
+ mkdir -p ${DIR}/usr/lib/locale/
+-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
++cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive
+ 
+ if [ x$COLLECTION_ID != x ]; then
+     collection_args=--collection-id=${COLLECTION_ID}
 --- a/tests/testlibrary.c
 +++ b/tests/testlibrary.c
 @@ -378,7 +378,7 @@
@@ -44,3 +119,14 @@
        g_autofree char *argv_str = g_strjoinv (" ", argv);
        g_test_message ("Spawning %s", argv_str);
        g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error);
+--- a/triggers/gtk-icon-cache.trigger
++++ b/triggers/gtk-icon-cache.trigger
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -d $1/exports/share/icons/hicolor \); then
+-    cp /usr/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/
++    cp @hicolorIconTheme@/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/
+     for dir in $1/exports/share/icons/*; do
+         if test -f $dir/index.theme; then
+             if ! gtk-update-icon-cache --quiet $dir; then
-- 
GitLab


From 21ff482f7d7fa233ebdf553ddc5edf459e7344eb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Feb 2018 06:29:51 +0100
Subject: [PATCH 0730/1085] nixos/xdg-desktop-portal: add test

---
 nixos/release.nix                  |  1 +
 nixos/tests/xdg-desktop-portal.nix | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 nixos/tests/xdg-desktop-portal.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 8151d1bac5e..f8f643f1a5a 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -399,6 +399,7 @@ in rec {
   tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {};
   tests.wordpress = callTest tests/wordpress.nix {};
   tests.xautolock = callTest tests/xautolock.nix {};
+  tests.xdg-desktop-portal = callTest tests/xdg-desktop-portal.nix {};
   tests.xfce = callTest tests/xfce.nix {};
   tests.xmonad = callTest tests/xmonad.nix {};
   tests.xrdp = callTest tests/xrdp.nix {};
diff --git a/nixos/tests/xdg-desktop-portal.nix b/nixos/tests/xdg-desktop-portal.nix
new file mode 100644
index 00000000000..d954b07f73d
--- /dev/null
+++ b/nixos/tests/xdg-desktop-portal.nix
@@ -0,0 +1,17 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, ... }:
+
+{
+  name = "xdg-desktop-portal";
+  meta = {
+    maintainers = pkgs.xdg-desktop-portal.meta.maintainers;
+  };
+
+  machine = { config, pkgs, ... }: {
+    environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
+  };
+
+  testScript = ''
+    $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.xdg-desktop-portal.installedTests}/share'");
+  '';
+})
-- 
GitLab


From d614f32e7ac639fb2e562c1be66d1d84bb3c3ad5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 11 May 2018 06:00:44 +0200
Subject: [PATCH 0731/1085] nixos/flatpak: add docs

---
 nixos/modules/services/desktops/flatpak.nix |  5 ++
 nixos/modules/services/desktops/flatpak.xml | 53 +++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 nixos/modules/services/desktops/flatpak.xml

diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix
index 23480e65267..024dc65629a 100644
--- a/nixos/modules/services/desktops/flatpak.nix
+++ b/nixos/modules/services/desktops/flatpak.nix
@@ -6,6 +6,11 @@ with lib;
 let
   cfg = config.services.flatpak;
 in {
+  meta = {
+    doc = ./flatpak.xml;
+    maintainers = pkgs.flatpak.meta.maintainers;
+  };
+
   ###### interface
   options = {
     services.flatpak = {
diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml
new file mode 100644
index 00000000000..d9c8b711c45
--- /dev/null
+++ b/nixos/modules/services/desktops/flatpak.xml
@@ -0,0 +1,53 @@
+<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-flatpak">
+
+<title>Flatpak</title>
+
+<para><emphasis>Source:</emphasis> <filename>modules/services/desktop/flatpak.nix</filename></para>
+
+<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/flatpak/flatpak/wiki"/></para>
+
+<para>Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux.</para>
+
+<para>
+  To enable Flatpak, add the following to your <filename>configuration.nix</filename>:
+
+  <programlisting>
+  <xref linkend="opt-services.flatpak.enable"/> = true;
+  </programlisting>
+</para>
+
+<para>
+  For the sandboxed apps to work correctly, desktop integration portals need to be installed. If you run GNOME, this will be handled automatically for you; in other cases, you will need to add something like the following to your <filename>configuration.nix</filename>:
+
+  <programlisting>
+  <xref linkend="opt-services.flatpak.extraPortals"/> = [ pkgs.xdg-desktop-portal-gtk ];
+  </programlisting>
+</para>
+
+<para>
+  Then, you will need to add a repository, for example, <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>, either using the following commands:
+
+  <programlisting>
+  flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+  flatpak update
+  </programlisting>
+
+  or by opening the <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository file</link> in GNOME Software.
+</para>
+
+<para>
+  Finally, you can search and install programs:
+
+  <programlisting>
+  flatpak search bustle
+  flatpak install flathub org.freedesktop.Bustle
+  flatpak run org.freedesktop.Bustle
+  </programlisting>
+
+  Again, GNOME Software offers graphical interface for these tasks.
+</para>
+</chapter>
-- 
GitLab


From 9cd3c7a12ee6d131c9ea545c2c75b412b7506673 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 15 May 2018 08:21:25 -0400
Subject: [PATCH 0732/1085] linux-testing: 4.17-rc4 -> 4.17-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 92225670330..691c0d7a0a9 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.17-rc4";
-  modDirVersion = "4.17.0-rc4";
+  version = "4.17-rc5";
+  modDirVersion = "4.17.0-rc5";
   extraMeta.branch = "4.17";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1y34hpzgxblwqslhsfsmzmpv9f3s936r93wgn4kmhkcwsm0in292";
+    sha256 = "1khx3s8nb604h23hasamshcvcwll0j4vi5v6v274ls01ja9mg1xk";
   };
 
   # Should the testing kernels ever be built on Hydra?
-- 
GitLab


From c7e8ddc066ea4d06b979c066fa983f3d1c00d232 Mon Sep 17 00:00:00 2001
From: Yorick <yorickvanpelt@gmail.com>
Date: Tue, 15 May 2018 14:33:29 +0200
Subject: [PATCH 0733/1085] linux: config: remove prefix on KEY_DH_OPERATIONS

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ebb569689b2..ec2b2f38795 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -639,7 +639,7 @@ with stdenv.lib;
   
   # needed for iwd WPS support (wpa_supplicant replacement)
   ${optionalString (versionAtLeast version "4.7") ''
-    CONFIG_KEY_DH_OPERATIONS y
+    KEY_DH_OPERATIONS y
   ''}
 
   # Disable the firmware helper fallback, udev doesn't implement it any more
-- 
GitLab


From a7f79620accdb40282fef1d50d86762a978a8ed7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 15 May 2018 14:47:51 +0200
Subject: [PATCH 0734/1085] nixos: Fix build of the manual

The manual still had a reference to an option that was already renamed
ages ago and a7ed44ccadfcf1bd54d0197fbc87b6c1b0bcef7b made it 'visible'.

With the visible attribute set to false for extraKernelModules, the
option no longer appears in the manual and thus breaks the link from the
manual to the options.

This is easily fixed by referring to boot.initrd.kernelModules instead
of the obsolete option boot.initrd.extraKernelModules.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @rycee, @matthewbauer
---
 nixos/doc/manual/configuration/linux-kernel.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml
index 0990e9d932b..6502aaec83e 100644
--- a/nixos/doc/manual/configuration/linux-kernel.xml
+++ b/nixos/doc/manual/configuration/linux-kernel.xml
@@ -50,9 +50,9 @@ nixpkgs.config.packageOverrides = pkgs:
 <xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];
 </programlisting>
   If the module is required early during the boot (e.g. to mount the root file
-  system), you can use <xref linkend="opt-boot.initrd.extraKernelModules"/>:
+  system), you can use <xref linkend="opt-boot.initrd.kernelModules"/>:
 <programlisting>
-<xref linkend="opt-boot.initrd.extraKernelModules"/> = [ "cifs" ];
+<xref linkend="opt-boot.initrd.kernelModules"/> = [ "cifs" ];
 </programlisting>
   This causes the specified modules and their dependencies to be added to the
   initial ramdisk.
-- 
GitLab


From 1e0975f4c05959cf11b5a905f335c269dcaae630 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 11 May 2018 17:42:37 +0900
Subject: [PATCH 0735/1085] iproute2: module to create rt_table file & co

When doing source routing/multihoming, it's practical to give names to routing
tables. The absence of the rt_table file in /etc make this impossible.
This patch recreates these files on rebuild so that they can be modified
by the user see NixOS#38638.

iproute2 is modified to look into config.networking.iproute2.confDir instead of
/etc/iproute2.
---
 nixos/modules/config/iproute2.nix          | 23 ++++++++++++++++++++++
 nixos/modules/module-list.nix              |  1 +
 pkgs/os-specific/linux/iproute/default.nix |  5 +++--
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/config/iproute2.nix

diff --git a/nixos/modules/config/iproute2.nix b/nixos/modules/config/iproute2.nix
new file mode 100644
index 00000000000..881ad671a62
--- /dev/null
+++ b/nixos/modules/config/iproute2.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.networking.iproute2;
+  confDir = "/run/iproute2";
+in
+{
+  options.networking.iproute2.enable = mkEnableOption "copy IP route configuration files";
+
+  config = mkMerge [
+    ({ nixpkgs.config.iproute2.confDir = confDir; })
+
+    (mkIf cfg.enable {
+      system.activationScripts.iproute2 = ''
+        cp -R ${pkgs.iproute}/etc/iproute2 ${confDir}
+        chmod -R 664 ${confDir}
+        chmod +x ${confDir}
+      '';
+    })
+  ];
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6c4326046ef..5d390f60667 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -9,6 +9,7 @@
   ./config/fonts/ghostscript.nix
   ./config/gnu.nix
   ./config/i18n.nix
+  ./config/iproute2.nix
   ./config/krb5/default.nix
   ./config/ldap.nix
   ./config/networking.nix
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 7d412d7e15d..8ccb0c20380 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, lib, flex, bash, bison, db, iptables, pkgconfig }:
+{ fetchurl, stdenv, config, lib, flex, bash, bison, db, iptables, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
@@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
     "HDRDIR=$(TMPDIR)/include/iproute2" # Don't install headers
   ];
 
+  # enable iproute2 module if you want this folder to be created
   buildFlags = [
-    "CONFDIR=/etc/iproute2"
+    "CONFDIR=${config.iproute2.confDir or "/run/iproute2"}"
   ];
 
   installFlags = [
-- 
GitLab


From b75a9599b4e858244caa0979f8fa224b5ca36c54 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 15 May 2018 21:55:10 +0900
Subject: [PATCH 0736/1085] release notes: mention iproute2 module

---
 nixos/doc/manual/release-notes/rl-1809.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 01b5e9d7746..34b5435f9d4 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -53,7 +53,10 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
 
   <itemizedlist>
    <listitem>
-    <para></para>
+     <para>When enabled the <literal>iproute2</literal> will copy the files
+       expected by ip route (e.g., <filename>rt_tables</filename>) in
+       <filename>/run/iproute2</filename>. This allows to write aliases for
+       routing tables for instance.</para>
    </listitem>
   </itemizedlist>
  </section>
-- 
GitLab


From ac07f5acf601e4dd44e7f1f6b3f8a03a244d939b Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Tue, 15 May 2018 14:56:43 +0200
Subject: [PATCH 0737/1085] staruml: 2.6.0 -> 2.8.1

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

diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index e1d6604970e..ef3fd53c4ec 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -8,16 +8,16 @@ let
     [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus ];
 in
 stdenv.mkDerivation rec {
-  version = "2.6.0";
+  version = "2.8.1";
   name = "staruml-${version}";
 
   src =
     if stdenv.system == "i686-linux" then fetchurl {
       url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb";
-      sha256 = "684d7ce7827a98af5bf17bf68d18f934fd970f13a2112a121b1f1f76d6387849";
+      sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n";
     } else fetchurl {
       url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-64-bit.deb";
-      sha256 = "36e0bdc1bb57b7d808a007a3fafb1b38662d5b0793424d5ad4f51a3a6a9a636d";
+      sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0";
     };
 
   buildInputs = [ dpkg ];
-- 
GitLab


From 2a21dbe0597ef3f8b5340cc028327378411f0814 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Tue, 15 May 2018 14:57:18 +0200
Subject: [PATCH 0738/1085] staruml: fix internal node binary

The internal node binary is at least used for exporting in various
picture formats and also PDF printing.
---
 pkgs/tools/misc/staruml/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index ef3fd53c4ec..2a06400b411 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, makeWrapper
 , dpkg, patchelf
-, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd }:
+, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd
+, libXdamage }:
 
 let
   inherit (stdenv) lib;
   LD_LIBRARY_PATH = lib.makeLibraryPath
-    [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus ];
+    [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage ];
 in
 stdenv.mkDerivation rec {
   version = "2.8.1";
@@ -34,17 +35,17 @@ stdenv.mkDerivation rec {
     mkdir $out
     mv opt/staruml $out/bin
 
-    ${patchelf}/bin/patchelf \
-      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      $out/bin/StarUML
-
     mkdir -p $out/lib
-
     ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
     ln -s ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0
 
-    wrapProgram $out/bin/StarUML \
-      --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH}
+    for binary in StarUML Brackets-node; do
+      ${patchelf}/bin/patchelf \
+        --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        $out/bin/$binary
+      wrapProgram $out/bin/$binary \
+        --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH}
+    done
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 699fa7e953caf49d8941828ce2c8293a87ce3240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?=
 <arcadio@users.noreply.github.com>
Date: Tue, 15 May 2018 14:09:06 +0100
Subject: [PATCH 0739/1085] star: 2.5.3a -> 2.6.0c (#40518)

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

diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix
index 1642739140d..f52df902db6 100644
--- a/pkgs/applications/science/biology/star/default.nix
+++ b/pkgs/applications/science/biology/star/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "star-${version}";
-  version = "2.5.3a";
+  version = "2.6.0c";
 
   src = fetchFromGitHub {
     repo = "STAR";
     owner = "alexdobin";
     rev = version;
-    sha256 = "1fd9xl7i1zxgsxn2qf6gz8s42g2djm29qmp6qb35d8nnxh8ns54x";
+    sha256 = "04cj6jw8d9q6lk9c78wa4fky6jdlicf1d13plq7182h8vqiz8p59";
   };
 
   sourceRoot = "source/source";
-- 
GitLab


From 56149c246df1b7e846e2ef940c8b236c48de6e77 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Tue, 15 May 2018 17:33:46 +0300
Subject: [PATCH 0740/1085] handbrake: rm dependency on cmake

---
 pkgs/applications/video/handbrake/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 9f1dfb2d6b0..e18901ad88d 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -3,11 +3,9 @@
 # Derivation patches HandBrake to use our closure.
 #
 
-# TODO: Release 1.2.0 would switch LibAV to FFmpeg.
-
 { stdenv, lib, fetchurl,
   python2, pkgconfig, yasm, harfbuzz, zlib,
-  autoconf, automake, cmake, libtool, m4, jansson,
+  autoconf, automake, libtool, m4, jansson,
   libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,
   libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,
   lame, libdvdread, libdvdnav, libbluray,
@@ -21,6 +19,7 @@
 }:
 
 stdenv.mkDerivation rec {
+  # TODO: Release 1.2.0 would switch LibAV to FFmpeg.
   version = "1.1.0";
   name = "handbrake-${version}";
 
@@ -40,7 +39,7 @@ stdenv.mkDerivation rec {
   });
 
   nativeBuildInputs = [
-    cmake python2 pkgconfig yasm autoconf automake libtool m4
+    python2 pkgconfig yasm autoconf automake libtool m4
   ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
 
   buildInputs = [
@@ -55,8 +54,6 @@ stdenv.mkDerivation rec {
   ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ])
   ++ lib.optional useFdk fdk_aac;
 
-  dontUseCmakeConfigure = true;
-
   enableParallelBuilding = true;
 
   preConfigure = ''
-- 
GitLab


From 1eea58eb8ff553588f9c1adee3fa98d54ab865b0 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Tue, 15 May 2018 17:43:25 +0300
Subject: [PATCH 0741/1085] handbrake: platforms: linux -> unix

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

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index e18901ad88d..0d0ac0a2e94 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -100,6 +100,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2;
     maintainers = with maintainers; [ Anton-Latukha wmertens ];
-    platforms = platforms.linux;
+    platforms = with platforms; unix;
   };
 }
-- 
GitLab


From 9f79ac6f3bbbdee1ea006c292a867184f3985c2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 15 May 2018 16:58:37 +0200
Subject: [PATCH 0742/1085] androidndk: Drop 32bit support

---
 pkgs/development/mobile/androidenv/androidndk.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 2fe4005532d..a9908d67f1d 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -6,16 +6,10 @@
 stdenv.mkDerivation rec {
   name = "android-ndk-r10e";
 
-  src = if stdenv.system == "i686-linux"
-    then fetchurl {
-      url = "http://dl.google.com/android/ndk/${name}-linux-x86.bin";
-      sha256 = "1xbxra5v3bm6cmxyx8yyya5r93jh5m064aibgwd396xdm8jpvc4j";
-    }
-    else if stdenv.system == "x86_64-linux" then fetchurl {
+  src = if stdenv.system == "x86_64-linux" then fetchurl {
       url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.bin";
       sha256 = "0nhxixd0mq4ib176ya0hclnlbmhm8f2lab6i611kiwbzyqinfb8h";
-    }
-    else throw "platform ${stdenv.system} not supported!";
+    } else throw "platform ${stdenv.system} not supported!";
 
   phases = "buildPhase";
 
-- 
GitLab


From 13f44694dccd078d8071660a8b81ab4cdff5f1ea Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 13 May 2018 01:13:58 +0000
Subject: [PATCH 0743/1085] uim: 1.8.6 -> 1.8.6-20180501-git, switch to
 fetchFromGitHub

Old version fails to build.
---
 pkgs/tools/inputmethods/uim/data-hook.patch | 41 ++++++------
 pkgs/tools/inputmethods/uim/default.nix     | 74 ++++++++++++++++-----
 2 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/pkgs/tools/inputmethods/uim/data-hook.patch b/pkgs/tools/inputmethods/uim/data-hook.patch
index 07fdf873316..be80962527b 100644
--- a/pkgs/tools/inputmethods/uim/data-hook.patch
+++ b/pkgs/tools/inputmethods/uim/data-hook.patch
@@ -1,6 +1,6 @@
 --- a/gtk2/immodule/Makefile.in	2015-11-24 16:21:08.967087208 +0900
 +++ b/gtk2/immodule/Makefile.in	2015-11-24 16:22:53.316095150 +0900
-@@ -806,7 +806,6 @@
+@@ -928,7 +928,6 @@
  
  install-data-am: install-moduleLTLIBRARIES
  	@$(NORMAL_INSTALL)
@@ -8,19 +8,18 @@
  install-dvi: install-dvi-am
  
  install-dvi-am:
-@@ -861,7 +860,7 @@
- 	ctags distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-data-hook install-dvi install-dvi-am \
-+	install-data-am install-dvi install-dvi-am \
- 	install-exec install-exec-am install-html install-html-am \
- 	install-info install-info-am install-man \
- 	install-moduleLTLIBRARIES install-pdf install-pdf-am \
-
+@@ -993,7 +992,7 @@
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-data-hook install-dvi install-dvi-am install-exec \
++	install-dvi install-dvi-am install-exec \
+ 	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-man install-moduleLTLIBRARIES \
+ 	install-pdf install-pdf-am install-ps install-ps-am \
 --- a/gtk3/immodule/Makefile.in	2015-11-24 16:21:08.971087209 +0900
 +++ b/gtk3/immodule/Makefile.in	2015-11-24 16:23:28.251097832 +0900
-@@ -824,7 +824,6 @@
+@@ -896,7 +896,6 @@
  
  install-data-am: install-moduleLTLIBRARIES
  	@$(NORMAL_INSTALL)
@@ -28,12 +27,12 @@
  install-dvi: install-dvi-am
  
  install-dvi-am:
-@@ -879,7 +878,7 @@
- 	ctags distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-data-hook install-dvi install-dvi-am \
-+	install-data-am install-dvi install-dvi-am \
- 	install-exec install-exec-am install-html install-html-am \
- 	install-info install-info-am install-man \
- 	install-moduleLTLIBRARIES install-pdf install-pdf-am 
+@@ -959,7 +958,7 @@
+ 	cscopelist-am ctags ctags-am distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-data-hook install-dvi \
++	install-data install-data-am install-dvi \
+ 	install-dvi-am install-exec install-exec-am install-html \
+ 	install-html-am install-info install-info-am install-man \
+ 	install-moduleLTLIBRARIES install-pdf install-pdf-am \
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 96b88714178..1bdbef2fde6 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, intltool, pkgconfig, cmake
+{ stdenv, fetchFromGitHub
+, autoconf, automake, intltool, libtool, pkgconfig, cmake
+, ruby, librsvg
 , ncurses, m17n_lib, m17n_db, expat
 , withAnthy ? true, anthy ? null
 , withGtk ? true
@@ -6,6 +8,7 @@
 , withGtk3 ? withGtk, gtk3 ? null
 , withQt ? true
 , withQt4 ? withQt, qt4 ? null
+, withQt5 ? false, qt5 ? null
 , withLibnotify ? true, libnotify ? null
 , withSqlite ? true, sqlite ? null
 , withNetworking ? true, curl ? null, openssl ? null
@@ -17,10 +20,17 @@
 
 with stdenv.lib;
 
-assert withAnthy -> anthy != null;
 assert withGtk2 -> gtk2 != null;
 assert withGtk3 -> gtk3 != null;
-assert withQt4 -> qt4 != null;
+
+# TODO(@oxij): ./configure can't find both qmakes at the same time
+# this can be fixed by adding an alias qmake -> qmaka${version} in qmake derivation
+assert withQt4 -> !withQt5 && qt4 != null;
+assert withQt5 -> !withQt4 && qt5 != null;
+
+assert !withQt5; # fails to build with "Makefile.qmake: No such file or directory"
+
+assert withAnthy -> anthy != null;
 assert withLibnotify -> libnotify != null;
 assert withSqlite -> sqlite != null;
 assert withNetworking -> curl != null && openssl != null;
@@ -28,22 +38,32 @@ assert withFFI -> libffi != null;
 assert withMisc -> libeb != null;
 
 stdenv.mkDerivation rec {
-  version = "1.8.6";
+  version = "1.8.6-20180501-git";
   name = "uim-${version}";
 
+  src = fetchFromGitHub {
+    owner = "uim";
+    repo = "uim";
+    rev = "c79432cb5aba3a67fb7e7557f4817c749865cc8a";
+    fetchSubmodules = true;
+    sha256 = "12rznfwq1mh750i18bl1743c51akyyvy6la5rgrxmrnp0mha9ba5";
+  };
+
+  nativeBuildInputs = [
+    autoconf automake intltool libtool pkgconfig cmake
+
+    ruby # used by sigscheme build to generate function tables
+    librsvg # used by uim build to generate png pixmaps from svg
+  ];
+
   buildInputs = [
-    intltool
-    pkgconfig
-    ncurses
-    cmake
-    m17n_lib
-    m17n_db
-    expat
+    ncurses m17n_lib m17n_db expat
   ]
   ++ optional withAnthy anthy
   ++ optional withGtk2 gtk2
   ++ optional withGtk3 gtk3
   ++ optional withQt4 qt4
+  ++ optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ]
   ++ optional withLibnotify libnotify
   ++ optional withSqlite sqlite
   ++ optionals withNetworking [
@@ -52,9 +72,27 @@ stdenv.mkDerivation rec {
   ++ optional withFFI libffi
   ++ optional withMisc libeb;
 
+  prePatch = ''
+    patchShebangs *.sh */*.sh */*/*.sh
+
+    # configure sigscheme in maintainer mode or else some function tables won't get autogenerated
+    substituteInPlace configure.ac \
+      --replace "--with-master-pkg=uim --enable-conf=uim" \
+                "--enable-maintainer-mode --with-master-pkg=uim --enable-conf=uim"
+
+    # generate ./configure files
+    (cd sigscheme/libgcroots; ./autogen.sh)
+    (cd sigscheme; ./autogen.sh)
+    ./autogen.sh
+  '';
+
   patches = [ ./data-hook.patch ];
 
   configureFlags = [
+    # configure in maintainer mode or else some pixmaps won't get autogenerated
+    # this should imply the above `--enable-maintainer-mode`, but it does not
+    "--enable-maintainer-mode"
+
     "--enable-pref"
     "--with-skk"
     "--with-x"
@@ -68,6 +106,10 @@ stdenv.mkDerivation rec {
     "--with-qt4"
     "--with-qt4-immodule"
   ]
+  ++ optionals withQt5 [
+    "--with-qt5"
+    "--with-qt5-immodule"
+  ]
   ++ optional withLibnotify "--enable-notify=libnotify"
   ++ optional withSqlite "--with-sqlite3"
   ++ optionals withNetworking [
@@ -87,16 +129,12 @@ stdenv.mkDerivation rec {
 
   dontUseCmakeConfigure = true;
 
-  src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/uim/uim-${version}.tar.bz2";
-    sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777";
-  };
-
   meta = with stdenv.lib; {
-    homepage    = "https://github.com/uim/uim";
+    homepage    = src.meta.homepage;
     description = "A multilingual input method framework";
     license     = licenses.bsd3;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
+    broken      = stdenv.hostPlatform.isAarch64; # fails to build libgcroots (not supported on aarch64)
     maintainers = with maintainers; [ ericsagnes oxij ];
   };
 }
-- 
GitLab


From 261d993519842a655a5532093ea840cea3ce51b7 Mon Sep 17 00:00:00 2001
From: Yorick <yorick.vanpelt@serokell.io>
Date: Tue, 15 May 2018 17:34:31 +0200
Subject: [PATCH 0744/1085] module-list: add youtrack module to list

---
 nixos/modules/module-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e6a041b9033..04881d6db36 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -650,6 +650,7 @@
   ./services/web-apps/tt-rss.nix
   ./services/web-apps/selfoss.nix
   ./services/web-apps/quassel-webserver.nix
+  ./services/web-apps/youtrack.nix
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/caddy.nix
   ./services/web-servers/fcgiwrap.nix
-- 
GitLab


From 202f19b225b08919f331444c5f8f37704c0d4d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Tue, 15 May 2018 15:31:28 +0200
Subject: [PATCH 0745/1085] ocamlPackages.conduit-lwt-unix: add SSL support

This makes it possible to run the example given at
https://github.com/mirage/ocaml-cohttp#client-tutorial
---
 pkgs/development/ocaml-modules/conduit/lwt-unix.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
index ce7a33a11ee..5f33bbc42c1 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@@ -1,5 +1,5 @@
 { stdenv, ocaml, findlib, jbuilder, conduit-lwt
-, logs, ppx_sexp_conv
+, logs, ppx_sexp_conv, lwt_ssl
 }:
 
 if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0"
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
 	buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ conduit-lwt logs ];
+	propagatedBuildInputs = [ conduit-lwt logs lwt_ssl ];
 
 	buildPhase = "jbuilder build -p conduit-lwt-unix";
 }
-- 
GitLab


From 1d9d1fa780b28a61e9644c9ab07f636a7e720501 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 15 May 2018 10:27:53 -0500
Subject: [PATCH 0746/1085] telnet: use inetutils

Inetutils provides a cross-platform version of telnet. Normally I
would try to contact the old maintainer, but none is listed.
---
 pkgs/tools/networking/telnet/default.nix | 22 ----------------------
 pkgs/top-level/aliases.nix               |  1 +
 pkgs/top-level/all-packages.nix          |  2 --
 3 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 pkgs/tools/networking/telnet/default.nix

diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix
deleted file mode 100644
index c38f3c46fa4..00000000000
--- a/pkgs/tools/networking/telnet/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, ncurses}:
-
-stdenv.mkDerivation {
-  name = "telnet-1.2";
-
-  src = fetchurl {
-    #url = ftp://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-1.2.tar.bz2; # broken
-    url = mirror://gentoo/distfiles/telnet-bsd-1.2.tar.bz2;
-    sha256 = "0cs7ks22dhcn5qfjv2vl6ikhw93x68gg33zdn5f5cxgg81kx5afn";
-  };
-
-  hardeningDisable = [ "format" ];
-
-  buildInputs = [ncurses];
-
-  meta = {
-    description = "A client and daemon for the Telnet protocol";
-    homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/;
-    license = "BSD";
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8b0812f8305..34906533a0a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -200,6 +200,7 @@ mapAliases (rec {
   sshfsFuse = sshfs-fuse; # added 2016-09
   surf-webkit2 = surf; # added 2017-04-02
   tahoelafs = tahoe-lafs; # added 2018-03-26
+  telnet = inetutils; # added 2018-05-15
   system_config_printer = system-config-printer;  # added 2016-01-03
   telepathy_farstream = telepathy-farstream; # added 2018-02-25
   telepathy_gabble = telepathy-gabble; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46683b394c4..4a85484ba2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5156,8 +5156,6 @@ with pkgs;
 
   teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };
 
-  telnet = callPackage ../tools/networking/telnet { };
-
   telegraf = callPackage ../servers/monitoring/telegraf { };
 
   teleport = callPackage ../servers/teleport {};
-- 
GitLab


From f19845c763b9d35bc42080f1b4aba78bded6f4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 15 May 2018 13:14:23 -0300
Subject: [PATCH 0747/1085] vivaldi: 1.14.1077.45-1 -> 1.15.1147.42-1 (#40536)

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

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 6bd9614e08d..8eae85099fb 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -13,11 +13,11 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi";
-  version = "1.14.1077.45-1";
+  version = "1.15.1147.42-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "0b4iviar927jx6xqyrzgzb3p4p617zm4an1np8jnldadq2a0p56d";
+    sha256 = "15cajvn2sv05qdp3y538n2xvyy3il49q8zi5928z1mfirjz3dlwh";
   };
 
   unpackPhase = ''
-- 
GitLab


From d0210b0fdc5701eeaf5d2b546c90e69d3addafeb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 15 May 2018 09:15:30 -0700
Subject: [PATCH 0748/1085] mate.caja: 1.21.0 -> 1.21.1 (#40497)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/caja -h’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/caja --help’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/caja-connect-server -h’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/caja-connect-server --help’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/.caja-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/.caja-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/.caja-connect-server-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/.caja-connect-server-wrapped --help’ got 0 exit code
- found 1.21.1 with grep in /nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1
- directory tree listing: https://gist.github.com/46fb531ddeedf504b1610ffcaf01f09f
- du listing: https://gist.github.com/5396435fca3703ee457ac3c66b5c0121
---
 pkgs/desktops/mate/caja/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index 9643c9a3416..a04dbb27a88 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "caja-${version}";
-  version = "1.21.0";
+  version = "1.21.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0v8zx5rzqh1zkwizkpdckmwm6004cv9sbjghzgz3049xzcqm371g";
+    sha256 = "013lmngnm0i2746qrkkyhg62kyh4cjdd0i634cz5fm7ah65ylxg4";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 44361ea4091ecfbde4b2262fe6c65d1932813808 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 16 May 2018 00:23:43 +0800
Subject: [PATCH 0749/1085] check-{ups,nwc}-health: update to release versions
 (#40541)

---
 .../monitoring/plugins/labs_consol_de.nix     | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
index 9f33835c885..350728d509f 100644
--- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix
+++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
@@ -1,25 +1,24 @@
-{ stdenv, fetchFromGitHub, buildPerlPackage, autoreconfHook, makeWrapper
+{ stdenv, fetchFromGitHub, fetchurl, buildPerlPackage, autoreconfHook, makeWrapper
 , perl, NetSNMP, coreutils, gnused, gnugrep }:
 
 let
-  owner = "lausser";
-
   glplugin = fetchFromGitHub {
+    owner = "lausser";
     repo   = "GLPlugin";
-    rev    = "b92a261ca4bf84e5b20d3025cc9a31ade03c474b";
-    sha256 = "0kflnmpjmklq8fy2vf2h8qyvaiznymdi09z2h5qscrfi51xc9gmh";
-    inherit owner;
+    rev    = "e8e1a2907a54435c932b3e6c584ba1d679754849";
+    sha256 = "0wb55a9pmgbilfffx0wkiikg9830qd66j635ypczqp4basslpq5b";
   };
 
-  generic = { pname, version, rev, sha256, description, ... } @ attrs:
+  generic = { pname, version, sha256, description, ... } @ attrs:
   let
     attrs' = builtins.removeAttrs attrs [ "pname" "version" "rev" "sha256"];
+    name' = "${stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}"}-${version}";
   in perl.stdenv.mkDerivation rec {
-    name = stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}-${version}";
+    name = "${pname}-${version}";
 
-    src = fetchFromGitHub {
-      repo   = pname;
-      inherit owner rev sha256;
+    src = fetchurl {
+      url = "https://labs.consol.de/assets/downloads/nagios/${name'}.tar.gz";
+      inherit sha256;
     };
 
     buildInputs = [ perl NetSNMP ];
@@ -27,7 +26,8 @@ let
     nativeBuildInputs = [ autoreconfHook makeWrapper ];
 
     prePatch = with stdenv.lib; ''
-      ln -s ${glplugin}/* GLPlugin
+      rm -rf GLPlugin
+      ln -s ${glplugin} GLPlugin
       substituteInPlace plugins-scripts/Makefile.am \
         --replace /bin/cat  ${getBin coreutils}/bin/cat \
         --replace /bin/echo ${getBin coreutils}/bin/echo \
@@ -56,17 +56,15 @@ let
 in {
   check-nwc-health = generic {
     pname       = "check_nwc_health";
-    version     = "20170804";
-    rev         = "e959b412b5cf027c82a446668e026214fdcf8df3";
-    sha256      = "11l74xw62g15rqrbf9ff2bfd5iw159gwhhgbkxwdqi8sp9j6navk";
+    version     = "7.0.1.3";
+    sha256      = "0rgd6zgd7kplx3z72n8zbzwkh8vnd83361sk9ibh6ng78sds1sl5";
     description = "Check plugin for network equipment.";
   };
 
   check-ups-health = generic {
     pname       = "check_ups_health";
-    version     = "20170804";
-    rev         = "32a8a359ea46ec0d6f3b7aea19ddedaad63b04b9";
-    sha256      = "05na48dxfxrg0i9185j1ck2795p0rw1zwcs8ra0f14cm0qw0lp4l";
+    version     = "2.8.2.2";
+    sha256      = "1gc2wjsymay2vk5ywc1jj9cvrbhs0fs851x8l4nc75df2g75v521";
     description = "Check plugin for UPSs.";
   };
 }
-- 
GitLab


From fa0b60f59a459f2b79692ac41b056e5228140123 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 15 May 2018 18:19:19 +0200
Subject: [PATCH 0750/1085] nixos/tests/installer: Add lndir to extraDeps

In commit 17dd7bcd89d568596f52356624be82201ea84779 the systemd unit
generator now uses lndir instead of "ln -s", so we need to have lndir
available in the Nix store for the installer tests to be able to build
the units and thus the whole system.

This should fix the installer tests, although I have only tested it with
the "simple" subtest.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jtojnar, @xeji, @edolstra
---
 nixos/tests/installer.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index acf248d0a5a..7da02d9c204 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -241,6 +241,7 @@ let
                 nixos-artwork.wallpapers.gnome-dark
                 perlPackages.XMLLibXML
                 perlPackages.ListCompare
+                xorg.lndir
 
                 # add curl so that rather than seeing the test attempt to download
                 # curl's tarball, we see what it's trying to download
-- 
GitLab


From 9f20a5985d7fef4169afa427e0049627317c076a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 14 May 2018 23:38:40 +0200
Subject: [PATCH 0751/1085] eclipse-platform: 4.7.2 -> 4.7.3a

---
 pkgs/applications/editors/eclipse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 1688e606222..d7bd917c5f0 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -114,16 +114,16 @@ rec {
   };
 
   eclipse-platform-47 = buildEclipse {
-    name = "eclipse-platform-4.7.2";
+    name = "eclipse-platform-4.7.3a";
     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.2-201711300510/eclipse-platform-4.7.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "1zl406brvhh25dkd2pi1kvz5386gzkybpwik03aadpzmjrbm9730";
+        url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz;
+          sha512 = "caf86cd6efaf66258c75434f1adf552587a7395d57dba4cfd20f86196308cf942866d931f4b352f9d39a6fbf14444fcd2167e6bfd146a28c96c229bb9988156a";
         };
       "i686-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk.tar.gz;
-          sha256 = "0v0i13ah8d8zmcv0ip1ia5ifnfnl76aibiqpv4q4lih5d1qsa79d";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk.tar.gz;
+          sha512 = "c633da467774e4ab40f8d51d07b8e7d8403f26f23365c3c3ceeaeec1039b8c23c7508cee1f786bf52db64c7b84e0f91cb31a2848a74ac8271f8504934407bd5c";
         };
     };
   };
-- 
GitLab


From 726268db7770ea041e9133005d301ef7ae562200 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 14 May 2018 23:39:07 +0200
Subject: [PATCH 0752/1085] eclipse-sdk: 4.7.2 -> 4.7.3a

---
 pkgs/applications/editors/eclipse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index d7bd917c5f0..3a09b5c6be4 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -168,16 +168,16 @@ rec {
   };
 
   eclipse-sdk-47 = buildEclipse {
-    name = "eclipse-sdk-4.7.2";
+    name = "eclipse-sdk-4.7.3a";
     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.2-201711300510/eclipse-SDK-4.7.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "1j5d72rkl3lq3rpnvq1spsa0zlzbmbkgadfhbz868sqqbavrwbzv";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk-x86_64.tar.gz;
+          sha512 = "d77e42aca16d26526cef32e363d038258bb8a4616d9dbe6e76dd3656dc2217369436390a82555bde4566bbbdb631813bbaca08602f7bb885cb30e8a26a14873f";
         };
       "i686-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk.tar.gz;
-          sha256 = "117436ni79v1kiync8b3wkfkb8a5rv3sbqp6qnwbmanwkvnyvfvc";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk.tar.gz;
+          sha512 = "b0b936fd4142ae86ec5c30535cd5e4caf6fe313d814ae5b16f300635e4163a79b748b1eee11792a135114f2265678a74821ec80c2bfd69872769b6d0ccbcde3a";
         };
     };
   };
-- 
GitLab


From d5dae23007b5a20759609f2a37b38ff9acec7afc Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 14 May 2018 23:39:19 +0200
Subject: [PATCH 0753/1085] eclipse-plugin-jdt: 4.7.2 -> 4.7.3a

---
 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 adb763c1250..f381064c92c 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -470,12 +470,12 @@ rec {
 
   jdt = buildEclipseUpdateSite rec {
     name = "jdt-${version}";
-    version = "4.7.2";
+    version = "4.7.3a";
 
     src = fetchzip {
       stripRoot = false;
-      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/org.eclipse.jdt-4.7.2.zip;
-      sha256 = "1yzqnjs88cdyyqv8f1g8fbfyccci29f3pzxxvaz7szxicwzn59mz";
+      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/org.eclipse.jdt-4.7.3a.zip;
+      sha256 = "10dndhqz894xf79zz07dlmkn7k33mn42nbmycr78xz6d2jy8cscx";
     };
 
     meta = with stdenv.lib; {
-- 
GitLab


From 437cc2c6403b98e65d613a95c6f6ab2f0c85d7f5 Mon Sep 17 00:00:00 2001
From: Eric Bailey <yurrriq@users.noreply.github.com>
Date: Tue, 15 May 2018 12:19:27 -0500
Subject: [PATCH 0754/1085] kops: 1.8.1 -> 1.9.0 (#40513)

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

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index ddb8951740c..a1e17f60810 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata  }:
+
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }:
 
 buildGoPackage rec {
   name = "kops-${version}";
-  version = "1.8.1";
+  version = "1.9.0";
 
   goPackagePath = "k8s.io/kops";
 
@@ -10,7 +11,7 @@ buildGoPackage rec {
     rev = version;
     owner = "kubernetes";
     repo = "kops";
-    sha256 = "12nyr0iw1xwp60apli3nlq2vyn4jk3qjrb404m2syx2mqbnn47my";
+    sha256 = "03avkm7gk2dqyvd7245qsca1sbhwk41j9yhc208gcmjgjhkx2vn7";
   };
 
   buildInputs = [go-bindata];
@@ -24,8 +25,7 @@ buildGoPackage rec {
 
   preBuild = ''
     (cd go/src/k8s.io/kops
-     go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...
-     go-bindata -o federation/model/bindata.go -pkg model -prefix federation/model federation/model/...)
+     go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...)
   '';
 
   postInstall = ''
-- 
GitLab


From edbce18903742c412fce54aa8df76ab96b8bf61a Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 15 May 2018 20:55:40 +0300
Subject: [PATCH 0755/1085] tracker-miners: switch to meson, some tweaks
 (#39534)

---
 .../gnome-3/core/tracker-miners/default.nix   | 119 ++++++++++++++----
 1 file changed, 94 insertions(+), 25 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index b612db9ce38..44b0de37d69 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -1,47 +1,101 @@
-{ stdenv, intltool, fetchurl, libxml2, upower
-, substituteAll, pkgconfig, gtk3, glib, gexiv2
-, bash, wrapGAppsHook, itstool, vala, sqlite, libxslt
-, gnome3, librsvg, gdk_pixbuf, libnotify
-, evolution-data-server, gst_all_1, poppler
-, icu, taglib, libjpeg, libtiff, giflib, libcue
-, libvorbis, flac, exempi, networkmanager
-, libpng, libexif, libgsf, libuuid, bzip2
-, libsoup, json-glib, libseccomp
-, libiptcdata }:
-
-let
+{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, makeWrapper
+, meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server
+, exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif
+, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid
+, libvorbis, libxml2, poppler, taglib, upower }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
   pname = "tracker-miners";
   version = "2.0.4";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0mp9m2waii583sjgr61m1ni6py6dry11r0rzidgvw1g4cxhn89j6";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
+  # https://github.com/NixOS/nixpkgs/issues/39547
+  LIBRARY_PATH = stdenv.lib.makeLibraryPath [ giflib ];
 
-  enableParallelBuilding = true;
+  nativeBuildInputs = [
+    intltool
+    itstool
+    libxslt
+    makeWrapper
+    meson
+    ninja
+    pkgconfig
+    vala
+    wrapGAppsHook
+  ];
 
-  nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ];
   # TODO: add libgrss, libenca, libosinfo
   buildInputs = [
-    bzip2 evolution-data-server exempi flac giflib glib gnome3.totem-pl-parser
-    gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu
-    json-glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup
-    libtiff libuuid libvorbis libxml2 poppler taglib upower gexiv2
+    bzip2
+    dbus
+    evolution-data-server
+    exempi
+    flac
+    giflib
+    glib
+    gnome3.gexiv2
+    gnome3.totem-pl-parser
+    gnome3.tracker
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+    icu
+    json-glib
+    libcue
+    libexif
+    libgsf
+    libiptcdata
+    libjpeg
+    libpng
+    libseccomp
+    libsoup
+    libtiff
+    libuuid
+    libvorbis
+    libxml2
+    poppler
+    taglib
+    upower
   ];
 
-  LANG = "en_US.UTF-8"; # for running tests
-
-  doCheck = true;
+  mesonFlags = [
+    "-Dminer_rss=false" # needs libgrss
+  ];
 
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
       inherit (gnome3) tracker;
     })
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795573
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371422;
+      sha256 = "1rzwzrc7q73k42s1j1iw52chy10w6y3xksfrzg2l42nn9wk7n281";
+    })
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795574
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371423;
+      sha256 = "0b2ck8z4b2yrgwg4v9jsac5n8h3a91qkp90vv17wxcvr4v50fg48";
+    })
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795575
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371424;
+      sha256 = "03i29fabxrpraydh7712vdrc571qmiq0l4axj24gbi6h77xn7mxc";
+    })
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795576
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371427;
+      sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf";
+    })
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795577
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371425;
+      sha256 = "05m629469jr2lm2cjs54n7xwyim2d5rwwvdjxzcwh5qpfjds5phm";
+    })
   ];
 
   passthru = {
@@ -51,11 +105,26 @@ in stdenv.mkDerivation rec {
     };
   };
 
+  # https://github.com/NixOS/nixpkgs/pull/39534#discussion_r184339131
+  # https://github.com/NixOS/nixpkgs/pull/37693
+  preConfigure = ''
+    mesonFlagsArray+=("-Ddbus_services=$out/share/dbus-1/services")
+  '';
+
+  postInstall = ''
+    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+  '';
+  
+  # https://bugzilla.gnome.org/show_bug.cgi?id=796145
+  postFixup = ''
+    rm $out/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/Tracker;
     description = "Desktop-neutral user information store, search tool and indexer";
     maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
 }
-- 
GitLab


From 2cab326047cc484df7438f85102b0d41b05b8200 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 01:04:27 -0700
Subject: [PATCH 0756/1085] metabase: 0.29.0 -> 0.29.2

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/40a08752e83dd27b03a5e553c6f89582
- du listing: https://gist.github.com/fe6508f6abc39c37b41465ae8e9efd81
---
 pkgs/servers/metabase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index 4eae86b00b0..f329b108849 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "metabase-${version}";
-  version = "0.29.0";
+  version = "0.29.2";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "1dfq06cm8k36pkqpng4cd8ax8cdxbcssww4vapq2w9ccflpnlam2";
+    sha256 = "02cba755mfim8q403gj02ggc0gg4ckcyalxkw09k0jqi5irdi4h1";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 0f30db4222491bfde951b9702818913ed86d0186 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 15 May 2018 13:25:31 -0500
Subject: [PATCH 0757/1085] nano: 2.9.6 -> 2.9.7

http://git.savannah.gnu.org/cgit/nano.git/tree/ChangeLog?h=v2.9.7
---
 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 f5598b3365b..c29cbe52872 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.9.6";
+  version = "2.9.7";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1inl8ljkc711969ncwy7irf0464psasikg1g42l0g4sfpdz50wx3";
+    sha256 = "1ga4sdk3ikx1ilggc6c77vyfpbmq3nrhg6svgglpf5sv60bv0jmn";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
-- 
GitLab


From 1af7302dd40e5f43b37414f1dd91ed4b11cf76b1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 15 May 2018 20:30:27 +0200
Subject: [PATCH 0758/1085] signal-desktop: 1.10.1 -> 1.11.0

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

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 80f219560e3..ca13a881176 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,13 +40,13 @@ in
   stdenv.mkDerivation rec {
     name = "signal-desktop-${version}";
 
-    version = "1.10.1";
+    version = "1.11.0";
 
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-          sha256 = "1ndk2in9mbsm5i2k7pgpbd6smbgpswxmjvr12zmbmw893ay015h3";
+          sha256 = "0s3qlzm7iy9qxca2hlh1hq0dnjr7y5wxad1ssqgmyhxsif0nqm96";
         }
       else
         throw "Signal for Desktop is not currently supported on ${stdenv.system}";
-- 
GitLab


From 87b0afb0069950ee6573a911906b1cca7b2da9a3 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 15 May 2018 20:30:19 +0200
Subject: [PATCH 0759/1085] atom: 1.26.1 -> 1.27.0

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index f646fab8629..606f5db89f6 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.26.1";
+  version = "1.27.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0g83qj9siq1vr2v46rzjf3dy2gns9krh6xlh7w3bhrgfk0vqkm11";
+    sha256 = "1r37s6ndxyib644v7nlgha1pkcnz7kxpmlkhh41l5jp4dpc6iik6";
     name = "${name}.deb";
   };
 
-- 
GitLab


From 36a4e543729903bf3ad8e1ed25ab507538bc8a92 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 15 May 2018 20:33:41 +0200
Subject: [PATCH 0760/1085] atom: add myself as maintainer

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 606f5db89f6..225ec6a9456 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "A hackable text editor for the 21st Century";
     homepage = https://atom.io/;
     license = licenses.mit;
-    maintainers = [ maintainers.offline maintainers.nequissimus maintainers.ysndr ];
+    maintainers = with maintainers; [ offline nequissimus synthetica ysndr ];
     platforms = [ "x86_64-linux" ];
   };
 }
-- 
GitLab


From 30a788b71e4bb56cf89709d0b64c87ffcd6fa2dd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 15 May 2018 20:36:09 +0200
Subject: [PATCH 0761/1085] maim: 5.5 -> 5.5.1

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

diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index cac86e29c47..cd0cff0f389 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
-  version = "5.5";
+  version = "5.5.1";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "maim";
     rev = "v${version}";
-    sha256 = "0dr44lwqsvhwf9pncxq6k42zj9hj07b96qsk1q8vh4l42zcpqzla";
+    sha256 = "106qg85q0aiw4w08vjg9j60brrbln11b8vdycjqkv8fq00pq308i";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From 1d1407a6f4708455a1e85854e4e473796bf1f1f7 Mon Sep 17 00:00:00 2001
From: dbohdan <dbohdan@dbohdan.com>
Date: Tue, 15 May 2018 22:50:45 +0300
Subject: [PATCH 0762/1085] tcl2048: 0.3.1 -> 0.4.0

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

diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix
index d1517a2ec61..48fa0a3b518 100644
--- a/pkgs/games/tcl2048/default.nix
+++ b/pkgs/games/tcl2048/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, tcl, tcllib }:
 
 stdenv.mkDerivation {
-  name = "tcl2048-0.3.1";
+  name = "tcl2048-0.4.0";
 
   src = fetchurl {
-    url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.3.1/2048.tcl;
-    sha256 = "44e325328784c4e91cecc0a9cc00e32d733da713adf2fad1c081542f38af3361";
+    url = https://raw.githubusercontent.com/dbohdan/2048.tcl/v0.4.0/2048.tcl;
+    sha256 = "53f5503efd7f029b2614b0f9b1e3aac6c0342735a3c9b811d74a5135fee3e89e";
   };
 
   phases = "installPhase";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = https://github.com/dbohdan/2048-tcl;
+    homepage = https://github.com/dbohdan/2048.tcl;
     description = "The game of 2048 implemented in Tcl";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.all;
-- 
GitLab


From 3efea84fa1991d027ae27cee0f0c622a65908772 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 15 May 2018 20:44:00 +0200
Subject: [PATCH 0763/1085] tdesktopPackages.preview: 1.2.19 -> 1.2.20

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 0e2c232e6d2..5d476f54304 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,7 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.2.19";
-    sha256Hash = "0val6lfcg3ghcksflm3jclqly0x8plpn3an8v9bix0s5yll1ka4h";
+    version = "1.2.20";
+    sha256Hash = "00ncpb1qs88jrrmmx7f7l8wy37wbwnrb958x3xls14p1h1xg63l6";
   });
 }
-- 
GitLab


From 272987524abfd20666d9b4979509999419d638ed Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Tue, 15 May 2018 23:58:50 +0400
Subject: [PATCH 0764/1085] chromium: 66.0.3359.170 -> 66.0.3359.181

---
 .../networking/browsers/chromium/upstream-info.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 147e8d33a0e..bb080a50beb 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -11,8 +11,8 @@
     version = "68.0.3423.2";
   };
   stable = {
-    sha256 = "1pki90vnc8amzdwagcsnkwnqnw4k442234x8wfc7cf0rkmjackc6";
-    sha256bin64 = "0a68w4p0dqxal7xh7nlfzsj7yl9xxp1bq3khfnpa3r7r38zbxnpw";
-    version = "66.0.3359.170";
+    sha256 = "06g9m7lxm9g63dcci25dqiglyjxjfy7v05vjhdda4rdk84vngrip";
+    sha256bin64 = "105ds6r6awzhf5sq3nf43b6zb84lb4qbhjnfk3fnxfqvskq3b6r2";
+    version = "66.0.3359.181";
   };
 }
-- 
GitLab


From 302ed5422d8132a33e88f4dbf032006f33cf908d Mon Sep 17 00:00:00 2001
From: dbohdan <dbohdan@dbohdan.com>
Date: Tue, 15 May 2018 23:10:39 +0300
Subject: [PATCH 0765/1085] maintainers: Update my contact info

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a2db508d4d2..8b546d58ac6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -989,9 +989,9 @@
     name = "Davor Babic";
   };
   dbohdan = {
-    email = "danyil.bohdan@gmail.com";
+    email = "dbohdan@dbohdan.com";
     github = "dbohdan";
-    name = "Danyil Bohdan";
+    name = "D. Bohdan";
   };
   dbrock = {
     email = "daniel@brockman.se";
-- 
GitLab


From e0d6edddd7f3df2cecbe24c527f8dc5286564235 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 15 May 2018 15:26:59 -0500
Subject: [PATCH 0766/1085] pspp: provide default icons & settings

psppire needs to be wrapped so that it will work outside of GNOME
desktop. We provide hicolor-icon-theme & gsettings-desktop-schemas.

Note that at runtime, I still get this error:

- Cannot create a converter for `IBM864' to `UTF-8': Invalid argument

Possibly a locale issue.

Fixes #40558
---
 pkgs/applications/science/math/pspp/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix
index 957a4cf6421..1afbc2b72e5 100644
--- a/pkgs/applications/science/math/pspp/default.nix
+++ b/pkgs/applications/science/math/pspp/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl
 , pkgconfig, gtksourceview, pango, gettext
+, makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme
+, gnome3
 }:
 
 stdenv.mkDerivation rec {
@@ -12,12 +14,21 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl
-    gtksourceview pango gettext ];
+    gtksourceview pango gettext
+    makeWrapper gsettings-desktop-schemas hicolor-icon-theme ];
 
   doCheck = false;
 
   enableParallelBuilding = true;
 
+  preFixup = ''
+    wrapProgram "$out/bin/psppire" \
+     --prefix XDG_DATA_DIRS : "$out/share" \
+     --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \
+     --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+     --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
+  '';
+
   meta = {
     homepage = http://www.gnu.org/software/pspp/;
     description = "A free replacement for SPSS, a program for statistical analysis of sampled data";
-- 
GitLab


From 42462d7b6696d39f1ec1ae7169f94fb90e1f436f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 15 May 2018 20:48:20 +0000
Subject: [PATCH 0767/1085] coqPackages.stdpp: init at 1.1

---
 .../development/coq-modules/stdpp/default.nix | 28 +++++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/coq-modules/stdpp/default.nix

diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix
new file mode 100644
index 00000000000..91801850ebf
--- /dev/null
+++ b/pkgs/development/coq-modules/stdpp/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchzip, coq }:
+
+stdenv.mkDerivation {
+  name = "coq${coq.coq-version}-stdpp-1.1";
+  src = fetchzip {
+    url = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/-/archive/coq-stdpp-1.1.0/coq-stdpp-coq-stdpp-1.1.0.tar.gz";
+    sha256 = "0z8zl288x9w32w06sjax01jcpy12wd5i3ygps58dl2hfy7r3lwg0";
+  };
+
+  buildInputs = [ coq ];
+
+  enableParallelBuilding = true;
+
+  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+
+  meta = {
+    homepage = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp";
+    description = "An extended “Standard Library” for Coq";
+    inherit (coq.meta) platforms;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+  };
+
+  passthru = {
+    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+  };
+
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index e21445b423d..519d1cb9ed4 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -36,6 +36,7 @@ let
       paco = callPackage ../development/coq-modules/paco {};
       QuickChick = callPackage ../development/coq-modules/QuickChick {};
       ssreflect = callPackage ../development/coq-modules/ssreflect { };
+      stdpp = callPackage ../development/coq-modules/stdpp { };
       tlc = callPackage ../development/coq-modules/tlc {};
     };
 
-- 
GitLab


From 977c207f2295b0b17cb6fbf97c9c6c7656977e11 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 15 May 2018 23:23:30 +0200
Subject: [PATCH 0768/1085] pythonPackages.podcats: Init at 0.5.0

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

diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix
new file mode 100644
index 00000000000..a1b8312b134
--- /dev/null
+++ b/pkgs/development/python-modules/podcats/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchFromGitHub, flask, mutagen }:
+
+buildPythonPackage rec {
+  pname = "podcats";
+  version = "v0.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jakubroztocil";
+    repo = "podcats";
+    rev = version;
+    sha256 = "0zjdgry5n209rv19kj9yaxy7c7zq5gxr488izrgs4sc75vdzz8xc";
+  };
+
+  patchPhase = ''
+    substituteInPlace podcats.py \
+      --replace 'debug=True' 'debug=True, use_reloader=False'
+  '';
+
+  propagatedBuildInputs = [ flask mutagen ];
+
+  meta = {
+    description = "Application that generates RSS feeds for podcast episodes from local audio files";
+    homepage = https://github.com/jakubroztocil/podcats;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a80eb58e390..52d03ad1e29 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3845,6 +3845,8 @@ in {
 
   podcastparser = callPackage ../development/python-modules/podcastparser { };
 
+  podcats = callPackage ../development/python-modules/podcats { };
+
   pomegranate = callPackage ../development/python-modules/pomegranate { };
 
   poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {
-- 
GitLab


From 0edbc54b4f0429275b24e54cf51f01b0bf8bea25 Mon Sep 17 00:00:00 2001
From: Eric Bailey <yurrriq@users.noreply.github.com>
Date: Tue, 15 May 2018 17:25:29 -0500
Subject: [PATCH 0769/1085] kubernetes-helm: 2.8.2 -> 2.9.0 (#40514)

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

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index a49ff486d96..ae9dc3bbc34 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -5,10 +5,10 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if isLinux
-             then "1lr2s66kln6rp3sb156br9nfx51bdy654vdjr4vnncz4kp3mljv1"
-             else "04y4ii0w4s00z831q1wzxz6qkc8qfrhwzdrq3wwvrcl0413cza50";
+             then "0bnjpiivhsxhl45ab32vzf6crv4z8nbq5kcjkvlbcbswdbgp0pq6"
+             else "0smwhj4pmd4k7csz82akbkrkb0j2jxnmb33ifhkqw7n33jhl3aqp";
   pname = "helm";
-  version = "2.8.2";
+  version = "2.9.0";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";
-- 
GitLab


From 90cfd65b3b6a57ba3ef315ca8d07e4a7057e3c53 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 15 May 2018 23:19:46 +0200
Subject: [PATCH 0770/1085] python-ipython: 5.6.0 -> 5.7.0

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

diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix
index 083c1f3b08d..a91988bd97d 100644
--- a/pkgs/development/python-modules/ipython/5.nix
+++ b/pkgs/development/python-modules/ipython/5.nix
@@ -27,11 +27,11 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "5.6.0";
+  version = "5.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00g696r9rk1c4p3sycnv7by55cp9mm7r6zkkdqbiw9l0mk8k58wb";
+    sha256 = "0g1jm06qriq48m58311cs7askp83ipq3yq96hv4kg431nxzkmd4d";
   };
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
-- 
GitLab


From 780592ca6ef752f3f4886a66ed6181095e358db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 15 May 2018 23:20:31 +0200
Subject: [PATCH 0771/1085] gcc7: Enable arm erratum 843419 on aarch64

This fix is required for the raspherry pi 3 with glibc 2.27,
otherwise the kernel panics in initrd with:
```
<<< NixOS Stage 1 >>>

loading module dm_mod...
running udev...
kbd_mode: KDSKBMODE: Inappropriate ioctl for device
Gstarting device mapper and LVM...
[    1.969164] Kernel panic - not syncing: Attempted to kill init!
exitcode=0x0000000b
[    1.969164]
[    1.978476] CPU: 0 PID: 1 Comm: init Not tainted 4.16.8 #1-NixOS
[    1.984580] Hardware name: Raspberry Pi 3 Model B (DT)
[    1.989801] Call trace:
[    1.992301]  dump_backtrace+0x0/0x1c8
[    1.996025]  show_stack+0x24/0x30
[    1.999396]  dump_stack+0x9c/0xc0
[    2.002766]  panic+0x124/0x294
[    2.005872]  complete_and_exit+0x0/0x30
[    2.009771]  do_group_exit+0x40/0xa8
[    2.013406]  get_signal+0x280/0x5b0
[    2.016954]  do_signal+0x88/0x240
[    2.020325]  do_notify_resume+0xd8/0x130
[    2.024311]  work_pending+0x8/0x10
[    2.027774] SMP: stopping secondary CPUs
[    2.031763] Kernel Offset: disabled
[    2.035308] CPU features: 0x0802004
[    2.038850] Memory Limit: none
[    2.041963] ---[ end Kernel panic - not syncing: Attempted to kill
init! exitcode=0x0000000b
[    2.041963]
[    2.865264] random: crng init done
```
Suse has done the same to circumvent crashes with hostname resolving in
glibc 2.27 on aarch64.
---
 pkgs/development/compilers/gcc/7/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 54ac2c45d89..55951274322 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -381,6 +381,7 @@ stdenv.mkDerivation ({
       "--with-gnu-as" "--without-gnu-ld"
     ]
     ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+    ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"
   ;
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
-- 
GitLab


From a0f7ee0e60c27b2759ff64c43836f9ec09aac914 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 16 May 2018 01:25:59 +0800
Subject: [PATCH 0772/1085] kdenlive: Fix build by removing already upstreamed
 patch

---
 .../kde/kdenlive-cmake-concurrent-module.patch       | 12 ------------
 pkgs/applications/kde/kdenlive.nix                   |  3 ---
 2 files changed, 15 deletions(-)
 delete 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
deleted file mode 100644
index ea2af2b0950..00000000000
--- a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 b5eca47d6c0..65080ba7f06 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -34,9 +34,6 @@
 
 mkDerivation {
   name = "kdenlive";
-  patches = [
-    ./kdenlive-cmake-concurrent-module.patch
-  ];
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-- 
GitLab


From 389691a42c0b73764d1e3bfe25771dac7147d8ff Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 15 May 2018 12:39:51 +0800
Subject: [PATCH 0773/1085] i7z: do not build the GUI by default

---
 pkgs/os-specific/linux/i7z/default.nix | 44 ++++++++++++++++++--------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index 6d0c5ae82bc..48d28036aa4 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, qt4, ncurses }:
+{ stdenv, lib, fetchurl, ncurses
+, withGui ? false, qt4 ? null }:
 
 stdenv.mkDerivation rec {
   name = "i7z-0.27.2";
@@ -8,29 +9,46 @@ stdenv.mkDerivation rec {
     sha256 = "1wa7ix6m75wl3k2n88sz0x8cckvlzqklja2gvzqfw5rcfdjjvxx7";
   };
 
-  buildInputs = [ qt4 ncurses ];
+  buildInputs = [ ncurses ] ++ lib.optional withGui qt4;
+
+  enableParallelBuilding = true;
 
   buildPhase = ''
+    runHook preBuild
+
     make
-    cd GUI
-    qmake
-    make clean
-    make
-    cd ..
+    ${lib.optionalString withGui ''
+      cd GUI
+      qmake
+      make clean
+      make
+      cd ..
+    ''}
+
+    runHook postBuild
   '';
 
   installPhase = ''
-    mkdir -p $out/sbin
+    runHook preInstall
+
+    mkdir -p $out/{bin,sbin}
     make install prefix=$out
-    install -Dm755 GUI/i7z_GUI $out/sbin/i7z-gui
+    ${lib.optionalString withGui ''
+      install -Dm755 GUI/i7z_GUI $out/bin/i7z-gui
+    ''}
+    mv $out/sbin/* $out/bin/
+    rmdir $out/sbin
+
+    runHook postInstall
   '';
 
-  meta = {
+  meta = with lib; {
     description = "A better i7 (and now i3, i5) reporting tool for Linux";
     homepage = https://github.com/ajaiantilal/i7z;
     repositories.git = https://github.com/ajaiantilal/i7z.git;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ bluescreen303 ];
+    # broken on ARM
+    platforms = [ "x86_64-linux" ];
   };
 }
-- 
GitLab


From 205a9f2576646e65930d6c825df33da484d590b0 Mon Sep 17 00:00:00 2001
From: Walter Franzini <walter.franzini@gmail.com>
Date: Wed, 16 May 2018 07:23:00 +0200
Subject: [PATCH 0774/1085] minor improvement to nix installation instructions
 (#40521)

* improve nix installation instructions

in the command

	$ bash <(curl https://nixos.org/nix/install)

<(..) is a bashism.  The documentation now show a command that does
not require to be executed by bash.
---
 nixos/doc/manual/installation/installing-from-other-distro.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index 8b0c350b064..c55aa90267f 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -47,7 +47,7 @@
     Short version:
    </para>
 <screen>
-$ bash &lt;(curl https://nixos.org/nix/install)
+$ curl https://nixos.org/nix/install | sh
 $ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell</screen>
    <para>
     More details in the
-- 
GitLab


From 5efda047c6381dacce570661ff0654eabf81ab49 Mon Sep 17 00:00:00 2001
From: John Mercier <moaxcp@gmail.com>
Date: Wed, 16 May 2018 01:54:45 -0400
Subject: [PATCH 0775/1085] jbake: add check (#40421)

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

diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index f4fb1b5a9e9..152cddc101d 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/jbake --set JAVA_HOME "${jre}"
   '';
 
+  checkPhase = ''
+    export JAVA_HOME=${jre}
+    bin/jbake | grep -q "${version}" || (echo "jbake did not return correct version"; exit 1)
+  '';
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "JBake is a Java based, open source, static site/blog generator for developers & designers";
     homepage = "https://jbake.org/";
-- 
GitLab


From 5a6d202a43d0c81e11a5bad6b70b4eee27319710 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 16 May 2018 05:56:12 +0000
Subject: [PATCH 0776/1085] Merge pull request #40419 from
 oxij/pkgs/fix-linux-debug

linuxPackages.kernel: config: fix DEBUG_INFO setting
---
 pkgs/os-specific/linux/kernel/common-config.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ec2b2f38795..cee2197f3c7 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -37,7 +37,12 @@ with stdenv.lib;
   DEBUG_STACKOVERFLOW n
   SCHEDSTATS n
   DETECT_HUNG_TASK y
-  DEBUG_INFO n # Not until we implement a separate debug output
+
+  ${if (features.debug or false) then ''
+    DEBUG_INFO y
+  '' else ''
+    DEBUG_INFO n
+  ''}
 
   ${optionalString (versionOlder version "4.4") ''
     CPU_NOTIFIER_ERROR_INJECT? n
@@ -709,9 +714,5 @@ with stdenv.lib;
     DEBUG_MEMORY_INIT? y
   ''}
 
-  ${optionalString (features.debug or false)  ''
-    DEBUG_INFO y
-  ''}
-
   ${extraConfig}
 ''
-- 
GitLab


From d6c9efa223a9bb39b38378b5ee5e7b5490a70071 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 15 May 2018 23:16:15 -0500
Subject: [PATCH 0777/1085] watchman: add fsevents support

macOS needs apple sdks for fsevents support

Fixes #14309
---
 pkgs/development/tools/watchman/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix             | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index 15f265e31e3..b349ecf61e1 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre,
   libtool, pkgconfig, openssl,
-  confFile ? config.watchman.confFile or null
+  confFile ? config.watchman.confFile or null,
+  withApple ? stdenv.isDarwin, CoreServices, CoreFoundation
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +16,8 @@ stdenv.mkDerivation rec {
     sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal";
   };
 
-  buildInputs = [ pcre openssl ];
+  buildInputs = [ pcre openssl ]
+               ++ lib.optionals withApple [ CoreFoundation CoreServices ];
   nativeBuildInputs = [ autoconf automake pkgconfig libtool ];
 
   configureFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa6cbc7a4d3..c573bc6fabc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5481,7 +5481,10 @@ with pkgs;
 
   watchexec = callPackage ../tools/misc/watchexec { };
 
-  watchman = callPackage ../development/tools/watchman { };
+  watchman = callPackage ../development/tools/watchman {
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
+    CoreFoundation = darwin.cf-private;
+  };
 
   wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {};
 
-- 
GitLab


From bb831b7946bb504fbeaf05fca8698598505d3e76 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 15 May 2018 23:43:30 -0500
Subject: [PATCH 0778/1085] redshift: support macosx

---
 pkgs/applications/misc/redshift/default.nix | 30 ++++++++++++++++-----
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index b7ab092bbc0..dc31da671e9 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -1,6 +1,12 @@
 { stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool
-, libtool, pkgconfig, wrapGAppsHook, wrapPython, geoclue2, gobjectIntrospection
-, gtk3, python, pygobject3, pyxdg, libdrm, libxcb, hicolor-icon-theme }:
+, libtool, pkgconfig, wrapGAppsHook, wrapPython, gobjectIntrospection
+, gtk3, python, pygobject3, hicolor-icon-theme, pyxdg
+
+, withCoreLocation ? stdenv.isDarwin, CoreLocation, Foundation, Cocoa
+, withQuartz ? stdenv.isDarwin, ApplicationServices
+, withRandr ? stdenv.isLinux, libxcb
+, withDrm ? stdenv.isLinux, libdrm
+, withGeoclue ? stdenv.isLinux, geoclue }:
 
 stdenv.mkDerivation rec {
   name = "redshift-${version}";
@@ -29,15 +35,25 @@ stdenv.mkDerivation rec {
     wrapPython
   ];
 
+  configureFlags = [
+    "--enable-randr=${if withRandr then "yes" else "no"}"
+    "--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
+    "--enable-drm=${if withDrm then "yes" else "no"}"
+    "--enable-quartz=${if withQuartz then "yes" else "no"}"
+    "--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
+  ];
+
   buildInputs = [
-    geoclue2
     gobjectIntrospection
     gtk3
-    libdrm
-    libxcb
     python
     hicolor-icon-theme
-  ];
+  ] ++ stdenv.lib.optional  withRandr        libxcb
+    ++ stdenv.lib.optional  withGeoclue      geoclue
+    ++ stdenv.lib.optional  withDrm          libdrm
+    ++ stdenv.lib.optional  withQuartz       ApplicationServices
+    ++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ]
+    ;
 
   pythonPath = [ pygobject3 pyxdg ];
 
@@ -59,7 +75,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl3Plus;
     homepage = http://jonls.dk/redshift;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ yegortimoshenko ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c573bc6fabc..4a704f79263 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19765,6 +19765,8 @@ with pkgs;
 
   redshift = callPackage ../applications/misc/redshift {
     inherit (python3Packages) python pygobject3 pyxdg wrapPython;
+    inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
+    geoclue = geoclue2;
   };
 
   redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };
-- 
GitLab


From 8419c347ca303839ff97ea2750276da0b9977e0b Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Sun, 13 May 2018 22:36:53 -0500
Subject: [PATCH 0779/1085] qtchan: init at v0.100

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

diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix
new file mode 100644
index 00000000000..e2213d35877
--- /dev/null
+++ b/pkgs/applications/networking/browsers/qtchan/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "qtchan-${version}";
+  version = "0.100";
+
+  src = fetchFromGitHub {
+    owner  = "siavash119";
+    repo   = "qtchan";
+    rev    = "v${version}";
+    sha256 = "0n94jd6b1y8v6x5lkinr9rzm4bjg9xh9m7zj3j73pgq829gpmj3a";
+  };
+
+  enableParallelBuilding = true;
+  nativeBuildInputs = [ qt5.qmake ];
+  buildInputs = [ qt5.qtbase ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp qtchan $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "4chan browser in qt5";
+    homepage    = "https://github.com/siavash119/qtchan";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ chiiruno ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a704f79263..c281316e2b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17554,6 +17554,8 @@ with pkgs;
 
   qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
 
+  qtchan = callPackage ../applications/networking/browsers/qtchan { };
+
   qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };
 
   qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
-- 
GitLab


From c605d171bbb7259836aeb5f5b82b800e282b1fe5 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 15 May 2018 23:59:53 -0500
Subject: [PATCH 0780/1085] treewide: remove lintl references

libintl should be used directly, not through NIX_LDFLAGS.
---
 pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix  | 2 --
 .../gnome-3/misc/libgnome-games-support/default.nix      | 9 ++++-----
 pkgs/desktops/lxde/core/lxtask/default.nix               | 6 ++----
 pkgs/development/libraries/atk/default.nix               | 2 --
 pkgs/development/libraries/gtksourceview/3.x.nix         | 6 ++----
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 9efca75e8f8..05da0684641 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -38,6 +38,4 @@ stdenv.mkDerivation rec {
   preConfigure = optionalString stdenv.isDarwin ''
     intltoolize --force
   '';
-
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 }
diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
index d777ec0baae..3b580abed12 100644
--- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3, libintlOrEmpty }:
+{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3
+, libintl }:
 
 let
   pname = "libgnome-games-support";
@@ -11,10 +12,8 @@ in stdenv.mkDerivation rec {
     sha256 = "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ] ++ libintlOrEmpty;
-  buildInputs = [ glib gtk3 libgee ];
-
-  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [ glib gtk3 libgee libintl ];
 
   passthru = {
     updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index dbed065190e..ad4b89165fa 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3 }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }:
 
 stdenv.mkDerivation rec {
   name = "lxtask-${version}";
@@ -11,12 +11,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  buildInputs = [ gtk3 ];
+  buildInputs = [ gtk3 libintl ];
 
   configureFlags = [ "--enable-gtk3" ];
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-
   meta = {
     description = "Lightweight and desktop independent task manager";
     longDescription = ''
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 63fd7a4986f..813f8c3c964 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
-
   doCheck = true;
 
   passthru = {
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index 673eb1e52c4..fe81c97ab6e 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -21,10 +21,10 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection vala_0_40 ]
+  nativeBuildInputs = [ pkgconfig intltool perl gobjectIntrospection vala_0_40 ]
     ++ stdenv.lib.optionals doCheck checkInputs;
 
-  buildInputs = [ atk cairo glib pango libxml2 ];
+  buildInputs = [ atk cairo glib pango libxml2 gettext ];
 
   preBuild = ''
     substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
@@ -32,8 +32,6 @@ in stdenv.mkDerivation rec {
 
   patches = [ ./3.x-nix_share_path.patch ];
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-
   enableParallelBuilding = true;
 
   doCheck = stdenv.isLinux;
-- 
GitLab


From 4592ed6e439b7a5a54b1679cb2f00cf08e1c0d4a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 16 May 2018 00:48:15 -0500
Subject: [PATCH 0781/1085] qtchan: fix on macos

---
 .../networking/browsers/qtchan/default.nix        | 15 +++++++++++----
 pkgs/top-level/all-packages.nix                   |  4 +++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix
index e2213d35877..f6bc05371f3 100644
--- a/pkgs/applications/networking/browsers/qtchan/default.nix
+++ b/pkgs/applications/networking/browsers/qtchan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt5 }:
+{ stdenv, fetchFromGitHub, qt, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "qtchan-${version}";
@@ -12,19 +12,26 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ qt5.qmake ];
-  buildInputs = [ qt5.qtbase ];
+  nativeBuildInputs = [ qt.qmake makeWrapper ];
+  buildInputs = [ qt.qtbase ];
+
+  qmakeFlags = [ "CONFIG-=app_bundle" ];
 
   installPhase = ''
     mkdir -p $out/bin
     cp qtchan $out/bin
   '';
 
+  preFixup = ''
+    wrapProgram $out/bin/qtchan \
+      --suffix QT_PLUGIN_PATH : ${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix}
+  '';
+
   meta = with stdenv.lib; {
     description = "4chan browser in qt5";
     homepage    = "https://github.com/siavash119/qtchan";
     license     = licenses.mit;
     maintainers = with maintainers; [ chiiruno ];
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c281316e2b6..bac8f9dce94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17554,7 +17554,9 @@ with pkgs;
 
   qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
 
-  qtchan = callPackage ../applications/networking/browsers/qtchan { };
+  qtchan = callPackage ../applications/networking/browsers/qtchan {
+    qt = qt5;
+  };
 
   qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };
 
-- 
GitLab


From 3290800d6745e44fe42a6b518c45956c35302276 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 16 May 2018 13:55:26 +0800
Subject: [PATCH 0782/1085] libvterm-neovim: init at 2017-11-05

---
 pkgs/applications/editors/neovim/default.nix  | 32 ++----------------
 .../libraries/libvterm-neovim/default.nix     | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 36 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/development/libraries/libvterm-neovim/default.nix

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 480b749d201..b090b0c84f9 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
 , libtool, libuv, luaPackages, ncurses, perl, pkgconfig
 , unibilium, vimUtils, xsel, gperf, callPackage
+, libvterm-neovim
 , withJemalloc ? true, jemalloc
 }:
 
@@ -8,35 +9,6 @@ with stdenv.lib;
 
 let
 
-  # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
-  neovimLibvterm = stdenv.mkDerivation rec {
-    name = "neovim-libvterm-${version}";
-    version = "2017-11-05";
-
-    src = fetchFromGitHub {
-      owner = "neovim";
-      repo = "libvterm";
-      rev = "4ca7ebf7d25856e90bc9d9cc49412e80be7c4ea8";
-      sha256 = "05kyvvz8af90mvig11ya5xd8f4mbvapwyclyrihm9lwas706lzf6";
-    };
-
-    buildInputs = [ perl ];
-    nativeBuildInputs = [ libtool ];
-
-    makeFlags = [ "PREFIX=$(out)" ]
-      ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
-
-    enableParallelBuilding = true;
-
-    meta = {
-      description = "VT220/xterm/ECMA-48 terminal emulator library";
-      homepage = http://www.leonerd.org.uk/code/libvterm/;
-      license = licenses.mit;
-      maintainers = with maintainers; [ garbas ];
-      platforms = platforms.unix;
-    };
-  };
-
   neovim = stdenv.mkDerivation rec {
     name = "neovim-unwrapped-${version}";
     version = "0.2.2";
@@ -55,7 +27,7 @@ let
       libuv
       libmsgpack
       ncurses
-      neovimLibvterm
+      libvterm-neovim
       unibilium
       luaPackages.lua
       gperf
diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix
new file mode 100644
index 00000000000..4e0e87c19a9
--- /dev/null
+++ b/pkgs/development/libraries/libvterm-neovim/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetchFromGitHub
+, perl
+, libtool
+}:
+
+stdenv.mkDerivation rec {
+  name = "neovim-libvterm-${version}";
+  version = "2017-11-05";
+
+  src = fetchFromGitHub {
+    owner = "neovim";
+    repo = "libvterm";
+    rev = "4ca7ebf7d25856e90bc9d9cc49412e80be7c4ea8";
+    sha256 = "05kyvvz8af90mvig11ya5xd8f4mbvapwyclyrihm9lwas706lzf6";
+  };
+
+  buildInputs = [ perl ];
+  nativeBuildInputs = [ libtool ];
+
+  makeFlags = [ "PREFIX=$(out)" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "VT220/xterm/ECMA-48 terminal emulator library";
+    homepage = http://www.leonerd.org.uk/code/libvterm/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ garbas ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa6cbc7a4d3..33a47d15077 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10529,6 +10529,7 @@ with pkgs;
   libvpx-git = callPackage ../development/libraries/libvpx/git.nix { };
 
   libvterm = callPackage ../development/libraries/libvterm { };
+  libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { };
 
   libvorbis = callPackage ../development/libraries/libvorbis { };
 
-- 
GitLab


From 149a0dc1ff7490cc1572d383a4a8b7d34d02fed8 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 16 May 2018 13:56:13 +0800
Subject: [PATCH 0783/1085] emacsPackages.emacs-libvterm: init at
 unstable-2017-11-24

---
 .../emacs-modes/emacs-libvterm/default.nix    | 41 +++++++++++++++++++
 pkgs/top-level/emacs-packages.nix             |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
new file mode 100644
index 00000000000..9b7a0ceab5f
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, cmake, emacs, neovim-libvterm }:
+
+let
+  emacsSources = stdenv.mkDerivation {
+    name = emacs.name + "-sources";
+    src = emacs.src;
+
+    configurePhase = ":";
+    dontBuild = true;
+    doCheck = false;
+    fixupPhase = ":";
+
+    installPhase = ''
+      mkdir -p $out
+      cp -a * $out
+    '';
+
+  };
+
+in stdenv.mkDerivation rec {
+  name = "emacs-libvterm-${version}";
+  version = "unstable-2017-11-24";
+
+  src = fetchFromGitHub {
+    owner = "akermu";
+    repo = "emacs-libvterm";
+    rev = "829ae86f60c3a54048804997edffa161c77a2f4b";
+    sha256 = "1xb24kpvypvskh4vr3b45nl2m2vsczcr9rnsr2sjzf32mnapyjnp";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ emacs neovim-libvterm ];
+
+  cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ];
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install ../*.el $out/share/emacs/site-lisp
+    install ../*.so $out/share/emacs/site-lisp
+  '';
+}
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index acc087108c9..f81a921938c 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -178,6 +178,8 @@ let
     };
   };
 
+  emacs-libvterm = callPackage ../applications/editors/emacs-modes/emacs-libvterm { };
+
   evil-jumper = melpaBuild rec {
     pname   = "evil-jumper";
     version = "20151017";
-- 
GitLab


From 2e3783ed9407459b029346974f7863aabb5bdeb2 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 16 May 2018 14:24:22 +0800
Subject: [PATCH 0784/1085] firefox-devedition-bin: 61.0b4 -> 61.0b5

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index d0c87fd35b8..da5dae5f3f2 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b4";
+  version = "61.0b5";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ach/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ach/firefox-61.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "79f2d4d476d87e3a66b5985eb05b4c2c67da500c4f655fc917bea787b2745cf2275bc1a0a60f2a7d8edd29339f9db8bddac9c079687c212076e2c51811784ff6";
+      sha512 = "1170b5bd72dbeb60e71b6c7fc3b5865e10d32286a6f8be3e5befc46f45a978b00490731b59c4e54c7a53d2bc9efdc739a17e6605444cdc67eff13f2cacd84137";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/af/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/af/firefox-61.0b5.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "6bff0f1fbd1ac000a2d3eaa6b65e115a2d4ab3fb7d8c267f1aa13e0edc42f3f1a390eac87dc516b144969473106fc492ad471f696a885b8994db05c19e386a0b";
+      sha512 = "1cb816e86f02b0e2c0c1a4842b6d1b3cbf3da5b368dca6765555b3553c4b8f669801c93af407b51721216bb0c222da66b2653935246db24573950390672c8ce3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/an/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/an/firefox-61.0b5.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "26665a323860a567e6daf053324a895c5b639c720325612b923fc9c62365983c9d6af48274a068b51a22476c9c005e31ad6c95dd291bd8705f700111191cbad3";
+      sha512 = "5ed43051b49f887fda9fa8b684bbbfd3cc71112fd3c9c86dd4db476c2e4f667ebf92435ccf5ba8fd9b29591272b609056606df9c88897b3080a1d8e08fdb8ddf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ar/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ar/firefox-61.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "6b98ba510a4c5db95205ffb0a56ca3307093631bd905358ec8800a421506f7d880b599324f2a39150796d719c1d83c614e18db25933ff06980941319e648d8f8";
+      sha512 = "43e25d83401eab86c05da5e6cd9790c3c891c9e3eb584b07738b6cbd151e2552d745b600090f5b3d68812ea67fbeaa9aa64f56aaf97f3676ed68134656fb1bf2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/as/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/as/firefox-61.0b5.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "68650b9b92be7e65e9bdb833ef97320ad5475255e1b040487925a2172d16168bf0c36f70698379f194b7a41e1619152142ddc9e8ee46d4347b7d6b0de71946f4";
+      sha512 = "b149ac7f1a770a7d850ee2ea4e52b1a38eb540a36340c41eaf83325fe86ea501a5ec97de9e13e194699b41d7cebcf5bee136274bb078ac136d69043d116d58ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ast/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ast/firefox-61.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "11e775167faf1a9d6f1b1a14009ac8f45569156fec5c550cffc90abb0fccc601827cbba8b805d82df8cf2239caebad3dd35e3e54818af69dd98aef45d12bbf63";
+      sha512 = "7dbc6d9a3df0d735f679492fb278c010da450e7f313550d39622d2480a9a0692c7a4c776c3b36aeccec125cd1c6ea9d7fa3adcf48aaa284f0cf1fca1e2f1e6c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/az/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/az/firefox-61.0b5.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "7c5347d7997fbe7a540153fb931a1d6e143c6f9200bb3692fbbdd0b9b5e3b38ba9e55d7579d448bb63816d4007c8944f0bedb5ee446c4ed1ecfdb8e8957fc717";
+      sha512 = "62bc34bb261693ff94d5c000b3420dc34cb6cea35a7214789e402851b8ac1b5b8370326168ab54e4c09e2f96f9eee1d9d7971da3b926268676db32318386eb56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/be/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/be/firefox-61.0b5.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "78877031b48f257b7070d9ab9b261df1414b5e7447f0855811abdf47f35edc8f6ef8e59264a73a57ef5eeca0afa261557d18cf348cf38e48c7f0f24cc8b13305";
+      sha512 = "bbbdfd16eaa7bb97dc85495f830833dd9fe6d9411e710e0c9a08b8a7225901e7f9679894df83869d1b80654c6d30e6004c02a6fb7b7b7d2fd706b6b6a0dfb7db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bg/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bg/firefox-61.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "8c57bfc0361de65a0bc7a19ede9aba1af4808aa4f07e0dede04c262429489791c84c0e3f2a2ae6d0cb457b1cbf0a44a966f6f5a636bf897fa9475858b6922ab5";
+      sha512 = "f099adb83c881eb777c21d8c0ffc01cc8023438f3712836838f5daecc24eaefac791358172a5d532aaab3b436b2958ef194b34c3acba591e9403d34c2b5a6a16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bn-BD/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bn-BD/firefox-61.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "19f197b25b3792e7660d062341ed047c2983c6a375947c9c09b7d0c39b5630f88b2f0ea70b6865199caec8bf19f0f927f05347b85ebdd176f26ae6a1997747f4";
+      sha512 = "8bab1ef46fa23cc81365c271503d22b09d227056dd318cb7b340c8a5cbe866d8aa241f261a95fffda6bd3cdfc80c5a3bed45435176a1a1b8d427e06e3d1b0e51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bn-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bn-IN/firefox-61.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "09c01a7da3e77a4c07fefeb8fbb33317a90b14d5b4d33286152c494238da9436b0db54a410a57046a183786a006fe8e3328fd4a2192465fabcb0e5b2686a4536";
+      sha512 = "6e7113e561f37ffb33dac74a9511bf634c1bf8a912e3b13a0553a2977d29300b3404345667b995752a82ca785006b460cf9a1088c23e40ceb2516d67c098a615";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/br/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/br/firefox-61.0b5.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "2b8a1a9cb5127e678e783742876a94b8bdc25a0d392d90ccaa0747c3c7b50afef665bc950b20858194a2a2bc3617fe1421f7acd95968cdd67c7e7b88b7972675";
+      sha512 = "cfa60a1fda69464870382ded848f19b4915de27bfee14b34f429094381c7400069c3e6a5651cf8db133487957d0e4d9bf50c253a8a0884452285b5dafcd4cf0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bs/firefox-61.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "4a451248f826726a606b025b9acdf8b41fb3993906a7481aa60fe7110b8abe9b5206525fb188bb16159370ab9ecccbc199f0d1bed475db124c923461546167d0";
+      sha512 = "e78fd95675dd40877f1767b53e1f05820afc0695e0a30b0e5e344df1d8d5a38dfd3019eea1bbe4f37b09399cd47a5a134f7d984a0a65c35ca93b5ee40fb1058f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ca/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ca/firefox-61.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "02b9ad16ba37bda6a60f980293eb402657c612bb78a1911c8ae2b60657fbde2a1d41ff7849a653a8ff2f8c77bdb4d8a774d856ae90d3112b89846dcdec988533";
+      sha512 = "d11928a8807b2d1bf2b03ec7796d9950f5127186b4fdf38d38e6b129488f65b437625a3fe5654c45b134e9585458f72cd7d711c312f0e11acd67c941b3ede92f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/cak/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cak/firefox-61.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "2a87fd3ba1e96a7cf850c3795300e488f61cd29c17ef4f02b4957a9859f65b63e3a8a3479a56818e28dd08b2b7399eadf027b305fb10b5a4cb7fb7052c655646";
+      sha512 = "233afd0bb1788fa12b7659cfd99556721dea2914afe03d807e9756feff2c4e0749cd8fbdf1989add700b6afbe3c18402c9bfea6343ac7007a19914a2d8cb3c92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/cs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cs/firefox-61.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "128f7466d1bd1b2a091cbf64d9f521ce77dfc1ff27b4d1bd3bc5d9f297d6ea5b326eb822dd6f1f9a20220f1032afdf89f04296e1810c95e28029b1846fcb9c45";
+      sha512 = "3d4c79999c2aad3a4aa71aecc7f5f6f25879b76d0e19d1f6b94f3d5998b43c89a35dacf8c9d158e6273bee543facd1119d4129c31a8a4df82974b0d6819d94e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/cy/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cy/firefox-61.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "a99bb3ae930f47a8c7ea43ba50e6dd780b8aad4f3171530c8d8f730c395e4844fd6d4b37a1372ce5aca631b95a196cebafaeae1e4467f22240d5e0033ef505e3";
+      sha512 = "2c71544732e5bb89a9296ebcf2f6ac390c9ce438d4ced4f0668ce032e13f2e1fc96d26a8863c7f3979f509171014c600cb8efc9861be35a52084bc9d4463ff0e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/da/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/da/firefox-61.0b5.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "ccdd547ae7a31e4edb5ea980f55b8e58753e47845ae1b33b45bc1c3def18ba3a716cc8e23061038480ea71c43d682fc48548adefdc480ca6499ac3842e7508db";
+      sha512 = "1dddf978db1709a4f6b1ea71808fad8ffe15efd33eb83865736c9e50bdc4b4f3ff0ef7277408c538babc107d1fdd075cf1563af6c5684f1b98a74a3e5c72a6df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/de/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/de/firefox-61.0b5.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "afb82ce313001463da8763615ec9f6a52f019ceb1ed52616e0771081472455df2d252bf2e06700aa8add39ec1a6db0e51ad1f46026a1367cdd7e02ef070e3f9c";
+      sha512 = "9ee5faa668ba132eb874f3f0c0e05b0f905027e6dc1acb92d3ed951072d4484424a697c2db4bbc1b44f8815ea1f7ff0b222dc955a837a69163fca0a0c0c192d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/dsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/dsb/firefox-61.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "8fa44ec6ea0726cada8491d2b47675a283ddd669a0bc6d7708b3807fad6007941325c430f5a01358977d6827cabbf79ba57e32b816adf6bc846c2f729f887273";
+      sha512 = "b36ad6e52f18ac6e28a646b296db2119306dfe64704a2e6a0ebc4480c743017909ce38da8ebe544298db4dc290949d51734bf1641208a84d84d4d4d88f68d2bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/el/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/el/firefox-61.0b5.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "73cdbe7ecc09520bb3efb10f74b3792e079589bef18bb9e78f3eeb3aa99ebfd598fde9fb4dc1b1f7cca8f168f5677cf7c96941d1ee08799a41335faba1b6ddf2";
+      sha512 = "e8cb2fcd5f3ad44db46235593e1557ddf3a73c1a3440c67e43b68fbf8666cd5673be4ac84ee580088fbab536e301f3e7b6348d20ce6ba216df4bb2c2634ae568";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/en-GB/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-GB/firefox-61.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "53b28a49f42c2d5a18ea81070da3dfe08609b1e967068e3eb99d369b9e16c95683dcae080954a3d89231b2b136caab4632e9c79bdafdd1860c2d642ba46d66d9";
+      sha512 = "9028d5fc39cbfc454d12e24164f27e8781801c5ada6806b2c67adc0c9c5540d1930172cda78b25f3c1dcf96a6f53c8934c11ae0b4cd4048ee62f9c4d487e2475";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/en-US/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-US/firefox-61.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "1d68fb1e26f70e54e32dccda9ce56ba3d6ee4925c8a46ee04321fb88438df4cd9051772e3da23113f95d4ab684b154ac9c7732b1025bada5a7a71b03d683370e";
+      sha512 = "25ba55bc0025c531c1ed596355e5a0906cbd87959ec8b3a598827810cfcf5fb573dd572aae85e08db890ae6c514378fcce98eed1362a8532312f7f26ceb8bc3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/en-ZA/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-ZA/firefox-61.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "e694b56888823d91888c92eebd9778429f92a749453efc2188013c83dbb71c6b4f9aca31d0cf1036ff3e22cbe229bab266319fdaa0efe2b3cd1a6844f0dcf93b";
+      sha512 = "4ae8604917283517e0d7a94f13506c0ab68602674ad3378ff67a0cb78027a78f457225b54951dd11e471d0a4ca67a6beb378d0549f1436e2de59b4a352082c34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/eo/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/eo/firefox-61.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "b8007be22bd2e84fcc99f76fc2ac6edbc48b8f529ed055aab31dd7212ec3aabe47d7870a6812eec554ace6a41f98654fdce32e15620b872e9898bff020c5e56e";
+      sha512 = "91eb963b0fd032e02227612d98ec6693bc665d783448163fb5671f4af23c05c5c22199ebefc361f671b880aa23967a48e07164316c97433fb52ad03534363d93";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-AR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-AR/firefox-61.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "3b0998405d2a019b049b80f077eaae13ed7b562b5767a821cb73dcfe50d4c243267e5bb5490911c384a5f5e34f13e0338f768a0119098b1222671ae410efaa7a";
+      sha512 = "855bf9dfef4703d7bf4852206cc6103752d537370712db513e40ccc9fa708bd15689ee415da163914d3b5686d2ecc0ba696c9ebaa66ea0a7930401ebd2f373cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-CL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-CL/firefox-61.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "a28fe0c2be869e0038da0156601714e33e4e5ead47b9546e9328e06fb7c690b633f28c7f029747cbd438d4854ebe665f58244a18c309358d1877ff769557f99b";
+      sha512 = "6a23105b44d81b403ed01d46ced348c5ed5704e517b098404546a5ba33dd68c4dc631146a9e16ee0a55cb7ffd8ff320074657db53641f914193d338eddcaae01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-ES/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-ES/firefox-61.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "450b32e899da5077b3e633917324c93132682d9bab4da0f44e63eebc0e406c1ae7c5ea5adf2863363ba4cf8dc8b235b5f3d1ab0be790ea63f5f51feaf5c8723a";
+      sha512 = "34f7dfa2e7711a8520246efaa3629ffa783f8a3cc67cb19def9465ff4c3a3abcea4d1ce1df2ce9c65feeb050d2a27f21cde9d95a5681b61c006ef21c4d412f39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-MX/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-MX/firefox-61.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "bebdc8924ae2d3a6d329a86c838bc54e99335e087dac0696fa833e13af17b81ac2a937f7327db970e55fce04cb3cf66f645f8a0e15c3a421c2487a30e29f6d0a";
+      sha512 = "269af8980bfaf7db00aec2d385ec0eb44ba5836de791f698540074565bbf1c9ded54cfbb870014fb418aa3b451ab6fe3636223dae4ccf437a4d68c9bfc8dfb15";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/et/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/et/firefox-61.0b5.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "522acba62d532c6d96235862101f14cd0b7ff38bc52957d5e77783d3299820969c576713bd85c8c6bc63e7bbefaa09d0308110d3390594ac4612299ef8d751a7";
+      sha512 = "65a0740c37a2b09650bef4586306bd6139eadb43d4f3743c7ff0c47293e77b7fcf74f596b1982305b926a66277224fac3d1a190afd1bf2146503d3fafc8f3e4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/eu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/eu/firefox-61.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "799508fd282cc99417f040481d1988d2eb45bc2b7537ff5ee984ba88560819fb20df4ef0de8ed5304e5920bb7e271d05f1faa5e2400428a59ae8e25f4c1c3b3f";
+      sha512 = "17886662bb27dc76002702ef99e3923a52f6c0559d8c2341e09105ae6ef55bd3143961964db46f0a5c8738d9625ecddbb3c65bc9ec14f9b669be327dfad5aaa7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fa/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fa/firefox-61.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "4068a191f7a66cbb11fc6938722b6a1a5cc902f024d63dd1f27187d35d1f2d28e1cb17c74e73ee4f4b2ef10925d858973ff51a779314a32ed22a91b78c2fed12";
+      sha512 = "82eabf1c23e28c5c9f628a4dc3b6ad73568228422b33665b7fa9b4666a4defb79cd118072e0276a314b4f5580317478e6f2df4a28d3ad8a7f82f87b0b688160f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ff/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ff/firefox-61.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "051d7945af28916ccfc39647617f81041f3fff0cc305027dce6408ba7575213c0cd1064d2d48986f4b2740533c7c770ee4b28802b9cde01681fad5baf2fdf27c";
+      sha512 = "e8563b0d1722fe1323ce27418fe0f3596da9fcfb9cad18fb3c09ab31ea86aceae7f91a64aa0511d98ff883e4bd27304f84570271bda13290b5716cc66761f50f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fi/firefox-61.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "371f8f0e5d14323a5274923d6745a3aa327b11a18b06b3ff4f4e1c9843985a83b675cff17fcf0c6927d34e771a56a1a605248b32cb04890e202a14251e0ff13c";
+      sha512 = "4c439ed929ee67acbc9c58428fce3a47beebbb6ef1e4ccd89609530758f113aaa88e8051503fcf93b665d702a4840ef5924640019443a1ccfa844eef8b2da83f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fr/firefox-61.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "0b5270611797881954b4c2ab8a506ad8104b895c33fe0ee32bc786e45b96f9fad47dfac84955fbae2091c63bf0f7a0c0e189d48366f623b2740aa8bf0115c0bd";
+      sha512 = "0184913e520efefea6eced2f54af3ddf0f0f19f419ddd788471c9bda3429d732af3dcc281c45a175fa904581f48c5f70ac0a9fb28d2a412aa4d81aac97255142";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fy-NL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fy-NL/firefox-61.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "a48ac0ce28c4a689afc7196de17e4235709b239f4c1b6c1150ae706dedc858edc973291998e6f72e36a233c5c316848ae70234fc6c7fd80923894947f2897bd3";
+      sha512 = "a6546691dc61bd7023a61c45bdadc3158e6362185b0b3d4ffa20195d1e67d3b48856b557a714c813f1b389176d835683ac52dc1cccb8b08bb04fca014a2e380f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ga-IE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ga-IE/firefox-61.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "d96b456a2e77dbc0ddb47702c94772b7f75d58ce9fb4473c7f9b4455461e6ea5e0507da2128810f194a74ad6f58d5c3b373a501a1d28ddf7111eb90f9d2e3851";
+      sha512 = "d4cd72a92c0826788b886135ebc17194ed265cef4cb9e1d288e27638f7467ef34f8f2be6722306472e8bf62e54c11524574f21a7d5ba97e2074daa7257d1b8d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gd/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gd/firefox-61.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "4c9d9adfb6236e011c0048810716a9d44e6251d2122443f7be1a2761fd12ef085c4b8aec06bbdad54d056962ada81f8034d3e87f9dc17551ca74ca9a0630d304";
+      sha512 = "a7fcc96ac456ca06ba65134fea19469c3e1b725b3bf9683c3d6bd2f9a3aebc5a6d306e5dd15a2e05e58e4b1e06621f20a2e446a3395cdf8f20f1a7a92d1abeb3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gl/firefox-61.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "fe6a9944ce2e595c436aa3aa4556d3e24b2595e7aa3cfe54eacdb23d16d461b1e0e1f4ecb1185f776f19b9f7ceebc01177d624443827d21c5697755f92cb4fbd";
+      sha512 = "1556d99780c2c9b0f8b99fc37c4299322d518cb22486ed1af7a778a7f3979acfa47aa333a65daf337193691695fc7101503c81327d82a624bcdaeeecb6ae8b6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gn/firefox-61.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "5ed38fd1a5d0414c95c0ca1ded08f3f31e9a3bcc3860a3127a5568c3c8891a958071d1923a208174d27f479811a9053b0e217fe81d51d130b15b8c5ff8ad135d";
+      sha512 = "31e0e6c4bf116ff1a0c1b5d7c6548ca3d629cc07ffe83c2ac82b7c681321aa57227ca6c89a28b83f4ee96ed9739a47d83a02eb3782cdb14480b382dd46ed073b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gu-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gu-IN/firefox-61.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "b6f850d0a828b24d0c81be758aad2402b749701c09f40c19d47860aa6e9b8e595c223ad14b94560513044ab9e96113bd509aa049e8caa6ce502ac005fd59cf36";
+      sha512 = "f0fe6026339b49d59b8208e6e97d3645be34b90c37152d76645cfbf14a418a97d37bc3cf3fd733a41d085b315d5c975cf88521e7f85407b54ff83e8ecd0ebf8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/he/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/he/firefox-61.0b5.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "ff989985b24a8b4ea0ebc9dcaa73406b3031733d925477487b4ec53ac5dd39d879601bacd1a69a1190c0438df1403adf9fafa67419e098ff618c1cdf1abbb86b";
+      sha512 = "32288fd8ead53b0eb74621301d1d0f6ac9c66845b65ecc5258d2f1c7e913e83a25843268e6ded535c81a7b536a3112e58f0c9f70d39b186a6726c119dce6ba8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hi-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hi-IN/firefox-61.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "ffae6c7f92f2c4dc83c65aa4caac0baaef54cce44e7da771a5523e57c15c2d1b2bf4685f8a9fbf0c0d83a234367ed4a30e037e8855fa909fcc3cef2e54c4e01c";
+      sha512 = "a398763f1d467b6d98b864afa84113ef59ccbaaaeeb7e730f65d8d898a534e910b775cfff1088ddac4cb7c0fc714be2f98c6b7df9e30a751fda1f3727228c51d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hr/firefox-61.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "d63f360161802fd7a680a412bd11ebd47ddc33e234ea97d9725b58ad35c7ec41b598497847077e991a3744024a384d5fd636d66c9f2a31a32d59040ee684700f";
+      sha512 = "2cc3e64cee65d4ba1d4a4e755430664959bb5726d575062d2147efab9eab7c67797c6236367456e105b227907171bb169952ed18a0f8513677490cf065981e16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hsb/firefox-61.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "6c5cf6db753f03a108a13303c2a4ccd1be0a8a7dacc4c60de95beaa0395c41bf93921a81e56cb8f65ad7d2ed6e45177c80c8ac9a516e5b72b23942016b62f78a";
+      sha512 = "774f60494af13245f3642120b7401fa3a9a98dcf53b4482141963f7458e6a1be4097161938a3aa2bb67940f0dd22f4ea447098d907d1dcd55b11bb89a278108e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hu/firefox-61.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "d98013b7aa341be6efce51e9d7d61668c232958066e8e3b9ea7a8ff886450946b30b9ce089b0bd4c12e43da85f922d58be37863eae552d76a953badccf135514";
+      sha512 = "dcd4955e1a61bd5e90e7b26dce4daa71545b337245a42b44ec5af9d7a9cd455b4892cf52f219b370a974d5d296f1d93ad7625fff45292fa7711bf36139327799";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hy-AM/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hy-AM/firefox-61.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "044962ffc10cb00cee9c7a4e7025d3bc08768f4b955a0df9ec8e183de27ac06366b9cdf4a07611cee23fafb27258e9ddf0b3aea4104193d9ebe58577406cd7f9";
+      sha512 = "105efbb4f846c61777b3717e377167e5e3dddd50804c52694f4641756baa2350f54ea01995deeb0a751b23619c55b1806cade1ba1c3cd7f7cbba23206fa19f7b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ia/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ia/firefox-61.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "3a810b0a95babf1e51fc02f54d2be4cfe0a3596b216a85c1e676f7d90bd322abb63d9ad1dab135d268d996fa409a30d6a247d14f8780b9c5daf7dcb09e3c49e9";
+      sha512 = "2ef057899464c031f224b0997138dd1611aa0841f2ef2f611d8e2b9ab3849bf94e287b4ea8e08e905f42a92e15f9023c592a454d56f4ceeb7a8a87ff99c0b0fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/id/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/id/firefox-61.0b5.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "2faf68616257b9d4a81677676fa86c014fabcd0164d9b851c37176bf60b0495d493c5434d5f677b7d29c91e97a02aff92d3d3ec9449f5df4c85c261410492785";
+      sha512 = "9d6fbb4afa5255bb77daf9c99412b8bfe44a9d841eb1940e18611e2480da2f7f4fd18452c49b53880832ea671967699de9a467405cebb17fc268ae3a7aedce6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/is/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/is/firefox-61.0b5.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "aa312acb041a1d8f3aaa6f85c0bbd09703d1c5ae972bd80006b929c415dfaebacd849b5297aa2f6d047cb4f21df601a71b3143c451088532f3cd116199373fd5";
+      sha512 = "a10300126f8937686d03c4acdc5dccd9570d7de29a25021fdae22d03fb3a87baeec45f35bbb3317888a34f3282e03b2b6ae728743863691f4af691d8071ab567";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/it/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/it/firefox-61.0b5.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "edbb5f0922521d17ffe3e3481ce5ac440b48af65bca441166c26cd9b1b9a12053b6212d3caf29e4f2b32611ce846aed9e157a537eb20f5785ec8fb92990765fc";
+      sha512 = "8b948d7c34a13556246a2b4b70383ec847daa70f623e121449e9aa380a709e38ef40e9f864a3cf7613ce549876452c880dd2438d75315a3c8eecc3ee3230862d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ja/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ja/firefox-61.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "20d9c4e1cd8515432163daf732aea418fb0eef6f164c9f72bb8519c896a2e119a4774c00308d8fe49640838d166da673f5def9e99af2c88adb3191cf94ac545f";
+      sha512 = "dcc93cdce7d1d783478f85ccee378638c206221efb5ab5528ac2387d9afcea0a58370bd84668570902e03cb06aafd580cab2121d49167ddcbb6ac5e2803d6cb0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ka/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ka/firefox-61.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "291ab0b8da0b4ffb634967a298499b880e3fe8aac73fbf22cf90744aec1ee2d0eae38b32a970e4650243de5aa547986b78bde59e241668be3f363762922d56ed";
+      sha512 = "8de7b0c54d5d05da9598b449015d505813688f1c448a572513411acd9aab4720c03c15d6d342f84255cad7d2edc1891682e0398b9cc165e812704bfe9e07d8fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/kab/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kab/firefox-61.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "edf8a27e6a745e2ab7db9cb3a5a270f50c12bf089846d9050176847b29698203c7a298bcce311001d69a22a3049e34506c77bfe08b6dca3b2f2a8a9fe9dab54b";
+      sha512 = "d8fcf05b0072b03336b67df81eeb16442498345e624cdc68fccecec07d89a39df95b832968c1ed0108c0821ec71a89757d62fa9657a451f11fef25b0da90f918";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/kk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kk/firefox-61.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "1b3972db8aa56fa61b7729029aec794c03b20378b7bbfea93dbbf4d14b9b9bff3be30b94fcc214531bd0067679c5dc5fc3bded774eaa9da1582706166331923b";
+      sha512 = "13e135e31e44bd08c784bbe5222f14e220579aeb1981d1d91f0baf67cb32157499c6de4be1ac7086d001ad6b36c6adc44f32f4a9d8f0aab727cea8fd60937e04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/km/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/km/firefox-61.0b5.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "210d65fbb16d3f63e5b94b7df2b33655fe29dc3bb1707f0cff4875f480b7b5731aab65306ccf8d19c78041284bdc6343b5bfa195a03503a27e1e687ab14dfeae";
+      sha512 = "c99b28303f9deb522c9e06e5c858316314638312607b64734ffa681aedba9427c0911810c87f286f1a785b77892e6e38a2a1eeab492458ff8b9a9f87de635577";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/kn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kn/firefox-61.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "081d883a7f9982418347463a1bab7a361ef915654314b254993c22e1cc6a37dab197950dfc742dbb76c2e520628c12ee190b33d12b89675de3b87adcac4fd389";
+      sha512 = "cef5bd55f8510f3ff865fe8e04bae593badabf59ab9251a336a886b5af9f91a83502bb612efa8b0b295f18ca1b42da75cc3d328bd1916a10478de847591792f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ko/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ko/firefox-61.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "f00a78552a06c759f353d39a6a3abead6d10d8f4d7276b4eee2d81b7572e96b14aeb7801f6382fab96b355264f391093726bd35b94ce4e4c97d221b0eb18fe0d";
+      sha512 = "0bc85a9bc5b4284db80cd18d414fbe49dafdefa58f62d7c0b83a06a1e0c6028721f7d2624a1a4d948df16bc316259fd27ac2766a55b1989f37f52f8fc9d8c517";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/lij/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lij/firefox-61.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "2f681b55c324601f297f56b7f7fd83af21a4a176602275d00f75f919923d6006ec1c7a5178877aae406559f2d9acb27de89aeb9fc94e14e273b2729eb27e5fd0";
+      sha512 = "e35e81dc05f83f371846c9d31bf62b69ebf4ea28c6e2a53821ea6509b4da8d575ea7ed616d546d900c0559d2da7280e51bd7223e790b161787f9ee85e2fc11bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/lt/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lt/firefox-61.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "2c7388340d8bf4dd7163e7515158d79da26428219f3b2c8a11dfd6d04f85966fde0013fa4209c297d28d8b6bf6ddaed6dcdb3209e1cf3ed6b359f35576d64d23";
+      sha512 = "9e8ff522b661912c1d6cdc440015dd23ee2768aa159c157f29be574baa8e74760311e623c6e9d3cf4e23363b5f05a5d3ea74743b6f95b256045418c21e904194";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/lv/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lv/firefox-61.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "c6f2d1c64793e63cd9c5f0a5e0346d6d20af95e8ee46e6a68c41a1af7c584137c2cfda7c9bdfcce22dc23a0f7f5b9dab93117d52133bf78b94a6dc78fa3d2261";
+      sha512 = "f6c1dccce1cfdf0b92dfe076e9cb131763ac72bad4d12610e7baa74ac690b25d567c796b8a3509ad7b80b2b44a87bc0ef41e52134d2699573772c851b3f04cfc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/mai/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mai/firefox-61.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "c1e0b25fe89e0d27c27942a3c93b2a5f1d861620e2b5e2a077952d806e66183319c5613b099afca667564a9d3f55109b5acb99a5b33da3e8362eae873099b83e";
+      sha512 = "65db4e9da91fa1033ae5efd14f60ffdaf6b1730e9f51f4bea7142bbe678118db19098d0e967b6ef08b1531056efa584cca6519aa0c5c490008ca740db6a8c50a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/mk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mk/firefox-61.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "b1da2340de04e9535461cd14e8bd203975b6d570d214288da2af3b1b9eeded470325b5a1048e277e173fa3159e7ead212efd4c10748444469ab90ae8ee36d49b";
+      sha512 = "0565dcf2e97431b5ab728f8c73e5b26e9a411f26d712c3bfbf9f61cc7a719b2a38578b13f2ab8ba5d1e054a59b9e1eecbb5a39cd188c772a7d5dc57678b9f334";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ml/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ml/firefox-61.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "41e686c0ae341a4f3b5c89c1c3f583b05d78fdb9b45f51b4791cb0b6e8d32b08fa4b1b98d76e9e41241e90ffd60a43d0a1d43a3a33a20d1f24c1a0efb4ad6f43";
+      sha512 = "6573ca6f2010c57e9a6aed6d6e14587097329e1ae144b4bdfff0b0e10d0cd7a0bcdeebd702460b9c4555480c81e5244f0eafb8592decc7d92ba8785bb1aa6107";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/mr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mr/firefox-61.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "3ceed12270a4d9f8c705d6cabc11e362ed56c7ae9d8ec550abeb3fc1df1a727dd836ab53a9301ccb10ac4f6c0552f614452c23c19c5371b00e5eae85ccd16e72";
+      sha512 = "c2b613252726a185af0acaa181c455d0e048f3895fc9b4c781f25ffd8496c43d32a3f5618df653f79bbcc403c9bf869df327fa31463515b5fafcdb7463f01e9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ms/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ms/firefox-61.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "e4efd20a943b934c304b8a1a873dcf70a8f48e5d5c95314c7ddff0c5030afa0d80868b6f1bad6dc553c93d28c219183edcc474ae6a9905c26b2c4bb2a10cf9b9";
+      sha512 = "517370bf3ce8d0ac8fe765d93b47680c65698c4de87504d391b67b8605dac7f1e55db38facb8dfc4e35187828d41a63ad78b4d2c43cc6f2849c1d5f9fbc4e2ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/my/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/my/firefox-61.0b5.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "7f9f8eba68930d62624321470066a25ddefa3c85df9791829633cbe7c23b928e1e00e7682d8d9d11added730be19087d68701ca428078fd3bbf21dcc69ef639a";
+      sha512 = "8c84e5c6e4106ff4118c124226ab0aff24cfcbbc925196b9c9a7b636ba975babd707a14abe2c5e0bb3afdd00d098d75dcb060a448c00f113e4a33c0cb884de66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/nb-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nb-NO/firefox-61.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "184fcfccde9ec2190ef34cdcdacb3781c7f4d003a79672b78729512be1b899138a10f45e4570b837d5b4e64a1db13c1fe3bb0f2ca16defb5315dd495b1dd18c3";
+      sha512 = "58c2d937db74b8eb0335b9e3dbcf11bf0a1bc8bfe9e5ee55e9e3ec6cd9a7f16b23e48d88824c2dda3d7f1f1175f0036757f0664aee8d60a9aacaa2e559cac616";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ne-NP/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ne-NP/firefox-61.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "19cd13b90d7cc501d2198019d05d33ab8afda90cce2fb805648aa5be8100f0ff15f4a2898b33e3b2d2a39f847ab736b87a77d0f8edf64146a0a5efc18b38df9b";
+      sha512 = "ce54ff7f7a4ecacd7ac73e48fd35e0b39b96a7e85b184f77ff1ad66ee3f6d32407ee58ca882afb2cbf65673d9e868f8a58962602097a40f5b0ecd5ef0a038b04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/nl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nl/firefox-61.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "6f716a77ad36a1c73103cea5d0c3c7021bbf70e33cbdb4d7cbf4148036a2888ffa6fa64e7e386038ce247e53e3538538c3cede0e8f1d300b393343b32f59b5c7";
+      sha512 = "e3bad92c631d647fe634b468c27ca1e2c81a69d14ffcee3a32d41d2d21d95f7196b2f8c426e51e81ea4f920ee0983290597e0b1edf68e182ccb7d87528da49b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/nn-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nn-NO/firefox-61.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "6c44f966dd099fdc355245bfd96edc6749dfdac74ac711ede0bd770b43f154927d78dd8b3413ea70b3992a8a2271cd6e67895fcb2e9fc5fe0b4488c6ffcd1c98";
+      sha512 = "470d3662816ee35e6af0237ea6b9105483abf538928ec4cf329e596fb7c7b6e73ac6b7508e53e33cbbeb43bae1b115562d7c8c03721fec6ef0e3036576810963";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/oc/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/oc/firefox-61.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "dad6e6c63936b40e5a05dbe7b0a8dd9dcdf9ed8b80b50963067dea80dbe4c95e13ca890f0b7c4e3c134c1a4db8252fb03bbf32534ffa74d6de1a7213a43d2143";
+      sha512 = "35711515d5fc70e8c6c54d2e5f31b34cbe98f8ef21bd25135f64332edda1e5c336c24403f20b4443999354caacb3066b805d66ac7b7f6165bbf3bd748983702c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/or/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/or/firefox-61.0b5.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "5c1fcdea8c87acb46d74c3fead0da078316f8fc5edb97a379b613c2ec992c24296dd7e83468472f7f453794f6079f485724d154ca70c87483f803b17bd770c32";
+      sha512 = "21475be0c1992ee07b5a2cbfdcc0cdd25245c995270d93ee08c1f6bd01003809712af71edbe7be7254acc83cb930c0d26aeb49326aefe6041b3aa92169f2db65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pa-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pa-IN/firefox-61.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "9c60479466d6dee01492a04250f77dc496438ec8f2cf3888f504df20a014f0e614a3651dea6eb4617a8eb7ccceb04415377edf04e87fb6bc01eede0ca41cd195";
+      sha512 = "18b75e3122bc57cd01a98f81d922e325a7d1ebd56b09963a071a14d05ba679d51e251f0d0e11a60c832c21e5022cf3a6e1a5292a525ab53e4c2c5b222a3442ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pl/firefox-61.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "cac19ecc04fe84e3056c77f6c7ab2e497671cbb5900be1d7f8d296599d0a8a892d557a13711a46b1a73fbb0e0d30dd51a70399dd08680e5e5b119a7bd6f9443c";
+      sha512 = "687465367d3498bab3cbfe31da5b0b4c31414d75d7af605c9873d8d2522d8502d3dfa271334e5045537b840e452f6dcf65a6f675c653cd07174b1bfdc6a95738";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pt-BR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pt-BR/firefox-61.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "580fbe7a4ece0ebbf08a4642d83724735f2075bcdbfed5d9883e8a94fb5708bf2496bb72c5357c53d7db995e98db7636f4a72da8492607ad4df5c1699302e95b";
+      sha512 = "47e5866860fb3bef65399e7e3015d2486bbf427970107c449122b6c613a90af7d989c352937c39766e5839dd6c3fa31bec59e52fa013fa983a64125a03be228c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pt-PT/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pt-PT/firefox-61.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "6d64a54de0468261ad3ebdbd96b390dc26bd11167ce93450f651b20167fb3796fb4a30aa5fc5cbef2c48a48637a4bc4b5f79a40bddd2744c89038ba339814b61";
+      sha512 = "d33b77c954f66d0c575e7f2cf1c72e0a2da7ad9faca7c8934f96f8c42261f2e2c868378911eb7368ea05dd3a63207eba4cbfa89262943f2e551920608e0fad9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/rm/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/rm/firefox-61.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "faf3cd4948bbbfef3ed8f78bec64ac2aecb27d9a6a2ca695cc0cf79d44eff57450aaa1aad25c65b6bf934df007674fb2e6e97979798990827e01c5e17bfd96a9";
+      sha512 = "439df5fc87e7400c428c9e3c221d28b23df23a380ad18f441b4ef97149e473fd63185617769217a0fb20dadc2cb8277a9163b95ce580e5c7ccd308acdad70c71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ro/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ro/firefox-61.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "563fb9c0b44eaf13a82d8e8ad6a4cf45e5fa5ace7797b774687a1ca779bd8c455719cfa1ff2ca567323d4b282135e9e30757be8d432386bd9875f4c32bfbe391";
+      sha512 = "035eb9a6dedbaf84d3ac03afb68884a1431c37f0faaff9c02679a3bad24f50e22ae7b8dda1d552c8f50ab267446c32435ba18c06afd8a561ee763aedc323c7fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ru/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ru/firefox-61.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "5598552aa4e7cc7e97f327343cd6e5b717b8aa5b1a80e8955f08c37cbd87c3baa6fbde9c1bdb8be41687fa89d0b93d2720fb106193ba50efbd9736ac47661845";
+      sha512 = "2de2fa51df5a6bb63124f83b976c9f330122b44b407716f3db83465dcf998c667af33ae86ce63989099e92bd8380cd216f82d1ebcb327a55053e31902d4e0923";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/si/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/si/firefox-61.0b5.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "0a5dfd926c217c84b5fb022eb9d60e12bd9869a5abe4c2d8a575f72c8b1bcd6bcfd91a40d2b41c9beed97e5611f400d99546db3bdfb2ab77267f0babf843b091";
+      sha512 = "12ef4e53dcdecafef1446cca82ce7446ad9aba0af9a4f8b83155d8f1a4447a3630eaa39900fb52896e12941d2d9d2a699a1b2c848d7a08ccb3c592a8c0eb5beb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sk/firefox-61.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "483faaf1444715cea3f576db1b90963da3fa5999545c16f66506f60659f803158c5080f513bcaa0d51de6c56dfcecc1cfdcc2d7675c26b1dccd31e6ac6fbb70a";
+      sha512 = "129d2f2b41066cb2a0c476d6f75293ce70cb026d525334ed1218defb0a7dd8c432bef7564b008885a6fee277c3d41ec4015940c740e5018b1ccfefb7ac1df50d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sl/firefox-61.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "25b17017b66ad20c1a895819fbbf4b5d33b536a14991131af6be536033376e53373b82aac17137bb6599672c179de9e039a71f468450ff9fa370a971dbee4162";
+      sha512 = "8d0d9a27b5426b4cb6908fbb02c26fac6af6564073d6ceb94fab9f4fda6786f41f0cc8f115be011bf208c3625ed165eedfb69935ac9fe190121f515241fa8a12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/son/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/son/firefox-61.0b5.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "4334e40cbfe4c531f04362bce012e03428138ddf9dc94abb75a94b76c1ae8881e8552b82b3e7e608bfd7a4b8684f9ad3105d65ed7fc378865b003e25cc389b3d";
+      sha512 = "50c6208d9254cf877644c0b409c699a9b7de393dff480c2b6c16fb342de978222c87e5766960e045d2b860c47058b5fa59a52a3902f55169723783ba0a19a57f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sq/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sq/firefox-61.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "355f71742b7f7de9523c388d3debc116b79cda128f0da877401f9a664fe0985edeba82c9a1f3819a8b0132b20b7f596830c94b4d49f57f6b924ce07c5995e410";
+      sha512 = "ebdf94a268c03eacdfcce2b5521d3e721c3487c1eddc80e2783bc210031a0cef484bee4d0d3622ff636f7524c0e9f294b0fbc0c9d7c6ca9ef9d793291f97e4d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sr/firefox-61.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "c095d671593b63b17bc48a0bfc1683b96e0a1590e15735194a2e8bd9180df7c6484165ffda4e2f328589f1afbc561d8ef3e79d1474c91734aa77ebe5d53c7a67";
+      sha512 = "579d7bcc6d85b375b9443df06813d908bbe30caf50897d22f958c564acba2aa54cc4b8671097c7d094ef0cebf32f46d88de7ed748590d70063445360b73441fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sv-SE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sv-SE/firefox-61.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "d9a80a6e41703831cab25e9ae7237d4122dfaa5bf992faf5fd5ad16d9dc9b5c6ee5d1919b25b545c4a2a9b8f52838e5ffc3af39f69266f9a4629925be1aee424";
+      sha512 = "c68d38b7f7e665a53c4d64d92bc88d7dd2254dbd8ad3d52e4dbe463a04186e54f813bb455c9cbc9e6451c8752bcd1fb5ef22cce5189fdf2c238a7713b2553f4a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ta/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ta/firefox-61.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "6da53d55c5ebc813b6c2ad8275745ee2d9b93374c1b6bbf4cfd28c490210a4828655ccffc9c37657892bad50c9b08c87ce43a587126ab58131a50217e626818a";
+      sha512 = "2159f5a1d5fe6e5adf10dc575fe0540a2036bd26a9c0bbee7f45a0b582bf0ba0515a474f87ac6a7d7f79d743bea37e51cbd2a5c057a3a934d8e480b38c5affc1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/te/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/te/firefox-61.0b5.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "75d23d05b365d2bd6e06a2c737c3febb7e45c0ee944e26da78f5bd247aeb5853e5abd1ae638f95bc124f3657b23d457c62b9a1595a11588cf13bbb8528ada3ed";
+      sha512 = "291546ed7e8bc5d540835f8d149765765f5f4dc77b9f199e630373c1302a03c0772dde530b9ef391ab801e921a1d1e5ff407a233269988076e49dea6cfd0cd8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/th/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/th/firefox-61.0b5.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "f43d0c98bd1af2e19c6723bc4a4c28dcf594bbb37ebed416d0493883a4389c79d47f6d63a844a3d2f1c6ae9a84670f059faa3ef3d5ed01ff4eeaee6573da7a76";
+      sha512 = "1b1c562bc9c0474a2d2313fa02716d8582b92af343ac0061d83f5266125533cdb65406e93857bf36bd35c6154bc0ef96ba5d963644df039bdb75722c177b4249";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/tr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/tr/firefox-61.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "a6ceb28b89763e46f19307cd6f384dff8c8d7b69a1c89b29a40653b88bf3ec13955247d565c72a0df47a7ab0e3bafabf45b59fc6a22fa3ac6dd3213d3629cd80";
+      sha512 = "a0a30765b877d6278d2e00becd63bc29778dc0898edb0f1cd67a6e5e8eab7a840755539ecd7b7c99c6abd0f92ad4ca56356be7b8201d2203e2973025350ab94d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/uk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/uk/firefox-61.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "64332b903dec3002fdb99bc4c13821c830fa29db868c37d6eee4f26b46cbd5b6b2c2b6f9aa1b2cbf36e5a68b7a18ce068431f229182c8dd380847550845e54e5";
+      sha512 = "95edfd17cc60fc097451742cfbab507ff2456d2621132794b2c4c0997a2bc9dd94138e56bd1ca0f3a43964fa5ff29c2d21aeaee2666ddfc0adae798a84207bff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ur/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ur/firefox-61.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "796361fbbb849c1ebfd5e44d97443c151be90275d101c1e124def82073cbc9ec22ae4e88b1767896f4ee0edb6b1ae20de508df1fce99a0846b4388b768ca5c3b";
+      sha512 = "58165e2444ae10252d8eb81e55d2845c627315b8b1889255e54d6251edc571cbe42a6616a6991fa9b5cd45383c48db7f83069eb423c6951732ff92aabb3c0033";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/uz/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/uz/firefox-61.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "2bd641e76281fe1740890ebe91a4d87326179d5b45683d5667d523d2ef3300213342ce027578a6c510b46939cfb5d1d3b25b671b17095c9cd22cc7a8b7920a42";
+      sha512 = "06e32f99550442c2a42f59423585f9821284f930a252d36c189f857d874cf8d7ec24cc26717509add8402147ed2d7175c937ab48b22e1a6eb748efedbdd29d2b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/vi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/vi/firefox-61.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "d6f14d45db8551005cd37e386bab3ba1cef2b58bc3b5925dcd7fcb83627823edb9f49ccab2e8092158b7ea83ad263cf01635c9d639873581558234d1d1664a69";
+      sha512 = "d88507f09710c55280ba4df1226c1d941d35fe29774dc37474a0b5e61d0b296d9c7a357af21a83a4394aa1d86c5bd2bbb320f7628875d9c9e7181086ce301b06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/xh/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/xh/firefox-61.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "0bcb49577f8063b2378e6434e41429205b6ecab7dbbddb071b5a32f40533c2c2c1eea65870cde99a760ed0be34b7ceee4ab2f1a2d5cbb8734dfe1fe176129991";
+      sha512 = "c81c4766894a5db74e5bb73525f4b3ad69ac19e25f877f4624197518a3e75396041dcdbf481507a880afe29469e0eda59dd4ae7a3be50cdfc0a3a77b8299c021";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/zh-CN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/zh-CN/firefox-61.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d0eb45a490fd8306113176ad3c42b7e8ab317db4f9b9004c70206e0fc51c4fb84274ca7410732f2003afa058b7f2c8ae2d1b8ec52f58d96ed79a2210db23c7d3";
+      sha512 = "d58e2348efdc70960ea475533c4dd9b25e581024ebe2810a7c103d2a842568ade2bd4a53e27dbac1f2ff2ef70481b330e59d7647234ccb34480bd812f6552398";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/zh-TW/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/zh-TW/firefox-61.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "51f43754fe3840886a3e8ba195055bfc597eefab9f056ffef25974ebcbbb3b05ccef9b35c99af8b5021249cd076b10a5d40307fca31b18f1b7aa315f0a9e57f4";
+      sha512 = "573669040d33b07afec48131953a368fb9cd661358c06b6ce056514419e6fd51a8ddc4c546f0a40ea816338b6f250ae4841f7f9b7ddf8d3d57e73f34ec55796c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ach/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ach/firefox-61.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9787c6977c6d50b2c9b2f4a6bbb3ee43a5a8298858cafa24d4abe0bf6bbf1b78eabadfd5b27e69f9fe96269f7a530bc6d0ec0c7afcc6800d88841115c55e5fcc";
+      sha512 = "22c99c2e64ccab01af2723e6edec7a50d7b2b4f9f0f5272d502b6d6e866551e72c570ea140e9283b304d1af4cbc86300a0c7e54478076554df8bcc80c9e33415";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/af/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/af/firefox-61.0b5.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "61400c29445bd6d7c2b5040788dd6db236678c6fc4f9a7a23414f97757e70cb235ed6d8c39dd35dca66924f40e62c4c4460f3b11cb6da57e2b6928109c2a661a";
+      sha512 = "7cd232ab70caf61a9202f2598dd85be49e7039fa1138896a719fcde3f63cd8dc893ea4c0b9bd832cf506ce7b9c235d84fb353ee625ef0c70ca3e26c2c1c69315";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/an/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/an/firefox-61.0b5.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "cb9dc92f0c490accb006e0fc6d44c37c415e8df5b06e97f0d004e53e5662391b09e0def195c6f5ed41b2c5803f966fb3a151f140e048ae12b2f7aa1ff537fab6";
+      sha512 = "b73b7e75d08e8476b7bceb3f86a0ab7d632e2bbeb3916b13a2502bfc4964ec1f98c6ecc6941a92d19dcfc29987097d69ec27711ad011db5f8205f79120fe7904";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ar/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ar/firefox-61.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "fbb4af4bce19250e42e362c43ca68b00080020673691b3917ade54e35028908b8938b924a4a8d1b4823a24857c10324b171944caf21a16b0f1cdd6aef8478905";
+      sha512 = "6a8c4ee3f89bccd1fc69e8b896b3a66f9086272deacb0f112a36335a432dd3e0ad6d3017036b931fd7951503b8e00d8f11588fff118d1051702a0477cb360697";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/as/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/as/firefox-61.0b5.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "5fe55f0ff65e819ee7ed194a0d2c7a0cfba052e7efc6fb813a6faca7370031d8a679beceefcac33edcf221de5a5701badcf29276b1f835c39eb8665207147297";
+      sha512 = "6a84acf5496974709c2ef4220cb56d4714d5eb8b4e731de17e4cad9be9ffa2e95d82440e0e79e19dc8abe91e56d67f09c4505f57b62c4870accfe1d4685bd97c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ast/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ast/firefox-61.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "129218d8d08c39e118a47497e38c3cc30fefddc6a08ea363a08341da4da85b1cf2070a86b34ffa75038b27366222c8d03489d3a4eb4be35e31500fd32d606ec7";
+      sha512 = "274173672d91953fb715810f314bd8aa5c5b6660e8fdccb91e09d2e3b6ea20d50e2cccce45f201405bbb3b0dd41b1f7ef629c6caf5a59b9fa075e2a5c88f556e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/az/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/az/firefox-61.0b5.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "b30d0836f1ef35ad01c929dd43688976a2fd9917d56ec99be65298ff2ea88b4608ff0b5e398fc016718c62aabe6373cd85394b1a9da927c539fc1999dd49659b";
+      sha512 = "5d742221592d1183d4f66dffa5d6993eb81e9ae2bc24a664cd41006d07975f7d9bb5f040f7f7ab763059424ec835e6d0def4ac64a468a472ee23c74c883687fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/be/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/be/firefox-61.0b5.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "7a3dd71f5e22c03b76290d34eab1dddb83662d80977c99580bd7abb1bf80f448a6b4a3b866a1656c0b51018b323c28f921a7489d7e10fa3ed2b092fd77463fb0";
+      sha512 = "f2e9a764a65712a5bbde251050c39d6eea91742afb4eda9de14c9d0834d66ec4db56c801771068f0f67a2a38dd634914cfd83721dd78aa7330e8f6b7089a313d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bg/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bg/firefox-61.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "48b75a86c8cd4d288ef7b39d2a2998ee01082db7c32767c0188d6d930362e0ddc391062d69b2dd420ade553d13145b0f11233f85e68de27469f287ec1a788b73";
+      sha512 = "87e2b22d6c3d8050f65bd740c10d37f30905091f25c9a58f90f221afb2a3063ba0006fcc1f69ee05f168d6bb7c5222f022bfa5efe0827e7aad00568867797322";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bn-BD/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bn-BD/firefox-61.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "065841bd9ce5877c7e7c9732eedc96a61c424ed7d1ad797ae8411f3ab8ed6d24f8490f067ad96d0ef77af3343a201e3cee8e31e6b9cb4589969afcea03fba6f8";
+      sha512 = "9687868e5f87282de362e1d2be7b54c150994f33ad92dd5cc4fa0cbec1d817b36777b8f0b95f50c691b20b83f8b5c4252ed40541b4fa6f42a6a10dc8dc1f8b45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bn-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bn-IN/firefox-61.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "7c11742660e36861c6acb0d4022feaaae13ac4d3ea3c3a8dd0ed0c8634c39bd4f36f893ffcaa8bc7170a03b69fe98b8a426722ac9d394a3b0ce6c3b5ba00036b";
+      sha512 = "593c1191094b080a76c834f18c63f5f64193aa1d3b48fe5788288214ed98e90e4736f4b8ac413982bd9a793b39e63b515c293abf5822fb9e3b8a4a05515fa667";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/br/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/br/firefox-61.0b5.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "e3b15b6c19340b8be15c72c926759bece00e26a1ff82c5fb0ee7f6a92e59c075af3cee82285af7ea9eb666c087193d6b19048043ee84cd6fdb8749395785f3a4";
+      sha512 = "74681ade8b802805525bf61c27a2b604afb584c0a9eefed283eda67b46b4a2ddc37df527f05d46bdf3b650a092eefb600ceaa683a477fbab80506ca4b1ba48a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bs/firefox-61.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "ad8ee06512e4f9a6354284548359c6f27915ab10d5ba171ca16ca2f928a4fd07a586d6db8923faeaba18c1c2e8f6d62a7db36bf124ec8d3e3e36879b131f2800";
+      sha512 = "fd43952d81b426cbe4151e091b3106b539211f9fecc390037e937388ee28ada5059442698ab93221635d1d1454fa00660b80507d10bb7d0bbbb775f3ccea2957";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ca/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ca/firefox-61.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "e34d1c3c85e41bb8d63df460390473ede1f5591b1c261edcdb15fc8e2b892b4899b82f5a7de77ebfdee54c1dec78108064c716d36c221cd856b98ae79f5f5e44";
+      sha512 = "03a312d7f7366d0b94fff50b72aab8a89f5d24e060ef14cc63933b08e0c9d8134bb2679d9d8435ddc18839383edda514dd9be5452742d340938f32267371a08f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/cak/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cak/firefox-61.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "53ecf3572525dbfb1af987ebdacb2b2e2a6a1e88ada6974f5f831abb9756059006f63b7980cd30d18ff1b803db395731f4efb4de4d8f6fcaf2d52cef3d37ef29";
+      sha512 = "f25801ceab9845ee8879f793a0c217247556fc965bcd9961de22d19ad4d0054aa7a3aeba28b09be32d0cccea12b799227809fec91f4c9853c7ca63d32b7a7ff2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/cs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cs/firefox-61.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "58c6b6878e2d519527771ae44c1253625276382aaacae50bdde525ed3cba0c2fe92dfd38244e0e7eb12c60705388e1d8d1dbf69e7f5010113fb44d1a466d0089";
+      sha512 = "274d46dc058e017646bdde4cb5a09e703f390a75cb4a17454fe209e5165cd1ca8758c45857a1c7850e084d0e2110e4be3544667e8276ce153b710465a8a9f188";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/cy/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cy/firefox-61.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "e1d0316ccf08dd913131fe2c0c7286d8bd0f76e95103c2b112bae5a93f85f2860848a4e1fd48360be941f6ac0204b9e9a5d47371b6a8b0a3960eafdfa9a32d52";
+      sha512 = "3abf6cd33273e42ed501bb913fc6784dbae65e61dee4ce69808bf3f704dc3613f722a4b030a0f9b9cc6a09a673d269238d8c9eec18b23a2b4f8d9a34bf32eddf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/da/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/da/firefox-61.0b5.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "a8273ee29ed1614adcd45dbe5fc78959a8bc17629dd92b1019a4b017bb0cb49ad2e6a65fb361483ec88d0124880e8d8994c3cd502d6e2d2f8ba7aa67043a9c37";
+      sha512 = "00f0af1239b2de5d4f967d46dcd5dbbbf13dd06b59539a165255cfbd5b8adad19295a2affbcbfc23cd1d8418a4e05f0024bc3f6d5bc6628ed36168b5ebefe5e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/de/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/de/firefox-61.0b5.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "6e81e858d7933940e6866142cea5ebf1c7009a018ca322ae35ca05c0813b82b19796ab445105c9b274431aded2713d25992fa91730e837335596a8f5ccc9e574";
+      sha512 = "e987419db7b28f82a404c80866367704a37580674d012e29c465856aead83cec4eb234d265167c70acffb5411b2766ad64a879c456abb31cd65fc867c339f583";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/dsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/dsb/firefox-61.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "fa4e6ee982554045afcbe798a3113a4a1a5baadd0bf20b79d08186d781a739c9ac01bbdcad7c1e473844c997bfdab03feb590d133be5aba465eb737938f8ef5d";
+      sha512 = "e4c268f4729108302c2d2dfdf338ca30f66bf369e2444b22fb0e5b3f6a4c383d0c2e5b2917d18d661980803e930495d943197cb47aeb729c3f1b6d82be14bfd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/el/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/el/firefox-61.0b5.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "3865e8d77801bebd4036a69e0d5a4e7f96e676808bf8379c3165142b42ed9e2f1eb4cdf9e3aa0c1a1688c2d882b72d49f2e8ba04c4ba31da3d31d2672ec897f0";
+      sha512 = "6d4d6bba03f2ff18da53c6f7f2ad9138388a7fed7a02e54bbc8d09be24aa955d5fa1c5890934c768b1a371abcea4772cc455545e9bfd03e63b3b98240f12ee12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/en-GB/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-GB/firefox-61.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "5133291dd265109496669babd12fa97685e83e7ed08b98b8fe202d2d8baba0f3fce4fafeb71a09d16ded277bb809600af792f2e8dde8a2418fd7bf28f993119c";
+      sha512 = "4a1017f1f69486d56a637ab41c7c49f4f3f42cbbbf2a2da2a57f61f7d87c2ea43e7abbddb0fa21d56bd13d72e99881fae540626a8b7f069a661778edaafe3738";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/en-US/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-US/firefox-61.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "f2a9a678f3082f85848a87cf784e774f36e374a872103c0b324b1de755f02889e844a78c6faff30109b301e1729898826a779f1f690ff0757e02e9485f23aba6";
+      sha512 = "5eabb44a30500e5f8ee52e4f6ea8d82133c4ccaa5130696cd5af1f1e61efd47a0ce8fbd94e1e9ad87c2c8d3d73b0aee23f0f1cb933ac7c14596dd6b2b7baacb4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/en-ZA/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-ZA/firefox-61.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "7f5560724d00f3dba6249e4c38d61701dcf3007d1e4a2521353be771eb50fa1937bdd346008c1b912723e17a6b13708b1d57d5b385cbb1eba4ed7438e2d64a50";
+      sha512 = "0018e56ca7e476d7aa8fccc55dfed365ff28592f387630fe4d72828be67da992c23d28206e6399b942987750756ad4ef98600463abfd86442eee3a6caca7a39b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/eo/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/eo/firefox-61.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "6be242be300413c2e9e96f233f651c19472934c63b7a850957b32316b5a387ec81f25e84a885b0796317ef1d5f413be7793f7bb98629ea4550d31d33f7c540ad";
+      sha512 = "7ed4a945cc3947de2b31e3045adfa2387e5ac7bc9c6420cee1c8bccab27e05278707b7ef15728ca0e89cfa2ac62fea0a155a0007c8f61178b56e8ad99ac8771b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-AR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-AR/firefox-61.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "59c78ef47c350d2afe16d2d135028a9831c5a8a458582e9909f5a9e3e13db8dc9bd102b46dec06c606ff1f74b3c1c410b1bd8df2c38cf3816817ca56c32d0ad2";
+      sha512 = "dd45ec9ae649d43f7bc14c564cad8a5cb0c688b18a78296f01e60ddce161e43ee7f9f1d422378e560bd9b8b10d2e061e9e50d3173dc671d775e5fd64d5b977fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-CL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-CL/firefox-61.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "b969bb7762821084db87f0da0ca0898671dba0ee2deb7a134065ef607765cf40f9b4858edb198e044bc8520221511cb26a55254a4870f01bbc216704668c0deb";
+      sha512 = "017d2a07d554fea7dd140d7bf22998b3aa575086fe3145503a178369187c1f3afbd45009f08ba8bb0b0885b645ed0576600393315b02e356151c2c64e96055e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-ES/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-ES/firefox-61.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "cea1b56365a4a6fffcbce53ad3540ec9dbc9faa01500f8924c67a25828ce14d03e3a9338900d1aa44bb1b17e913f58e5ae50d8027359f6070c947bd419cef075";
+      sha512 = "f24185e0ed7eb3f1982be22b74276aac1930af09f30184ab5c6ed3d3b2adae6c4ad05dd4d9ddc8a743c4482f503150f2624531ef1cfb58ae88b10a59773c314e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-MX/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-MX/firefox-61.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "864580e8940a5d6cee69c14b3483ebc27abe06cd441f322aef3102c5b38d87502f514a3f315e7bae6ded19ce2f0c8d31f59d654ff3b067226923cee70987412b";
+      sha512 = "28ce5d1cc9aed67c5ae6735e9712e42bc30233237f0597e12f4ab96c6a8119bd6d710c646b84c830023b41aef8a5bb8694a652b644c7ace78bc55381102b237e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/et/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/et/firefox-61.0b5.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "cf7cb0590a7d2ecf6f2286c9b2c14935a44bfb546be69985c109948e610c5ba501a87c80c983e7646420f41be27e4d4bf329242e2557a3706a40d2254fceab34";
+      sha512 = "2d73a733ed3b6c64be8de608a00b11f1ed2e300fedc5111f9a92b1c0fe61b61eb043b6b9c71eb5fc497813d1e4dad4b940c472d119697c6dfbc6106751742834";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/eu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/eu/firefox-61.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "968fe509ae134626a51d066b2f054f604ba35d0d4ae48ccf3d56a76aa5a73c9af43660b88f90c650234987fd9b8ded64779675e18ba7b67876e87e91e2b119c1";
+      sha512 = "f3621d39d396a32cea4d3fa41c83bddfe0c9d05e3fbd02805f1b87c9bb8ba517934602d06f7cd7c8c80f5ed4aab3df275227766aa939dcb5ab35305eebf1b3f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fa/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fa/firefox-61.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "bb72ed23df33434b4a1ea1d141e4e918200285d0ac1491376c520b16436e1a22ca04d391c8fe22780aca312962807c165dd2aebced2c1a2db6de95c51ef15c10";
+      sha512 = "5cf7ae648c8d6db5d896a76183b9f06275199db489dfea6aa2c28bdd9377b22a5ba4fee0931a2c18c22b94239cda8d972438a63f2f6aba867051f8cb0152965e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ff/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ff/firefox-61.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "5d68fbc01a5d55309af596520097b863dc670b51daa48f0fc03a3bc593871b68fe67252774d7a52c71932a08d84d8faa2c42aba1f48b4d26f765fa34561b0c34";
+      sha512 = "301de07712dc015e5b769aed8247461c8e15bd16955621a517206fde83c6c4599ccfb654e729b3a22ae6b51952060cb27db7b315f566b670d8c2bffb514959bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fi/firefox-61.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "eb669bc4c743e3b4ddc241ea101ce1ca7c0e68ea80046ba15c6001a90bbfe148561ebb8d32cc6d353ceae12772ac4ca600ef48f9ce3f4896b5a99842a0298829";
+      sha512 = "65b8949e7e0ca1ba596c7a40e75c3c463646dd72a044d989e68caa54b8aeab02403870040b7a27ec8811adb62046c3426e38038241293bc5e0308882d20d1077";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fr/firefox-61.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "bfad13dc2450ac4e486d3e2555d9056a8ca3442f2e215fcf27e86d3a70dc78b601c711f47a70e75f77098a2f4025d0c0b49a1a0e82d8635efd248ea8f2be2abc";
+      sha512 = "b49589dfa85defb758c71f221f309869239039b5c8d30d40a6857d4e92e3113741a8eaf6e55e073f5a9bd212030d6497c05185c220a3249ddc2a4a6c6880e3b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fy-NL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fy-NL/firefox-61.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "9e9e7532aaa30467a080cbb7fea380ad25a244fc17f89bd0be04f73508163580b7fae1b6151ce6e451904cdcf04b389605883a937150cfbdba5b20e9521b5207";
+      sha512 = "a17982cc3590d552f907a3f9a5af3e0c3f234b40a1ea285e6805cec57b793645cd79e2c37422a2f83d1e70617a1b5a4f87b5c315d9fbe98293e061b2f836bd06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ga-IE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ga-IE/firefox-61.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "580f5e6d0ebbb7baa80084472c3b89817c83a674dfb73f00949648d42c8c9c327dace1fc0162d389e06c347f0a0fade4fee906b80931217662d59f1f1515535d";
+      sha512 = "a9938d962796c573099a721a3fb8a4321378ff532e265bc4ecc3b09fc41268e236e0726e808865f4c655aa7f88f1f04ab1e73930a1a9a4a9d634af1bf8bd55e2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gd/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gd/firefox-61.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "2499205db938c19f749dfa303e859084d6801f86a384a5e88be0e9e0900863e1970bb7314929ab8441944b8cd4fd23f2b487167c7803ee58ff4a50da4af371de";
+      sha512 = "a0f4a34628d805ce67b858a7f96368637c90c126c52e7fa26e540483ca201ab02d734770006ea1cf2c960f9cf614b9f0a326ea74a77c9e0abe3a23f3d6acbb90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gl/firefox-61.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "cca1a6adb4096f91abffbcbb1969322d8c60a53c0fefd8cb98bfac1c1c324134a7cbcea53fa15217f41b2c54893f1dd26e4dea2a0fbfec9bcd0d7dd928c1673c";
+      sha512 = "c87b8d03a22ccca2d57339797182ec37adc12b40bf4b83d72120b76792cf28d373f0948fcf0a06c2e983255951a026f207be8153169d4d61f493dab8b25242e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gn/firefox-61.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "8484312cd5f4d38babbaf2757f1b0548fa0a291c1de76e751bf0235b67f1fdacc5f3c6e4d54729a91fe9f5451c527972346d36adc0d80bbd110ea1c0a0025b85";
+      sha512 = "20d20ed92b7fb5fa440b39c449000b391ba85bb3a4e98164c0529c150535cc992fdc7d3f6e8585d7404976e0a1204aa62e43fcad190c3999608dc6c5e9233497";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gu-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gu-IN/firefox-61.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "019deda9993a2d02cec8577f5542cfe247c04a4c0a7c7d6faf65cefb1a8338ed86e24e51c74e6ba30a4f5b6e644655de9df1c99584172ea51e07eafddad65f6c";
+      sha512 = "c97905b3a5e3ec660b75348c2f9406053be2536600ce25bb43bea507aeab7a3780c8d2d972de05c17f605ce3a728d6197e1f762773d8141576c1e3e367f44250";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/he/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/he/firefox-61.0b5.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "7a5285965e37b112803f0b533c8ba501ca70a9fd09ffd1e83e630174c4966a21d53f6c6054e7b60b76818acd47813a2062fa9f986d11d78c714c127b0864de58";
+      sha512 = "4a89765b60bc1c82d06f503e62274b266520bd1ecd1d3599074351aa825a4280a43ee05b8cabda9c6ff44451b09e02006e717eb5791942ac9989d1be79041655";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hi-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hi-IN/firefox-61.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "6bbc86f071ff51ef1cd4aea468ec2165a6ca991ecef2524bcedc0ed3d25c7b3e0729dbbfe5df3c236d14d996629824486f064d554a0eb5f89f46d69f3a8d61a4";
+      sha512 = "af73da40aedacc3aef9685f5916651564a6e329e4e1a97eb968373307d9f4a7d8ce81f72b770166395305e5dbe9043478d6164f89f40383b89e10dc3a2c5a107";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hr/firefox-61.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "924ff70afb07ee9379c202bb684e7ef85d0793fdaabedde7c8889c0eb798c64cb7fd5a309a03abd94cb56e4a194d9b7b9f7a212abef4ed314d1b79ef4c8f0433";
+      sha512 = "ea63038ec96426dccd9b8ebe13ff632794b3a320888b3f6f152a06a3c9e4fdabcf6f600351e5012b90ec924ff4dd9826dada493d0adbce4195ec9995a333a2e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hsb/firefox-61.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "4e6fa9f275896bc32e426b91aa5b26867a27f52dd767e030872ca365ba56a57fc4a0df7ab877c282113333d94ac3a1ba0159fe8563f45d01650fa595568bad38";
+      sha512 = "797d27215aa0e77a40b582bb7f2f45a1411d8d4159bd61a55fa72023c27f514d916f2b1fd5a2b89c240c1ee0142f54cd2934e4cd641f616d2efb6ec5ae31b98b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hu/firefox-61.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "13593a85271fe064f0d201d14fcb830ae2f9ceb965b4b3ed1f3a7f7c9a7a6b889bedf551bbae07a385b9ff97a3d79e0f9081b1746d00c827af3c2c20092fe965";
+      sha512 = "d3295470724ae625f603db98d305dc67964154e86e7b28d80bcc688ce87525bfe33ce3d60f315f48f70c09c1d1301656a46ac2acc8b312a430f625af9e2417b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hy-AM/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hy-AM/firefox-61.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "a8357f7eb7ab322a1a5552a8852772ecc8bc36f8509d1f165aa226442c67d00649aac802ba405e1ae722c957b6c3f6fd7c2d546db2968f28bcc2c9a7e9fa7ec9";
+      sha512 = "d9d9094f4cbb2f5659b598e332256bf77ae64cc162bbb8e8998e2d723ea8f2d65e3632b60a358e9f2e753cbf877edc59fd21ec3d3d99608bfd9090d24957d641";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ia/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ia/firefox-61.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "b370703f8984192be45b07e30b0737ab296494aae0a9a5f3f31f276beb9548dcea441aa245cb1e12ed04fa9ae11d2f00a699483e02f8f47f35db625faecb1f2a";
+      sha512 = "c9c38f5bad724e4436519f01f0e25c715e7e107792ce9794fc9bcf7e9bbd687331efe004b10f18cc942f668504a43bf52ac2005d2bb663b28c99943dae8dcd01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/id/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/id/firefox-61.0b5.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "e8bf96e09bd1c919848fe86b87769fd7d60086919f71b1f92896c6d785206c9fda2e7cc57aa79234765fe55b29575135d05db4181155b8e7607c28d3ad92fa4b";
+      sha512 = "2b23f50006b2bbc66e79851b91dc62c948b75a00651d294afba17cf124f612c3bb2d39e9f8a56a74db7a8d22b8487ca7b600a453949973e1776be50152d5fd21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/is/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/is/firefox-61.0b5.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "9668851619bb97b32d043032931bb0a0f1df8f9cfc35a308594983a32de504a6a64830d265b46bdb30a23c58fbd4c7e6571a042e44382930d183849880c1ba3e";
+      sha512 = "237882a2ec8d52a77fe533866171578780f74edcf790fa4515fe98c804491f86f76b99c645854778868e9ea58ac3b2cf75d504479d0c24fe24911c795e6e5a71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/it/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/it/firefox-61.0b5.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "fccd8388e7466ed46aae6d157f3baef23d742ec797fa26a7cc861da97f19650e09f8ba5e94aa9f9ac779555a1c7873e0aaecdc9bb691af773767b55ee0b820b9";
+      sha512 = "d4e20f24409f05b541d5dd556b1270d609050b650ce708e2ed33e826ddea1c13103b2983bbec34ce51c52b7f2471e3c451775d6520da34d17b2274ef1db07fca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ja/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ja/firefox-61.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "6d8bb09d098b94be37d41d73a6587885240f15b83094714adfbac8ed595f3de4ecc78de82b5516270b57ca093439209a3093b2e737b2d773984cc3a28e8e27b2";
+      sha512 = "f3c4726995f3daecfa23ea19623e9cc9c9fd3d90049176f16f4d68a2a17e6890448432c827fd6c1b9dea09787983cfb3e9d89683a05923e6b4b23b3c67fb0693";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ka/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ka/firefox-61.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "902e6cec903dffa2e3227f8cf67b472857145bfca6e228a896f14fb347707b753beef3a2836be90e0a17161248adb7b916b2dc9dbf4f780989a09bfba757b5d9";
+      sha512 = "5e6941c9a3a2582010b95c45dd7b49b6dcaab47e54e5ca67e7b3956729c5ad5978dd3d4ba4cd28dedc9d89592ca95b895377803836214730e9f1f9e5b4da92d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/kab/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kab/firefox-61.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "7ac062a6523a91dff3573a9f8b664ed85877ba1d192baa196cac1e3576ca285c2368d1d5582a439b5693cffcddbc08b35ad093d322eba7dd8181c4ab797c4ebb";
+      sha512 = "1a6126090610f906731f13dba405f167935a94e9583ffba4f08242b3882961ebb91de720a23b39ec3d84be5213893a9b82e2e9ca91c6cd70466ac7ef1bd600e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/kk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kk/firefox-61.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "83ba96c3675c4cdeb9a7c661c73314485430058280118ecaf2135318c238ec78ad88e6e09e2c7cb4c43f4e9dbada55cf010301b2b1b6d1b49355039e6bad9763";
+      sha512 = "bc638ded0b4b14c0b347cb5c24f0988ce697ab29ef08f59633123ca38b056c4f7bb0421a6045835ec0875e663b9730d17cc7f7ddd8bcdc98f5a60cda61461ed3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/km/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/km/firefox-61.0b5.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "71716deb9304033c46b72a277aadbdeea99fa936fe63830df79fad5e7a79f76eb9527cfd38da5ece4511fe19fdfc32eb301877a26d590b20d3c3c051bece2496";
+      sha512 = "fde6511fad810cb5d71fd1fd0864ac7a40dbf4535416ff127f7b12799ee9e220e3afc93fbabebaf8d6cbe939e54692ed3edc5a381fbb9a693c393dbc8f970e90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/kn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kn/firefox-61.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "2f296eead5f73a279309d68aa6d7fcd433bf133861f158cf6c24a766f28d902d00e3ecc25df07d51794706461bbf2bafb4228dd61cc3dfa3baecbbc4f967ee12";
+      sha512 = "0b93c21e1d0c99b89393f8fd155d62a4c72a8c1ae488fcc081fa0895fe91ff056e44e2405e45f4a7139e9cba79c5cd6ce855f614f40457bc9adc6d592dff6936";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ko/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ko/firefox-61.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "51f4b2409f822b1ae357f194fb308e35f6436dc0319629a436c03b789373887eb0cf6f8ec2d11c005f7d63a79dfb035e8661d7833cac083648def49d1fb1acf3";
+      sha512 = "cc33a59bd8b5e4d07204fe2dba1135c02cca9ba60ba6439879b5dd1d7b32a21e9d5809e57345a649ba5b964567c3d30648508c1292a84dc381e747ad475d0058";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/lij/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lij/firefox-61.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "19a2b183bd086aa57e5dda573e422e3721fdead13b0ffe62beaa1ec437544e6138747a5ac22d990c772bc75b58cfd69cfb218f518a6fe01c3fd375ecf7ca6373";
+      sha512 = "6c9b8db39a70abc07296597818a60d4a576d2bd9c0231817e85fa17737d541434cdb838a97011608165c1da759d5b9d295eebc4a790564ba37b56c201996db3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/lt/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lt/firefox-61.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "36ae93add3821233d16fb3f9baeffcbbb061f77824f5030043f1f9b3222e7612afa227022ff7ebf05ea5760dce1e727777f148c77d1eb2e4ba2e0bf35adb4911";
+      sha512 = "ac1017981cb75d361d1f8c7cc823fca38303c39afbefb3ff87d48d95baff2cf0a4dbc9863dbd55fadce85949e52e7e61889c05cad874686ddc073ed6e5acc228";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/lv/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lv/firefox-61.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "a3474036735619ef1ba34caff598f17572b32ec1138b2535983055dae6b4969428ce634930e2805b25d5b5a56a731831d681f12a6506429fbe1149e8cf57e8c2";
+      sha512 = "f5f1f97758f00c25f39f73b8e52a8c006fe653ceee232ca27a3e69d3b2abdf6316c237b1944d26dd39b51300aa72cc20c4b3d304aa6f1446a96b6165cf4f8757";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/mai/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mai/firefox-61.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "185f3e1953c05a496dac5027e899054ed376a09ad0c08c88f183c4f91b7210b4244ebdbfa224ab88f7e695998faf50899551379b30e7ad04ceb2c9938099df4f";
+      sha512 = "9b1f37e9d97126cf3ab5500c6cf15bb161a286e0d878fe58014a7b5024942b944c9282b9b9e9c3587170a12d7ef69095e21d1db729c2b96db29c97b9dbfe9a42";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/mk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mk/firefox-61.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "4c04cd14c893461ff87ddf5a17955c5a80eb5e9ce929aa6a37204530f1fc10f359e9af451918f98d30fce80f595a4f14498e26c07b48ad0dee6b3720f72842f1";
+      sha512 = "14937d2fad302f93b0011037c12298c7319a1020f5e54a7c54f8ca2278c5a1d6517fe0732292fa0b84edbd1af089c67f41d6651ca918c677d814ab537bf52126";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ml/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ml/firefox-61.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "304abcd82e0bd2e0f0e2cb639558340f3424be9485ee9378aa8d59db49aea096013798132df26d14c0fe83529b211ab40c5b708ac62f117969a59d0516f2a3d7";
+      sha512 = "61db659af8241ae107265708a50683aabc1a920a35e6f32bdc5559de0e0aa5409f577b4ae5d49577ce37290ad5ff3f281f3b8bb5c775c834acbb364d499e5be6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/mr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mr/firefox-61.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "2f05f7cf18e4de46cbeca27910bff036ff34c4564f5ab66c4830f2e8c6a2d016fc87d700d2085141e01fac19a0226f27b0ab467f4a4146c1a6bb54fa549030e8";
+      sha512 = "2bdbdcba25483797d31778851b9e611ffa15c0f2744a56a8e3447607bb83be8fe179dfa7b3a7d24f017fe34f9f38dd8d8b3d41a1cd783c34b9ae1c4929571ef4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ms/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ms/firefox-61.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "767328afb8582def36c31911e5bb798acd19b2b47603decf6e21772626e0ba1fd139f9a79c2bd6a79f56b84480f2ec3564506db84841a6bbaeb95041d4b192e4";
+      sha512 = "19a4552318668d0e11892ac4b4fa371c82e72d0742ff26b63a9c6eef0949af261c352777feea41dd6c17e168f868652e75c4f56a9947dee11886d264a402ea06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/my/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/my/firefox-61.0b5.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "f68de98e766df5192a266dbfe9d9cd167d6ed4f3976ab58e768f8a6939d36f6903004e6bf0e09b8304a4a30cc0b36c084fb75eaaf9084804cae318727796c4ed";
+      sha512 = "51cdc0570513a3856c4e13f30dffbe7a55c30dd6a88d47528637c1159520180aa6516136c1f066f37bb06f79f8326ded3b3cad23b0f244bbae11476d68b3dddf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/nb-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nb-NO/firefox-61.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "fb1a96d11944441f8e7e74c8efd55d59d11ab3c38f446dd8ead4729346a0d8030c3e801debf517746fb78f338af0a178d45045e31d8178fbc1a1d9704c33f1c6";
+      sha512 = "afc8732c67674956ecf9e0678d9459ad7328611d3f60b222871444c7f0a55989757f6eb230157c2bddd5833bd99b7fac3200a8a233ffba392f1d028f3d52b5b0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ne-NP/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ne-NP/firefox-61.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "e4764fa38c66196bbd7034bdc7216ce43b9d4d0ad550fb1faf89a0b030f3781605766d0ee95b67255656b1eba40825def39a25cd059e74bac558af511cbc6e1c";
+      sha512 = "4b7acb27a1dbb9982c624f3bb5b9d97add88fda23155ce4a8d0f6436e68a9073ea3df571f61e186a473c3c6d90e0af1f43d23a2708d04192f206d3f9d9c726dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/nl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nl/firefox-61.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "8177521f43ad209734de5903746c366b08aed805067b0a195fa19c8d134527f8ef4226b79be8f603e96c451816511e2a38961e694e0a284ab54f272bd93b80ab";
+      sha512 = "4797e5748f46f9c8939e225011fc42a9ef800cb1b1e26a875d59212d7617aa83d9add3222f51736c3be8bf5cdfa2668c16a89997f07e135438bbee936cabc1c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/nn-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nn-NO/firefox-61.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "a62c38672ff3ee43cafa8d3b8f03429414578f0a1bbe2cc39e3fc8dddd5edb430d6f12ea6fd40811e382694f925650224d7a59f27b3d5cb817e0e51f77c3c918";
+      sha512 = "dafcb551c537397bb2d9198e1f24bd5ea21e727c6e35467782ba9b1a4a7dda6adf8fe5cb1f7f42d7da701bf3f5999244de5d3dec2cd16331277ce0c0eb0d93d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/oc/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/oc/firefox-61.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "8d406f76157a5b8890a7d6b1bc0bdb820acde82b29aa4798d7020e140b336796e0ba309186044de42ac6efd3bb66b9ad8b9f56104376d81e3b0277354cca6aba";
+      sha512 = "447e74560fa96521663fbfde6b4f7b398a1ea13a2c2432afcaadae3bb84256a38d09d4af43bb2666f80dafe3df0cdfc1d8470efd2de7f8d5d0928cc286f4c86a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/or/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/or/firefox-61.0b5.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "2c23189d5342608f39d05342d9070094e2485bb11067e436da5aab307bcfbc6e4c92ea9ae28f4cc707b6171e2f708c9f0e6aa8e0e32afbfab592f45766c5f642";
+      sha512 = "6aa674a480e6d742c3309649d464845d6bd5654115b7171bb0cc5f48da05b85e9176c6ad20f58cc263fdd29e9406e3090b3061f702421c2563f8addce47827b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pa-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pa-IN/firefox-61.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "6c586e3c9e7c4b10505fd5ba37ff4188415e1566b456f6c929b060e44f09151b9ef9bbe9f3bbacc36533ff6789805b9e007c7a32148e9c9517053ab4e20f2225";
+      sha512 = "ebecec7d84d7ef6e84d2ad4377cd7d0a6b4ad12187655ac026df6691824b3ad1e5ae2d463939bc8c774b2d7d17eff00783083cca68436a3fa8cecd18920290a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pl/firefox-61.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "d26f54ffafeeff89e91e826614b4f55c8a78cc8a149845c5700fb024e20defdae937a2a9dd75d0a156932a9b7a13f5b39666051cbe8b50827e057400b8eab244";
+      sha512 = "46a8745147751200c6b13e10c1f41db9391cf066ae3475e0bee0de11639f624322a087ee73ae6c19c2236c91034f1bcade605ec7628e24c6104e83465a97baab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pt-BR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pt-BR/firefox-61.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "8ec8ad7a5bbcfb9c020511915c07fe891ebf3e7f88977bd8a03e3a9020f9293122f6d3a6d257fd2867a34ed257e74d85f87e65490e037d28d5eec37d97ba0cb2";
+      sha512 = "6b27353e212369d04c96d83f1b62118c08cf918060ba9d46809c1f3cd1141e7cb7e7e6662216fcc29f9917e6c24914462bb1406623a312d07fb48016fc705410";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pt-PT/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pt-PT/firefox-61.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "0ff4e05427926f408ed4310d63e01b46ce3b7ca618336faa289666924a203641102c02ddc3b171b9ce964bd7e7fb260a365ed1ba44c37e837a14df3c0bde7c25";
+      sha512 = "5c7d44900276a10edc396a9829cd5ae581b9705627a8962ee9597a3b3bf57efb15caf054d7ed3bf6953c0f064a9ab29d1787304523be1c4c1ca33a307ba4a1e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/rm/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/rm/firefox-61.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "13465556af41b81d328b98a38361534dc4a4f9151b17fac0d20121cda3e4d5d2c21580ee7f1e966fda8e910dd26647806159bb7f556509a13dd456e22509e44b";
+      sha512 = "3d5e35caa8c65d8c6c9d88d0219d146d354089a5482f94c86a0a1a8a753010ddf1617df93d53a9eb476c285f7424b17b0cf8544fc6d969f3d7a26cefe858c8bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ro/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ro/firefox-61.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "1c54f88ed76c1c9f3863e67e4088e823dbd80c3e696d3b480a7bf15022b5abcde86b10953df18ba667d0cf9c5a264c4b8e59cb1d6031e937562c6fa207071013";
+      sha512 = "f0ef50ea1caed890483c5a3496f4ca6986ef4ac526620c110187ee40766f6e1cf59d718d0745fc35c392d37ff1928a22f243a4d5842e81a34b84a63c53da6d38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ru/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ru/firefox-61.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "4583bc0174b8e7b98f882571bdf0d9502cbeb5c2e4a44473229653c383df30b78beeab446d299d465425c7c8106642b6ad0672a436a9f74c76a3d4e131bf645c";
+      sha512 = "e96f335f5142a708b55ffbe4327fad650560f66ca96c260bab97a02e5c6ec38dcd6bce61b37447a8d1029284024cc9a6798df35554474dc38ad59f29fa85224d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/si/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/si/firefox-61.0b5.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "66acf2ae9e2db8702085154883a6412ad1b15dd830b7297a1bf489a0b173884d54497ed5a91cdc1e11e179f8abaa0ce8cf2953a180febd3b6e5059468b2fb496";
+      sha512 = "80fe13bb2d037f3082ff02dfa764f565213c3b0d5a98617b6a290de54dc655ed8838522653bacbbf926e0daa34e5ccbd60198779996c771ced10030c46da1dc9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sk/firefox-61.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "61837b2d91606c1d6c54e7e955843f1914bac69cdbd99558a25520c05a0a0c45b80a90cbee17d30f272cd969e352f6e6511cbfdb0734694eb7409f603a7c8114";
+      sha512 = "1612da9f841cebea951f1ae8b2f80c897eba920fd900748608495ab154e9443671df9969bad9923715e41c544e8ef63be3e998c4ee879fb58355234612ffbdfc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sl/firefox-61.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "2d8b99bae7442394760fc1100456d2bef3f65532217cc554e2c064622d7e1b56de1ee96114b7f31c7098afec3770a8ff4f7bc7b64c2cd4b72b2f41ff2a80ba89";
+      sha512 = "548058d77bc9d1076c1eb21f0a01be7fe028debc78ae083ff502c213bfe7776e4ac8480de6cf7338b80dbf38c475cd367564f1dfaa5fa8cddb5cdae0db2c7e22";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/son/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/son/firefox-61.0b5.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "5850028adba338641444a2fd62bceda5f03048321f70b3ebc090d362541b23e4900a2a37d5fd4f22ffeed422a63b7fe640e7aec829610397f2635de1e75ec1fd";
+      sha512 = "7c0bf8c58d1c924245693cc02ddad3b886e94af1dabbdb3ae9344700de612018a75f233003dd2df698b2aca99b9ec4632e65d16c68980955540185842c9b8af2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sq/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sq/firefox-61.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "6028d2498f800e0179b2102fe90d8217f719b9c00aad1e03ce8f5e593fab2467c628b2f9a60e643348f567c242bd6e2b600d989dafb1a664ace0d0aee2fa8372";
+      sha512 = "c287e9cf132ec16e3e8427854941ee89ead1a29a8a68a92a7aa35b615fd2b526db825a3c66dc86f30dca5d149c2a5afc7c254af64225ae7145718602dddd631f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sr/firefox-61.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3cd1bdc2a7536b5416e81b8e20617de047907a7a7b80c9c3bf2fd1defb5440be72f2102d28159b1b8133f2b2669fbfa765afbe999936ab7ea4d1fb8188960037";
+      sha512 = "b06eccd2835a050c560f56dbf94d41f455b62a8407c5196cca44d7c9237cb451c42a4ef266e5e9348965b01768f314ec7bc2f437ed896e23100caba6f409ecf7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sv-SE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sv-SE/firefox-61.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "d9be8928075973a22a15c2ea9fbb10968e5189fe34b13924ad6c33742e17c9b6c493d484024e3a1d3b1529826f129aa308e13549675560fee80244f98bafb04c";
+      sha512 = "5747c1a9a1476ee6f6febb645b5140b60e5190eaea606a1edd8421cc1b66f6c98b710a447c6a8ed1b6730b5ce8dec47b69bf28810e17ce8b080624848618add0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ta/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ta/firefox-61.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "86921b7228c6f2b2aedb68299ac21e22c82ad4fd5b55e428dae00e29f69721dff52060792b396a0f43b3ad6a571d977c87f7f3d420b52e665fff42e1daec95c5";
+      sha512 = "ec71cc4c702bd454ebab8028ed810fa51889d01f1b0d34729fbab44ce5489bea031f3c5f6ac5392954343ce050a96681d043406f29c10d317b976b5e3d0cd8c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/te/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/te/firefox-61.0b5.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "fc2847ae6864ad852791edeb2d2228a1d5484052c87966c9b29b3471218366d74f53dca4b0564f2206134ccfb5bbb39fddd6b44fb6b53ea7ef1acb7949668aef";
+      sha512 = "147654e7bb5df1f62c9bc117d2badf0e3a92612b79bb660ca09658146644baac275a7d3f6f643f751bb585bef867b9ed23ceef55d72e2d02f1ff4f44e076e0e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/th/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/th/firefox-61.0b5.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "61e412edeb4bba9c00cb853cf953c61c5e669b2655d08990aedc4388ce3a836405b0cc805a6c4b5e6041f6f1657c3586252803338f85e9f1c2902ef1187802e8";
+      sha512 = "baa454a5c4d8d7994a49c8cefd015052b0f3af6f55e15a721ac00e8e7108f83fa78e5e1e5c90576f0bc508574e2ccbf3c72524192a310b29e30a430e5928b8a3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/tr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/tr/firefox-61.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "c0e9cdb54766e2e05bd124a71d68b8023834ed8c701b721658bd43e27b17805c17a378f645a53710ea800752149d7930fff14050604ddcf6825147347a56ac6e";
+      sha512 = "fdb5eacc20856b0735ba8e9f2ff47eee70e6c203b53bbc38cf65a4949ad939cc70ab640392bed4c6964bc4acc25c0351b4d9e2ee2b2d72f6b2ff3247eaa8e2de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/uk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/uk/firefox-61.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "b8fe37b1922275e2bb717dac3ab24f5872bd1b15d48120504b018b28319956ba6a4d4587a9d87b128d7420fcf19fa09c0821fbce21d0136b35882aa3e2586e3c";
+      sha512 = "7da1522c7af4e9db8f3fc7a7a2fa30ac12a06c8c20d7d53e0a0097ceaced9124d861d688b6ef26e8f808ba672bfe12b2ad3e4ee5921a0771d0348bf99a5bd1b0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ur/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ur/firefox-61.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "fdf65d54545271e79b118787a28a903b130c17569cc763d495c62150949cda4dcc6c1697fde0d038229a7cdd8c99f2d43dc530844f2ae1b75f87512901c763d6";
+      sha512 = "a146f736849969e36b72f69661da5d50cc3ecc79542ddf84e09a12d9877b6d654734a22d28a2320b0e27c4443f05186bab2549f55e582eb6f2279bb1922f3979";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/uz/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/uz/firefox-61.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "caa53302be25bef37d7a40e3853cb175eb68a828abfc1e1f8562cd69312f785b9e7e853dbe796c758e01fa92129937f0625c7eae3aed07690395a92ab845d3c2";
+      sha512 = "62bebbf542d9b2fc62cf0c9e4abca1a216c222ca97bf59d1c5639a04cdb13a230e80a1762af6f682e0bdc7042685b9104702810c2199bb4ff092e0a63b81535f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/vi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/vi/firefox-61.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "cfad4746a9357219a29f9d55e455e11e7d3c49a8d231ed18b64e728edb44ea3f5200bccd8b2115bc1e00cefb73a5a74af4f9a23aae4ded7f29d8f04678ee9f28";
+      sha512 = "b3c4477e89ce0fffaa2f7f6d9d0b64d5ee6856e4a40183f07f87ec10393f73041d2c6d87a3460dd399f8bc96e11ca6264af0599e869b5d87da0e1415d5853b08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/xh/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/xh/firefox-61.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "a17d844b4ad6498c7b7c937d674f2129ad365c59a7178b9ed51cbcab6695f08746949b485c02bfcc72916a0a37b138aa9fa651897a5719504050783901f78ba9";
+      sha512 = "0b0faf13210802a911f899a0b5df4ca67bda2eb98a8c37b43f0cf9f9ec5fe9c7798f375c6369c5507e23e45f772c7f610d048348ecb18e5519f5796342bdb46a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/zh-CN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/zh-CN/firefox-61.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "1a2ff744cac644e67aecaf838f5050324dfe4101842820fe847e86e55c3d711f661b59ceac1e7c3fe3d648576a93591951a74be5696c820956ba712418c3c52d";
+      sha512 = "53ad88363b5c884a7660cbe0aca223e2baf9f3fac49b6d4928d7744be2e70d4feb1dd4321283c76fb4375c9b74bd5ec73511b43c165f2a3d032185d25b92456c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/zh-TW/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/zh-TW/firefox-61.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "86e03ba89c9918542305d35d18aff083a8e618e741dead7f11d7a01a05ff5addabf8fad060112b6c2cd5ef0ef7b3389fdf02cda4c65370449b2f4049049407a4";
+      sha512 = "8c1551b2bbd07e046ebed7604c0e64d5764af28f94a628b6cba3c68d0258db3f26810d8eb9755013724530a5656e29e05f012fc3c0477977dea079e02a755cbb";
     }
     ];
 }
-- 
GitLab


From 677f40dd10981df8c266ac68c8d1bfbafbad3036 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 16 May 2018 14:24:34 +0800
Subject: [PATCH 0785/1085] firefox-beta-bin: 61.0b4 -> 61.0b5

---
 .../browsers/firefox-bin/beta_sources.nix     | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 2ac0e9c1b26..60a7e77efc0 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b4";
+  version = "61.0b5";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ach/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ach/firefox-61.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "1253b49fcb5705c5f35ba972ef6949cc9be52b0b509c15f1ad3197918cade88df3a69c6dcd1ba32fcaecf5485d0e614b008a1e05adb5c0675de50345cb2ef7bc";
+      sha512 = "720e57f7ce1dec861b50fa556f6d8569ccb8bd1752b9e25acd1001d772f13c8931e4e922736577af029ab774ccffc6accbda1eb4ff8cb16864808037cc6b4700";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/af/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/af/firefox-61.0b5.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "0668158d59973ebc1a6701066bd736304e8cb8d41095aef296b0a807eb0baf23edb1e399605c097dbfddbdbec191ad570d56a92e40edf4801cd2e857d03fc8e7";
+      sha512 = "a2302f2f3f604ea3f41f6a2819ea6277b10dbb4d81eaacb754506c8938fbf5de518d5e35004137cfe7cf00d36be3d7081bd7414041266555c06e7ea23f17cd6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/an/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/an/firefox-61.0b5.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "97f9ea677bd851dfe37d5d4f1fa54f0286f5245a7f13924bbd576a1c6ac19f14c96937e78c3c05e3f13cea146ab91d4e36c8501cda2026663f09536e12e5af80";
+      sha512 = "0b3fb243cbe4d1fd08eb293bc1abeb1ee87674f7e7a189514a988d8bd2d733e51b29537cbaf1bc48f3665d06004740a9f4eebc395e4ca3a4a60b3e464e2b9e93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ar/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ar/firefox-61.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "85dc5ce10e6aa418d5f035a53cc392230010a89a3994579d40b926d5e2d1ccd41ff14bf86f634212c49ed2c24a10558e449fd82836deee2002039330b1b5baf4";
+      sha512 = "47a80e63a76a15a689615c5fcdd9f4580854de0645dca2fb234f2f7737dcb8047e557ed64142aec6a8e153668f213f0fb28866b122aacc3e7376c6f1929797f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/as/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/as/firefox-61.0b5.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "58d67ff5acacc6458d3ea24d017185a44072d2552e664c9d5867fce16e77c679a3f886dd5e680a12f0a09e77af82d50e375f43fd724dba10e62c52c9611b300c";
+      sha512 = "22aae0b42b265b5be89b2d1557725f4b19c3be5f8cb5fd0d65c1325400073a7606bbbd4e3f57851d4c8d433af61ecca81bf19c25b9974b04e3422ed8187d7313";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ast/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ast/firefox-61.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "c1cad96695ceed2c9f8461d3a00c7f4c79064e79e808f0daf3f7b240c7af3fc076dde7a5c70b1ddba4b6291e51658f11937c9155c1c130bb9aad6a2bb83d8bef";
+      sha512 = "3d406553eb53c75a61bae3b62377c5d15b42b64a64e84068217a38785b39785927edd4f1363c5318a07dcded215494b1622e37ba96732c001258260733b2308e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/az/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/az/firefox-61.0b5.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "8340347da83edd0d74543b7ccf8add125cf1a3722d182753cfbc5270b350e0b5268925b17dfea35ca565d360fc9fe03e1ba42939df2ea342329639eec98803c9";
+      sha512 = "0764176093cc608f6e0b9c521e50a4b0fd8894ac642ce3d14df884c0460d6df2f8fb2a9d61cebda475b9d7000e22bba87a677abdffbf13d0ad0b89a4f004ff8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/be/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/be/firefox-61.0b5.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "be2f46fbd814e464d5db068ce0d5c3f1f5531b90c13c8b420813559f99f9c511f1505943dbdd94bce01dafa7e709ed6fddcde7ac13d9d6e7b28eed56062d799e";
+      sha512 = "a282df1a9cf4ad2fa061eacb2ca49d91d599c6d98b13f7fe066649d6060b92a8a15c5a823f6a1d945dfe4c4ab1a2facf19b4acddbe614a0bed5f704aa717bf84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bg/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bg/firefox-61.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "128835294278c381e4800cf5fc4b572e2ddae72f02f6f3c077f3b1c7557eb106858d3c40e254fd328a31d5520644bdc3263deadbfd2cbf31ae6092a5ed9d43a9";
+      sha512 = "7b3f4ed2c2c29c9e804291930c1af962edc842f567b2ff1c17aee04c9e209e3cedb2e462d8bd56f16bc2d9536e30495d74368f1c89a63235bf5db7c4bb44352f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bn-BD/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bn-BD/firefox-61.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "205bfe4d02cc73560eb11ee79ff2f737ee96a3234e62589399adaa03ea48cc8d0abf81567536f7fb11dbe037c751ef317a841fde5a2b1a6d29fb9a0fdc71d05d";
+      sha512 = "92881d1c03a35dcbefaf5f66185225f30c83bbf95eabc5c6219dd957747abbdbc8bee28a65eadc474df54063f2a85bc1fc7f00db0de92fa2de38221ceb504562";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bn-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bn-IN/firefox-61.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "5d4c5b3f7b025b77089246889209d3f7e3c0ca924da9a6d4886ed0c96d437c7c47452e8a2cf3d030ad4e4859565e3b0cb18ee1132852e1460bb1529058cd4198";
+      sha512 = "73565490419a39038efda09122f88b1de5f4aa3eb716ad7e984b8c0b86ae4c02901c4f9f10782bb8ce63af90dece08aabe3fe8a98b04367dbda46f5ab53311e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/br/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/br/firefox-61.0b5.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "3d6baadab9b20598e8d4fb604720dfab67eefb89e9e9d58f220a8b7165f8162506e19ada83d0085349a63ca31b861a3b6ff1df4b15436d2256f7591db58ff3d1";
+      sha512 = "6c4df94f9cc3b8997678c68ecd2b2ade8707ab6da388748604ad31bbe2af04a8b49f9a6d826036949252d50d7e188ffa30bec3d8a5d12f12dad992af1846fd09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bs/firefox-61.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "29a8df8006287fd38a283cc499a799174a14359d7a540cf5ed1983da98d1efbbd504489eeb6b2b5d420c06f42a0a3f9b5e7afd1c1d5cc70f9eff8b354bf3cfb3";
+      sha512 = "fc4ba1fe9a8b439c40c99b68dd4bace3008ba13482f8ffe821942aeb513b2975e1c83fd267d980e93e1cee8b3662d13f444f46c1bc4c54088c45ce2fca9c3918";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ca/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ca/firefox-61.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "3daa8bdb22e64dc39a359ab15a55d001c95ecf53ade50c0779e0b744043b21d41f36cdc1d3fff53f59c71dd0205a089f7af21074e6ae34d1b03744ad7cd38631";
+      sha512 = "c74ee9c4de09a65d33b1e2e3d21e5901d884f981a0d90c81e4715214886d80ceb219bf96c4c9a9e19e6b278df89c31b3232846a5d0f5539b5c1234a312414469";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/cak/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cak/firefox-61.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "031311b5ad4173778f879f5241cdeb559739875bb49330d20c37d5733b7e58a226480b6c456a297d509a9a379803bd5de38343249dca1fcccdc74b9ec1b97ac3";
+      sha512 = "59b5a2602bc0fad1b77578179d73acf00473dc1426cbede4b4b42973ea62399b3ae637c728443786fbc78ff3a15cdecf003764ee57f23642167825a3b4e38ab4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/cs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cs/firefox-61.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "979985e5a292bacd3031554288b92d8d90f9b05ce8f59ca2126a5f0d2b38436cf39fec21d830e16204982157d722e8fa9483062d3bd3c78cf2cb462a5c13d597";
+      sha512 = "b583fd92f83bc2320b69b1a8ffa880c289128c31475d69924e6690bf8bd3c4aa3833883a3e012eccab850125751681c1aabb9f3c574d9b49815757e6d0a29aab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/cy/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cy/firefox-61.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "3572e150c1effc9d5b67cad7954a69ddd50f6aa5159adb6ac40f0e2c557cf03f6760e664be604edb27faeed8235b43793122223fadd61ba6923694ae689fb740";
+      sha512 = "df9487ecf368f8198910df6514ba4c2000a3ad2aebaef3c442621008c8a89a356d38e3afde11471c426cba24b422db1104214b58b92ea9cfc040f30e817f68b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/da/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/da/firefox-61.0b5.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "241dc58b57f683b3a568f456f1235a78af6b8089837b508c98c5e223eb1c9e98507df80aeb805752a9bfa15b0837f457e3b2cbab683982ab7ef29cbb1177b4c5";
+      sha512 = "117f836242eabd1a393b3b5cc0530d6c0f522fc16a4703b52d3e24f45796a0573baf05add71080e1b96481b253bab07aad3a41166653eb0e83d46447fa85d8df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/de/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/de/firefox-61.0b5.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "d86f8658348a006b8f0baa020f273cb40c46fe82b34a2de4a2193439777ff6d0874bd63cb143c976c6de9eac4170ed8081d446267d2dd1185fc8625268f11f1b";
+      sha512 = "fc77f7d86d72c58ee87a05d25e96268d6c582321bf9d11d85f2cc6a471c43e2a83f6f76a3c846b27d096d9dc0de661b0d2289972a39c6853b45a3d761bfc40e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/dsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/dsb/firefox-61.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "bf73cd3a94aae19e1e58fa492d766ce43be171f349c7f5cf3f889bbd1c3c0f8aca3378eda8583b9c9007b1b26f4d159b281f85b5a33279635acd22289badcc3b";
+      sha512 = "99a01ad4a11bfaa0972014a1a7541bed757229d8df052f91a6935f8b048fadf015ba0db0f1bf1e0bb7e8437eb5fee692990ed84362ff95513865134fcf12eb9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/el/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/el/firefox-61.0b5.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "fc7acf24643996c6f3c63f1ef392883b24875914111128ec5c3cd4aaa3fe45b3a8b86ffa0a32f288231d10229f1824526fe7130a96524b7abc4917f375f3d96f";
+      sha512 = "f0a9e8887a498e100ffedacc6bb5a988dfbec5fc06317e8c95462da20caa744c7ad120ad03637dc8392aae6c6e730879eddfa76dfc04107b15740cdeffa70677";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/en-GB/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-GB/firefox-61.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "d79ebb446402325a043acf700c1aa05ed85793423a0795e6afd397a004ac4f01bef39ad7c31d3dafaed2ee665c86b4ea4293292773a3eb7442c995c73c47ae48";
+      sha512 = "8f7849f2b3500b54ee876a4ded2376ec665e036e705297a0b6eea43c70fb3db3ef0a89b112a80814e3eecd770b34fd119786ec0d34ea850003fadd38299a8560";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/en-US/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-US/firefox-61.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "13d1ff7486bc06daa37b1d9e98034fd463f663bae35d1163fbb4f033c327c5d85e8fcbecd2d9854456fe4e176748b921cc96d02b0889beab332a4a6987b2c457";
+      sha512 = "de807109ef44c58e43c74fdcbe22553fe1760b38b1107ca99261e21b43da526bb875871dcbc27f8b9811c8ef4f742523526f09a4649ca0d1c7f10f69048ff997";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/en-ZA/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-ZA/firefox-61.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "843fc740b224b07307517a17fae1ea342dcb71564b511172da3f8d96f566908e485da5f0de81fb924625edd5b182e9855d4c39485b5d5e6b1f03d227a1582cdd";
+      sha512 = "46a14786b361f0d8250634c4267835aad3f7737b0451b336065674c00392b0208d31f6a0d6d62adcd2073002cf75d7caa286be3509f3f5f3100111c23673fd1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/eo/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/eo/firefox-61.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "fd62f3c1b4295fd91c3b0e3606761da2f4dbf534ff9c29d63c150b3e0c08663c8639499643163868fc3a205159afaf1766127d68dfbbe91262109b4673d6e4d6";
+      sha512 = "ab59244973e42a3551de4e6dcc31122f9b03537d4202a4d7645a598166e2847a43b2e902a70876e19bf4a4a083658c86dd5903cd3bc10aa0c777e20f55d1c796";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-AR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-AR/firefox-61.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "098bbb5b7e60d72561e99fbe55d5aa7fdad0ca78daa9085ef47814e525a284fc69d5dc2723974df97b4567dc050a7c23c77a92f16ac29f8f1f2c32feb0fed5a3";
+      sha512 = "ef48f5124704f10b03b442222765461c1cbda38422476c09787ab194e850576ebbdff741ac179f0c6ca8d0ff8e8d23a631eaef70ffdda09e9f8aab21aa557f78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-CL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-CL/firefox-61.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "1e518d4c0149e51452b7710791dde0e51c92a16183e36d2130beb1a9471bb213853cced03604cb81b209a550c8c19b27f69c2ec13774f63dd143abfd27187568";
+      sha512 = "f15d84b35ad9eabe6a5cfbf4dbe1cd3bb57f4f2662b455c9ca7b69dcc410cce688ffd040cd783b65d429118a56714e0e475f68c25ebb6963ae1f0edd5493e846";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-ES/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-ES/firefox-61.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "cbec05d15f141e61612d9eb2e0001104500839d1cff156398d58fdab027d446a7f936d96e257d6ea8c35082f1a519f16155a6e45f6186989a09bc75fdcff4e7c";
+      sha512 = "0b518e998dc2f584ce1ad652737c3331495efb831c4fd336a6c374f36e5d06711bfa7dd476b674df3cb4a91e25759bba09def752d9dc97acb65adf2112f23910";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-MX/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-MX/firefox-61.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "33670d131c9746823f205260829d789144079c71e089c399f4fc9ece9c19ea1e2f840f48ea8b629cc1101e3e776bfc12dff3e6ddb48c27547d458f7ae9a61744";
+      sha512 = "f72d7622734489ba3fae9b578ef0f9f3fe84a7ccb673f2d8e3177998978e6e1b28ec89fd18aaacd914865302c00c6ebe991cea72392fc23ccab7350e23234c7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/et/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/et/firefox-61.0b5.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "ceb2cbca7b75b2dc083d40ed6c9fedf0fcaf6e2b7a626cd93e3de0d92b6cf73b60374d8b90d6fa57ae2910c06af84f00e55a2769725be87b37e2291b15d1f0b8";
+      sha512 = "c57d5587879869e2f264e82753b9b53090ec530a98104024dd57fb3af06350121a547140e6ce4b06d397331e201329c2cf582b119dfcc56cf70acbcb47429673";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/eu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/eu/firefox-61.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "4e6a8878c8adfe5e8fd5ba0b6eaa6ba88ff4f76cc5f3a8178040ef72d838141360fa56b0f125490a1effcadaf964cddaabe3c769a69e67c94400bc07ece89cb9";
+      sha512 = "471089facb9eb7b0878dad4845d79b1e2d6c9fc918ebeba770320bedf443e40e7382bc876f1664609c4a9a9888c39ef9d7ce9f3dadbf50f9868cbf17b0d7ed64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fa/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fa/firefox-61.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "9aa36ed9b2e9770d56302d41a373ae19510caa8c5442928dbeb70bfdf46ce2746a68776713ae54b0b996c1f3b6e36a5efc45d5b2a4508d1b0bea0e49adc0f380";
+      sha512 = "3c0a7a84b1585e9a1e27e0db10826aa37258180733c0bc1316f6b37e997eeba5edf7d8a400cd86b2cd82c2c31dfa36d5e44e5214bbe0f40fc250c59bdbc0d7eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ff/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ff/firefox-61.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "53955ae8ddd8d46863cb960e2709d643869b882c15cb5b13f73c05a6442a38d3be5df47f3da670031bc99f22dfbb10ae80ac9799a71ef775fbe34649c803c82a";
+      sha512 = "6afd3a5d162dbf2fa21ac75792de481aad75a82f1f1c6b6cd82456ea8456c0eace20227e4f54133a5a96f8c1619d92113b2006f17f49f8ef9fbcb9564122df33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fi/firefox-61.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "78d9adc8c5b05cae1def5260aee2ca9419cf1e46ac2f4e5272f565ff73fa2cf57912120c7bf2160cf4df18722e63a4aebcd3574ec3c61c2f35c757ac677d5862";
+      sha512 = "f7288a081aebd8e79ebfd2a3baaacb237eb9fa0b4a9a6314f6758af1c557b09105be188bef7a40b27389d1dc2bf60ee984d991f9caa77292ae0c7c100887c448";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fr/firefox-61.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "1235a994606f43e3c9d8660adbd9d3049da19cf5e654d8deab2affa18835a65a3bb297dc99de7ac6949bdb4c1c47296e2dcadc859833740c235c4364c418b5f3";
+      sha512 = "591fcd8f2480ab578a530358241e0d9a624610199d315d7c215f7320980d29dd28ba4e8c35c40196ff284ad19269b5053133c9eb860cd2def922c277085d4f57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fy-NL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fy-NL/firefox-61.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "44d97d3842a2ac5f816e7c74301cd85a8e09884438e5130cee9d17f0b4a59015831169afa47bc2dc6f89d7934d356bec18bbfc20bc97c0a85b441214afc9de71";
+      sha512 = "1738b3175e9fb7fa67aaee3d1fde9525e85e2604777b82f0f35b48ddcf08f4dacc0f0698641c6ef05c4bf156c5d785223e5ed20b0b4ceff84860f46d4fc65a38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ga-IE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ga-IE/firefox-61.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "5f1e8aff2b70032c5907a73f99b1d62500a583ce7c5d5aab50faa5e40f4cfc01f1ae10936ecec9436ef4dfc8b5db1fbfc1603f0a5bbbec0a9c04eea32f9f9907";
+      sha512 = "ff6c3c96853229a582253c6bee51bd041bb0d5090b260902955b8a9db40cc22aebd930230cafa3633d2b7137e8601e107dc276b5bca03bf26b205534caee0118";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gd/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gd/firefox-61.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "1d971abafa1636d154f015d874e97db108b48a1f6e188145afb7f3f4da1c01f4b80fc152e917fe3baf419af767172b965657f75afc4cd694523d458498631b42";
+      sha512 = "52df8410c5c9d0b1bfb763610a7d5e3e8d3db41e16285ee5b02be9994f88deb30648c209d29a1c63eb9539220ddfa99023bb31475fad40fe8f347bf41c71f2ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gl/firefox-61.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "cf9cccd08695208227d0cbdc1531df4957817327c95f8aacb8314d0991f7c0226fb8e4cb565c18830cf5026d7e87e32b4e445a4580ed27c0fa0ce643c9f37657";
+      sha512 = "dbb9000ecb87fc7d56d639ae6d7b92d1f78d3143edba153f363bf49869696cbaa24b1aabe081b48a5d324d9e7c783deaafaf5ec7d58fa99e4d1c0c3fa530675e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gn/firefox-61.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "79dcd2747c22484002bacbc7266a793c984a0f51b34921256d351a0df5d5d0fe041f2cb6db0757ff48c9b32551c882fa60c0d052d8d59a94f0747f40728a5e85";
+      sha512 = "bef3b0648e7e2057fbcea9966e55353eedcc0f6e7de658fd5b472573a0014eeb387c4e625d95ec75ed289b809fbca8a47d79d464655eda8c0e9745f28be91daa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gu-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gu-IN/firefox-61.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "425f0864046581340110ea61a6a3abc87a5b12c2c24401b91273fc5c55014a0af9d1868e4e2918b30576394d97f16854252fe999d0a5b84ffc15c7b7765e20b5";
+      sha512 = "e3d966d378a2c66ccf223b9f12191f963c8b8d795d05d854c9739d4e4418b95125bd5d8d97d783bcef432c55b17bf500a5b3fc391758eaace12d186a89e09df7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/he/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/he/firefox-61.0b5.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "7a2b5119651e391164f514e8deba75cbbc7fb2b89353d5386758e3f1442d0a9d61bfcc9fa5ac28c20a0b4eaa793c04d7c45c6dc43aeb4d0042aa07a1efb22d26";
+      sha512 = "3eac4e2e2153a3d1d2eb9aee9a0f7b8ddeb9bfa8dfaad3ba42a84f117d875a37cd9b67e7342f8894c35463f1b882ff24aed5e154cb7c8cde291632e6e66d02fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hi-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hi-IN/firefox-61.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "b0bca544fda321aeb18e91c6c639434084ba508cd0bb3027271d61075fbe11c10c9114d5f3bacb3538bf5bf41dd83f37b9231ecba7c8586a19f64c367d7bc0a9";
+      sha512 = "eddee4cbb273883aba916588af0aa7205c27edccafa190532fcf6695f592eb824c92bbdcea22b9e0a2ef98fe4ec188b9a5afe8fc87212b3b10d638d6d435df71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hr/firefox-61.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "baf8526abbdac323b3976c0561a4f7152465db2f7acbafca467c06794ced55f851d30c1a02161945791097351ad5e07a4a77d89bb8e6084e682fd39813ab5af5";
+      sha512 = "606aa417c0dc7c4953f1c91b9e52c506f971c155491a766b12f3fd7780ac8df4da4a23759f2a203e0a8dbb25a99778def10edf4e3755dffa66bc489d55a413e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hsb/firefox-61.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "21678434d8b8c90ccd8e6f04f29c0d5d99376a0ee8a0c34b4748982b48591cc5f6f361b3c8e50bc90fb45668e439db9b1e7e1e0bcd88bf65d42186463decd348";
+      sha512 = "b5f7668047c61d84a0d027e6750983be66889fa1da4dfa471ba79bf61e706341e877bf0333130332a6afada025c4d84d76500d2ef644847e6eb1984f10dd7a7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hu/firefox-61.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "7964a915f1bb67cbe69a62ea5d707e81cea6a1f1e221cb8b35754a90c074d70822357bf71562877aaae41d53d58a310a4db39d388f53a011fdbc195160038525";
+      sha512 = "1439004f92d61e0fcb9c8d4cb356b3c30c82375f17852bce49e63fc9d5b939ae69e9fe415b6323901460c77aaf98106d534c7d8fcda5dcd07b9d25512586e06f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hy-AM/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hy-AM/firefox-61.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "71f1f37b090e370ce5152290a6ba89cee3d29dea718247c5c472cc0d619e37c60910445f4cf57e0e0693a8af9d439820e2da57fb0b88e85f2c13db042252e8a5";
+      sha512 = "5df1b2406e7bc3b5ae971b69a67f95bbd76d81047678799648de1facae89bd83cbf00ff53217b1e9dddfa127351c440d6def5a509f39e58d9aa08b1d6c0c8234";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ia/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ia/firefox-61.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "92ce50a687a76bd51d852a65e5bd2495d572adbdcb250183c5a757d7c4ca09f2420c5b3e2abf968a956a5625bef4e28fd46f048bd79ea8be0a5a49e783986add";
+      sha512 = "35d537fc26a8e51125c52eeba7bf7ae15aa9cece05e35f60937851fde672746fc6c8440c50c554e6b6606b76b8262024da20e9b1909dd69d99518a71e7d505c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/id/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/id/firefox-61.0b5.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "668db99ee60ed9553076f8de71e228386d04bb337a3ef6efd25e9cc8a193ab98a472562bee667314cae745895089d34d08e8a11e0f21d6407b6f4d443be9f52d";
+      sha512 = "6ec504f45a0653d9e51019e7bb095ba1d8b8c677cde65a68ae9f09dd165a124073f243e86b89e90c674ba91c19851500653b044a00c6c1ef761fac4456dfe75a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/is/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/is/firefox-61.0b5.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "409d8b328287e504128f1e5a76793e8bfffc43453d3fde593c0a3048b4c3d5cfcba155269b629039acd6d29d53f862a00cb1e9f63fe2ea49c9c96793f440db16";
+      sha512 = "24ef8c4de57aab0638a1d8841cab8335bada9025e051d10ba2e5c4a9985d459848d1d1fa6265b5914b1c5081377ab52c7a49c291388674d184a54162bbe73e5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/it/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/it/firefox-61.0b5.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "d6ebeec88e354b3fe1e21a259e85c67c1aeed0278eb82c8da5d4df1990a94cb3bc239ae0094146da31f53715722d225ec7ecdc13c62bc69ac6a0d99854cdffca";
+      sha512 = "016566868c55c5df99debd049540f72d51c7ae944cf70c597d166080452147869b586c872d694b370244941dc1b3668f7ecec164fca73d884d650b852b6f15e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ja/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ja/firefox-61.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "d81dc550cb3b8c07da81205268ca7411a81fbe481f289f7a35bc84cb8fcea978ce1c30d8d36b6b87349b5bf2c9bea45d98c6e0e96ee376e2fcdbf2f1fdddbdfd";
+      sha512 = "cd5e821c5f4bbdabb0f08e77eb5968e8ccb53dc720f4f66022f2ada325278fdc6e9f13d3b5bd830dd7867d3032c85ad869ecc25ba4eb8bdc027c8dd45713194e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ka/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ka/firefox-61.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "9005824d0555987b997366cf6bdc776f2df18e4e15b32a3953acda22ad669ea073233c91f8c2b12b5d1f783611bbd3acd9859778ec19d21d929595f206b55a73";
+      sha512 = "21b472b694fcb31284bdbd1d1b3e531761db82e8fd5f406ca62251f9cf53e5f64fef659d5eb0372bf545560d4671d814895a4e4befe4313580e1a52714101d1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/kab/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kab/firefox-61.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "955c96dfb14225b9249323a4be404a4a2acc5523398c3456b22406f6aac4ba9a7e84607c7d9f3ef203feaaf66ab190b04d17ebb3562a0789143fe78b79fb6d26";
+      sha512 = "6a638a21a3c410811366070d32cfb4119bbf16d887383562736cf96be17bc08944dc062767ae56f7b6bcf7d4c96b97383defec4b5726879edb5be770c5053a42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/kk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kk/firefox-61.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "a6519912de9d60fe4eb11bd14b65c946b9d80ef21c001689363d2f34ea3dcb6cfd108068538a96e0c566db48ffd4322ba3ca7ef4d6c4f95e8c22e4a41ada9cd6";
+      sha512 = "5b4e620e01362d763d3d7a98eb5559ccdbdc78e11e0792b64f29dd0b0799aeb78b9404d008c1ed7489f56ad553e249ed1d6649588dce0d7b6161506a743b48d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/km/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/km/firefox-61.0b5.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "af3a016e28b9a2d0150298878188f798f781dcbe3553bb7231ce9d5a7bcd3b3c2c9ccc9a5a867efee4d0bfbdfe70355ada38e2e3531bfc63382bc2d2d9db7377";
+      sha512 = "7dda622c7a6fd69b43cb1895c6faed9a2fef75c0cde3680c445d5b86b8d97947770e4eebad44324d71384ba2b407a10db045d4d108e412ca92f6a223a433980c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/kn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kn/firefox-61.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "872a6d1dd69a540e253a15376a5ed0af35ccd65d400c110ac82046749c05a43b73c6f8980a0d1d8f4bc11cb8e01d412ec170b3d905461d8f896f37f3cbb6cdab";
+      sha512 = "93f68424ec2de8a7e6c319e1d243d09c4e313f59e5e102c68b06e21832a88bd32dc56f48119c1a6b92774fbf42b920f9245a12650826fbb9549c77409f9e3b5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ko/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ko/firefox-61.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "d8890110362ce85decec314f885cfba90c8ee7c0287a60b8b747176bf45426706f88f78642d2c92e4542913cf64a602cc36a706d3331330fd3d37579af1b12dc";
+      sha512 = "b4172a12cc3c785055f574463478e00d74aa3e0fb25389c8a4a67ff4966bfd74e4282e7d6c94c357895cf16265115651743302b28332fa8ef117bfd50778a3cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/lij/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lij/firefox-61.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "73b79ee6702844e66ca565f10ec28d4640345303e1cf51e57a064eb01ce9be9c02332d8dc9700466e11ef38a03c99203ad7935fa6ca14cd751b8ee2096c2972c";
+      sha512 = "b7303e3bf959f9eaaa06f3742eba9e039b46a4d00480651519d54a3df1b919e576c301e193f016d84f5b53eb03e57f58cd22f3648f289d4628ef8c7f547d8ff3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/lt/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lt/firefox-61.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "d463bfd3766e950e40309845ec88f1ae52a72f38dbc41ccdb1652882f5aabc94b9b204b0d3e1bf1a0e4959eb2a23694bb189bda14f9dac3c91401c2a646be8a4";
+      sha512 = "4e14b4b1617361769e1e8a8a621cba4bd7a7044f6a7e4c2ed28369b79cbc5473a438d68ffecbf42a6a62e33aff6cef0b8dafb135cca5d65d07d6f0028a362c8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/lv/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lv/firefox-61.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "2616476c2280b7e1c21ab7f850342e8deaff2c97b1f0ef05496ed1b87c15578dca206eed0f853866c5d018be4a2d6281472033f490466b41132c5623abc7574b";
+      sha512 = "0f85c67e06eca79e14e9aa41fc25d6e8371289b97d39a1e2b3b6a0b9c73398503f70e5a0cac1b02d9fe12daf805e35c433c78962ee52ea03d151b1d1b7254dd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/mai/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mai/firefox-61.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "3628ddce5fe431663d46c4973059112b3384f907d3e76ea99266968a855cf88de932985e2912ea6513c0bba7b321bcb125024d9b52a1920cb6c02211a876bbcd";
+      sha512 = "9a36f85dab0ace56a361bcb0bc00241aa3087028f4ba8b91b64e76963e8979a9bf4c526d922449e39f4f0a574d0f9d7d29cf033bc2832c88be76ece443fda6da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/mk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mk/firefox-61.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "be145f4a7919433312a25c318b072e40160285542b9d9a9659aabc0a90f2d6641329745ca3950b4da2c0e58ee9c106b93cb93bd5e806cd35e0884217eec3a20f";
+      sha512 = "2523ae24ccceb2a884d71238b406aee20a359a881039e0e864b49358f2673f44663e105efea7ff094656e54e334c1d9b37d9834a841ca3b938ba4b2abf14bcc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ml/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ml/firefox-61.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "4cd05fa46a357eff1a1121abc72e07b992763e702b5c58a82fed7b4a8b731154b4d6e5578a6334e4ea5a58323ef0bb0761beb10ff971ca25482e973144f2f6ac";
+      sha512 = "bc07ff82e6e2521c40db7391cad7b1246bbc8b99b45653cca2e76d8ac44dd341f66cb0d28b93e0a454ae78177b0f85b56b5cba3bf43a2a147178706544435874";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/mr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mr/firefox-61.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "5aa015d9a68c5d840cb20cb86ad98b837a97ff08da1ddd7f2c4b003d7aceefe9f82574248a39e86b45f5567adcdea2efe7821ad0fc019042fc507a3c673e628a";
+      sha512 = "aec0eabf17162f0750ad54003bab89f5ca9d4d059b88d99c2c07877decc64256a411b561daccc0eab5fce16a642daf9a6f86cd1a2f50a0d68c140f44ca941404";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ms/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ms/firefox-61.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "e02b8441994cd826bc308f0a5955d0a646b60acee04a254e35b9b3ec4dbc36374bbc2405e917fae352b9f000b7e72d3242520f092f27b7fa171ea5f9808d240a";
+      sha512 = "ffd034a7fcf7ff9fdd03539f84792aa5f3ff23276f846498aeca15b55fa2d30791e4ee66eb0f0867db2cc3f869d306a36cbe8501957a224de4b17b9c4a0dbfa4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/my/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/my/firefox-61.0b5.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "1a20e82aeea3151d66b673f774a6c284ba8155f3f724c1f1cf79195a41cffbcf56af3399a7b526ba9a43f294a7a6c155c5914035417b36616ebb88d9e9125dc2";
+      sha512 = "7916547a252d0e3e0161b6c0128003407718a2d88748ea33933edaed37de07baceba825cbe64aa9d78d13c5a303cb870a0d282e05b6fee3370ab209e27329354";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/nb-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nb-NO/firefox-61.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "0bfba4dc5ad7f20a5660b1492e356c1ad2113a7e67e74cb86950600c0a209b47bc398e8c9f6fef8d27bde502b706c04965046316d952fbd8f2eb7d1f87af3e10";
+      sha512 = "bebc0324bb9134644dcecac3519dff56ae0f394bb36cd6030641d2482c18f08b825eb2c197f9a87748b8217c0b43323bec3056f7aeb1633aa46d0d049d3c8528";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ne-NP/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ne-NP/firefox-61.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "f373d90059cb2b65f3eaf34af16dd5644c28f3bfad9fff8a02b855b5b3a0da3146b876e835add7e70e94d59a911c68ab61dcdae8739d2e2a39afda3cde6e813f";
+      sha512 = "842c6f1251e7478b285263e8d46f36dc6bb9d5216725cb1447b0272ac439c284a72b1316095f35bb10445617c15047c5fee84a3763ae03120658c613ed5b4ff0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/nl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nl/firefox-61.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "bd971832a63eb6d8a2df4ba1ee69db7390ac8da13894aaccea7bbb79d27d1c29dc541144202b1e44ae95dff5e0c1425ee17c2845acad9c55b9126fe20d53e85c";
+      sha512 = "672d5083ddca12a22a3fd639610312c13330b5cd6c09a99bab1442ddd58c86552064a4d555eb7331c658fcff9408bc62617f80e7797c4c502251791585b2035c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/nn-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nn-NO/firefox-61.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "a5017881f6b2ba0453b3ef41d6a47763fabf7a87e18e47e9b97d8c7d3ed4dead67687fbe3b1ed18d23e6ca3a85db4ca4dc3632537f74432faa1ea5fb69deccad";
+      sha512 = "ccedbb3b1d4eace21851c3490c3779eb29162cfbfd2aec987497ea949dc564a6b516c16ad08c31fd5c05147939ac329f8853bfdcc6af17259a905a18af9f4867";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/oc/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/oc/firefox-61.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "f0593858258ec794dccaa420dcc39fb3bc35dda0c5b9996c7069d53d2b68fb2e373fbbb40859099ab8d85044308da500cf931dfb6e2d6132c7be2ffa350d653f";
+      sha512 = "872532c28868e681fc230582828d6ff19beba70ff29b71aaad85ce19422d68c85560def8cbee5cdbea6b8360cef5827a84b1116e1fc309d94a16c6c2fe9872a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/or/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/or/firefox-61.0b5.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "33cbdcb3331097ab29581595579a2bff78c2af99dd20ccc9b0308cab6ae73335b990582d559cf8d9459c422f03f4dc0dfcba4b72c3e66bd286db001e0064a6c7";
+      sha512 = "12beee4eafe1c5f41c772bd2b8587f92bd2318af776bc09b935913006b0df2ee7bff7cbd8ad621737ee1c83792db96d51b7d7ee45fdab829c5cfaaf32632e82f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pa-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pa-IN/firefox-61.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "b5af8ed8a500d8b7b8ccc7ac44be235c8182dad44a55e461365f7b9089190c40d7ab7d2ec0fef7189d19ee0d80f96bdcecdaadc563c7d281f61ede5d19ba227e";
+      sha512 = "97d3d44d1800b9fd8cedbd90cac6472a3f2f8c4840cb7aa93bb08acb067d47f80c98e2ba3c8d8554ad8987c0cf6d392f64ff0a08127481b30c23915e5f986ad5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pl/firefox-61.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "77a651fb2b5bcb33754adbaf09e1c5abaf9c07af78fe5907b8954a1d0439d2853186070124e926a4ea2dae6acdefc5487632110557e96fda274556e97fdf2061";
+      sha512 = "6dc388f02cd52c50bd158668bbd86f9ffdf80561e9b9da207fd1e57286d8bad40a4a54fffe02c7102e325ec7b7ff3c2ecc2bb4cada9a3dea544efdd73ef02a98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pt-BR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pt-BR/firefox-61.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "0de1974b69f3d95381be1ac1366e9e7cf1057e26adeb655e20b088bd77035fc00bf94f0db24e676e5dffb320efc99481a9c9ccdeb5f6b0ca5c7050313daa3ba4";
+      sha512 = "496cfa11dae110e7d8484fbe43ad689f7d0f6c981c8dfc1634586c533db23b417c7856e63257432d377f4f1b354557733738a613118178eece59049d5790fd88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pt-PT/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pt-PT/firefox-61.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "dde0ba1bdee706596f0da206c9c30d959db7f1bd0ca7d98482bbff5c8554a7e9049b8b8f905a0cf0138c00e9cf136dd8a805db7653849215733268025720ce43";
+      sha512 = "294f8b13ced20c26151fa75fe5a3471de4e56a70749cdaa99cc0058b3b46f768321e24897e830297e4dbccf5dd1979f33f8902e1e287ec44894c0113f5d6e50d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/rm/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/rm/firefox-61.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "c75a77ed854bc309bd20551a1dd99811043be9a1344b81831ef38dadcb31b0155bdffe7511e928b1fb877050b10a425c5f76520fedff88dd41388db7ff3085ed";
+      sha512 = "889517c9b6c5a01263dcc5af5badf44d9692bfd227bda75e376bc9f27c2fae6a8631e4b5673f105949b16594369511fa95812af9f46ad32eca4e101b344f7474";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ro/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ro/firefox-61.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "b9cf50d440e405114f055b597b85cdf8c78e67a42213d0a1c7c81346fbf8768408d0ea0defa173b41283a239d12b037f4a6b6ee6458e1aeb0e68822351b849be";
+      sha512 = "0c9df0c551d310e52a21f6537b883eebcd736e1292f8869a9fcad8d1f505a083ee29ec982cef2b46e487a9a9199ceb97db62a5b2282b7608569956f3cfb370b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ru/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ru/firefox-61.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "9075f179b98ada166c203d044b55aff03a66c2e8c3c1478f919acf34a02682a126a5fbe7076cfbc8b34f5c4c68243b324e71056dd92cbf316b3ff23c36d3228f";
+      sha512 = "96ce1780836d7a8275024484134a8b8803fb082f608f61d3f00d7f2d0e48d308ce23461ddccd45049adad8a0cc57fd3ea3cb9990ac7c554f6cfb2ccb53de2c62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/si/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/si/firefox-61.0b5.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "2f8215d03ebdf28d74c4dd30f5a3db568e32e1a169a3902a71bbbbd546e4b9f9e2de2b25ee83a2fc512ba34888139ac2a1cad1625a8a70dc16233cde8babc28c";
+      sha512 = "75519c81200b371f7a95995d8f4f937f80339eaedfeea581f977f82d3f0883788a43d556f30f931d311a9613b7d13925cf76c2a8ee20eb0886ffb50dbdc2f539";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sk/firefox-61.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "12cf08203e22eff69adcbac620cafd5bae56ed137c257ace48930cb3f70d7877780dca32ed65afefe7015413581c9493a069d463c5285e9ededf8bf3b9045ba6";
+      sha512 = "b5ce91e583eef01a4c05799e68349f2d5271980862e4b675575d0dd191f1944e7b81c6d111c00b8c28af5bbb32b5e9fd8843a66389a04a2a3bde30ece4dc9033";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sl/firefox-61.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "c4f20a2d20d89e9795cc8f67cfabe1563e69649015850e1e9e26c21a536325d760f4494d734b351b6e60e789e9d23b726a77b7ab8c970c820f6fe0a1e1de379e";
+      sha512 = "2ab9f922a208c5ae1ba1d1a00ce719836d16680588e7c7be7d27a8da1a285a0be22ab5854849014b05ff068b65c6f52252b756308a9b6ea329f1b8c0fb2499ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/son/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/son/firefox-61.0b5.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "d86ec2e9961d5802cd16d1e98e79dad8f758bc10f875c24048eab2b3114b55109e781c3dce3f8498436ab6f542671e9d4b883f0017be71d7321e2fa86bfd1dac";
+      sha512 = "c61d64dc05293a3c88d2d4d06959779c778149180ddb0932891b2b0ddb67914b93782e827efab0dae2e3709a979e7ff34666cf4daa499a16bb42bfda4fe2781d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sq/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sq/firefox-61.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "3ad5d9d572cb30aa8e373174e866701494548acb471f29b3477477606b6f856ed984b3fc84cb2302927363ee62009fbaa0a4a0a9e51ebabd431fa17b8d472445";
+      sha512 = "4d8aa23a3a17c2f8f587ec78f523bba59a4bdc1009bca4912e94a0f39bdbbfd375fd76cde61f074b8b3aea40ada4bd684255a0c4ac0d5f0291dfc8888e4e19f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sr/firefox-61.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "0b684b2a726f849cc61d4b3dd4d8618280961a59f80e479689cab06d499aac6f1c0eee82705fa6d0295abbebb498d5652f9e745060323ccfdc2a7cb1b800ebe3";
+      sha512 = "6b6f227762879b44bd6bc71dbd5866181b63760d28a4fdcbde1fb50ba746d9e1f3bbde2c0ea2b0e16cce156341593bfedbf1c484f339dc0a27c8c7485d9d94c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sv-SE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sv-SE/firefox-61.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "50cc112c5aa0404dba0760b183f6849e74fa57aa28c7f4ec03ef3c68c8726ba212655fb5ac49df12f4492454a2fc8431550a9ae84b9e9f86eb6dc575617f77b0";
+      sha512 = "f036a3799723d74ca21f81f7051e65604d11ee898b2b7a2169f6ee27bc6745a16b72ca1719b68e7b76fcf6023e982ffa6a372f136ee7fee8fb1c11b90de90c3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ta/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ta/firefox-61.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "0821005fcb9010e14db315283d178438eab03f02e1dc7a524815cb1175509343265c2c972a8115d229f5346d5a5bcf99c6383fbd294f5862386665748112ab42";
+      sha512 = "8a8f4e1b22601b98a04b71dd85f3ae7356e22ff94c02e9f2ba1f522c30c7ec76e6caa3e3b9a71dadc3e4acbc9ca7c28e8bdaa2867482d2536179d9f6506f49c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/te/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/te/firefox-61.0b5.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "0dfc09db03347201731214c987856f22c63a89272d9fba0fb130f12a56e5ef2b932850f13af117551fef949803b9622717df02c7b164e10035243181168fa0fb";
+      sha512 = "095629cb9b28eb3b48edc66c435c16dcdcc774b7478db0bda3e8aa3f028f600551cf4e190679aa9864658b265399aef27e9c64cb7544f7f06a8355d28f2c965d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/th/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/th/firefox-61.0b5.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "4a54abbc01a456433ac601823dce9f22f1f19ce1def11d4469a8f5aac4b529aed09828fc75aee1a47855a9283bd54477994ab0be06fc0b4996153a1d0df43ff5";
+      sha512 = "4918f725a9a1a05bdc2e3056db29dc5e9cca978071c55ad5c8c1a87f1a9119bec0f434bde5c274b5e9e892b49c9a259cc116d1974e3a840f98868721796eaed9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/tr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/tr/firefox-61.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "c3b90f4197f7c99e3c24b6ac6aae31567f5f5fa6907a5eb9cf026904bc627bc8c0f4b3b889e30d63ca871499ced0a0349fb1fadfd84c8171eb0ff52a771fef18";
+      sha512 = "1a350ab2d69ffa1a97b155c7093b5e0c06c8f1061837e19cce52ccb3755bab6e189de77f75771063710ba386b4f1116f58f289c56ad370d8b742ce038528311c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/uk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/uk/firefox-61.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "2067902285dbbfeb7f3c8dd946f2f2997a8ca6f7a731deda8fe53b3bec1a980793010beebdb5360d8c08ce643a2edc0c86676f50961b7e531b4b59610ad9e151";
+      sha512 = "1623e793507396aecd34cfa5cb1aea1f1ca5ec2007823dfaf73e929643fb630fddb4b81a745d9fafce1fa8b43662b8b09a522f2bdc2456b7e6f9512b4e7dfee7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ur/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ur/firefox-61.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "f2d12deb0147d178e53444e6f047e3cd809ed53124f78dadf698cce75f8f9fed76cc94cbd32d606c0e7ac5d1c6cd07356a35739651650bd3e3f95a6b2f655ac8";
+      sha512 = "6dca6a4bf4608cdd3869d0bde6648a3881d334b3a4bda20bff41626581204e972eafaa272f56b39c051702dcd9219d2b104e2cde9b2f90d0744709bb6ffc0ccc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/uz/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/uz/firefox-61.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "4b6c73553ab6f4f20bafbfc1c45e41bf342c76de27562514d2662047e78435d95ee0c20442b5328f13ea0ecc6451f18166fe10e6fb0b16975fda4000c713c80c";
+      sha512 = "1131151207ac3f9248dd03275174a3efba159445824a40bd7a008c2b07c28bc5641d315581e0d98a7982659aa2bf2180ce1e596645e0d780ac42247dde480863";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/vi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/vi/firefox-61.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "172f81ad5505494ae3fb3a170e2c38507c89a2627896e8889b3d128f68099bba5b9a91af7d102b70fdf10e827a4b7fb6c0aed117cd1576910e44cc5e72372207";
+      sha512 = "cad7f937f930fe82dfe99ca44d7f2173efb607f8ebd9725372a670abedec5fd26a390dc899ba9b712c9a533f6bf39356c4f7593459bcdd99a740a46dcf2295d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/xh/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/xh/firefox-61.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "3ee80235b5bb3b717930fd9366c43c3c30d519945673ba16b550fb8665b91ae929b52c7852281f5b275f2c0a140553bc348e2323960516d2ccbaeedf5999804e";
+      sha512 = "a84b9524c567ff16290053cdca4dd494395e4be57fef0282e735795e082ca914abb390f916919352adf4c5d17c163a2d9316bad2348b35ca78529def36d7f83d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/zh-CN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/zh-CN/firefox-61.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "735e577a352aeffeb8110d4385e35741f28a5f7471cf77dd7cf146a48d5fe9aaabdf80dc468807b15b74601532a5eeddb27d3fa158cffc32623d929111f67c47";
+      sha512 = "eb61ad55d93c1e2be656097148a333b78b07c023f60dd9e2f02e9e0c12c42908e96313a05a5cdebf1a51ef210d66081107aeef476a69cf53092b992229365046";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/zh-TW/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/zh-TW/firefox-61.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "ebbadae639f4a3c9de64909b52a56ba192f832c0200fb983339b16fcf3dedb0b28589c73599990c572aadf85256701b579311a0d4e30b45a507e0c7186ec4d2a";
+      sha512 = "1c73f4c230ce3e518721fbf7f1f536d376533f6e56e3b1f562c64d21b575b91055537bc9114163bd8c533b641e68d78892217155f1c9bd4747e3ee48225a61f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ach/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ach/firefox-61.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "61779e2106c89aa37e7ff2b0e2bfdcc2fe5f6d3de0c96e913149dfac19d93d2f572298214bdc9ac32d26ef81f69710f55ab888d9b432928c6473b2c510c23d60";
+      sha512 = "253261fff1c5c7363a96e185a816ecc59c16212fec6424fac394d9ff6299d33e27928650d2ffffff76019f1c6df7a69c51c16292d987daaebdb745620f7d1970";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/af/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/af/firefox-61.0b5.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "39e88a0db67b553ae149626c34cc988a2164b64ab634fbd9d1f649ecdfcedfc5e2a62a017c3048df74aad8285be7d904dd6f4b8edd9ced2e0a8beb25ea5cdbcc";
+      sha512 = "47cea191e24310f3b756e5d146015097e2c0cca02769f47213a84ad63039148e7fadf2dd727202a3854f8768014bff18672a6b9afc29bcfb0af72f418efeee6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/an/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/an/firefox-61.0b5.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "addb893599cf0e376c37905a76cfc4e05d17816a0def36ae8b163c44f994a10533e0a55ff9a3ecd19bf8f8b6627ba68afb1dee11125554132a5509b095412eff";
+      sha512 = "96118b013fd5e77802f7bfe7870c9ae07f10687f5ba71985fd346f2cfecb8fedbe86b9d9ec8895fe237d390cf168d1a14ea2bc9ce187d468fcdbe6867c614611";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ar/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ar/firefox-61.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "a0598263fb3ad1aa67a75fb47a92633c31b0c769b05b1279f8c8a65989bee532a04480b47aa41cd6e03159ea407db910efa2cd15ce80b47faef18e15bebbabd8";
+      sha512 = "75b034299a822f78ea60c0c0253fe46863d4ba0cddbbf02e64d5bd551b2c5bdd4fc456545f1b5cdd553af47c03bad6afbdf1d1137d570b35414aad0afee4892b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/as/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/as/firefox-61.0b5.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "d3d7eea767b6ed9097585c91ca81bbb83567749c9998896287338dff19fcb78c9b641ff9f3abb28ade7624b110e2a129495ec4e3d7906779633c319e950bfa90";
+      sha512 = "2d04a057dbb74a7745d36c85f58604d4d50d7838b7498818a6e900c7839ddf6f28bedda074341f8da877909330123549a8b57078723f3c2c081bddf5f61ce9c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ast/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ast/firefox-61.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "4e12e39c1061c14db738372ad8fd0c9488a42490682ae0f0450a5d02d08d959ea33c87c3e4c1e66ae58fa446b8faa6643455bb21cbb03d2aeabad0207f8f4180";
+      sha512 = "3877139ea20a6de4fcf2217e0ab53e1ba1cf43cbd10222b265a728d7c782b0215fdbd4a51bf883f2a089439b9d8964d7ee9778a5e7680c1dfa719763094e34a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/az/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/az/firefox-61.0b5.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "8ec2ddefa9530e1135ad70a8ce5b2304a756efaa201414f657bf865699b02e26b19431fc86d2404b41c3d3557b81b9147a94033739c59b17690be4d3f250643e";
+      sha512 = "958a242fca0f27ade3f8c25bf9f12f24bcf1d7cfa51f103bf77e2e493fea7754f00577033a37db0130936ab84f0e03bae986895caaddddc705a439b0f1d4d4bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/be/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/be/firefox-61.0b5.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "55d15c013df53929560584d3586a946e1cd3b0fd481881d10f0ded8513257ab4fc4a77d0495708c203b15bb749eb92abc2a4231dc892987ae4b2955a5fbc93db";
+      sha512 = "375048d56637ddc81eb90088cae26de1ec4ee8f25ebf8ae9250032c25737917306cfd39a65e3302d85c1573886f7b829b0dd3ced7d4b7ba10ff4389f27227861";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bg/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bg/firefox-61.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "229c10bb56080d50a88657b7595fa4d0f33f79570a00bdc9207c4b583aff5ad27ce309d6dab77988789cf6fa2671c7fb21dcdc5d69b0a4a7b87a767c7a7ca98a";
+      sha512 = "0fec26ccc4393e904c31f40d78a784ec3d0191c75d3086cf9efb0b2b64af93af493e2ef8747769edbac70758435ef15d2d1890af1b44ecaaffe2e52ddd5bebaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bn-BD/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bn-BD/firefox-61.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "81d57db09707f13efc8fba2a13a0bffbb40224e837a50f5fe3c59b1648d89c8f7965cb4eae60ba0b1616cc77316c00ea2189012c4d8b8677649c042907683ae1";
+      sha512 = "8536c434b423bf969c167b2f9b40391cca26904cd76f022d46a9dbe127e3647d1b1cc4dcebe08d5b243fe7ffd115c9e3cb1607e556719210e5cc0ad7b10c7aaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bn-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bn-IN/firefox-61.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "f674542115e8d9117f6255dbfc96507577791f7a29ffaf1de263ec6b75c0aa332beea348dc9be60c24ef6ffa822b100037030985157fa4e8540eddf2a9d6d769";
+      sha512 = "ae5a493de97a56a15b182eef69079c1f5d59432259b85525a32a396c4537c9359bd41eaaa870f74f680b345cf9c06c487e6b9ac2fb1b5230b404b3e7eb614029";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/br/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/br/firefox-61.0b5.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "9adbfb3ee70096a03dc75235e2a0ad60a9d90f1b240d3ae35a36186c013aadd283470b0878a8514759f04952208210bd4f2ab63a987e055bdbc9652296333259";
+      sha512 = "e4a42d0e480313f3346f50de408ed02dba79eadbab368cde5a93542bf0c462c378d79f9e218526667d398795e3f1665f5b89f44d667a34b88560a2d8354dacd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bs/firefox-61.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "b9267ccda43e947096337b02a5c40bcdca497755aeac2df06930232b1b1bf1b7e245c32733990575719c6e998c2103d8d29f46c804024cb4cc15d1400d459ad7";
+      sha512 = "0a0d7471a266ced527d7abfd36eb0cfb768d5553efcad7a2e19477ebedfd4942af7d12c123babd9a1791d8ff4c5a5712c74f3595e1f89d9eb0413bdb81e7a624";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ca/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ca/firefox-61.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "59a5ac9116bfbfe296595cafb11c13cfe50a4483e3079a4112d04a10e1d6168b67183874f25047fa7c3e0e93a7932e5778bc78930e0cc48ff9a4a661fea202dc";
+      sha512 = "6390ce2250cf20e10defa3d8d75098d5f9c58919f57415bdf742730839958bea2923e9eeccb9bcced97a594c67b54941dc1e1c3589d7d255632b32b4c7192799";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/cak/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cak/firefox-61.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "3ea669f0050922163e4450ce8a1e72432dfb9c64b9317796b0648e9079333a2204ad1691c9c8e293714aade59c57aff75ded358911f4bcf161ddd140126dc164";
+      sha512 = "c853583283645099dcde8849abd0b3b6ecd98e791ab230ead55cb945b4bca1d91842bbc0cc65fe98dbe16cd284d8f66ff053be643b11d0ff4da17f078b4cf749";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/cs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cs/firefox-61.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "39391f7b6b1ac13ec573040c5b7ada54c29fbe202cd5efb9bccf0ba5b38c962ba199afa845a5d7df0ecc58f3f205ce0b120acf70f5cf5c66fe8b465f324efdf8";
+      sha512 = "f7cb7accc1c44205fb893704cbac0b9c08a6a36bafe88098251a57ca80f69699ed04f27b43c0be43c513410a91e1ed391c57c566443e8d7746de5797619b6290";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/cy/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cy/firefox-61.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "2c44aa81963f6285bb8f5e689c18a9e5f15d449d1a1f7983c5e65c0049a8da72bf9e07c368b68da408839e4e4c58b35692cbb7dd3fd565c5d53c21514ca33628";
+      sha512 = "b6f324096a191c9ccf4e5afc8eb65fbd3bc6fcca4bebb1abe9ecdf7b766ad14ee4a598bf83e341e47a28e13ddb8ddee5204f2c9b906b691986ba3fb963819f27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/da/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/da/firefox-61.0b5.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "0d49ed761fc55d137c4337c43d0ac8e2ee36c15fdcba2ffdd6f536a2d51ee42227eb32f553ff15bcc1313476a12d7f51d59a112c2c23aa47f753a01adf121755";
+      sha512 = "d4a9d5cbba8d840cb493819af66a03bb612cb173c2d8b1462625adb8532e512d9daa0f6a49a8771b3c96afd508109c16a17a65228bca79befcd3bf565b707bb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/de/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/de/firefox-61.0b5.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "51cf51f85b68346dd0eeac98706e097e1a42b6da1e3d740459d58e7954367c3dfa4bbd423a07eda4b2f89e03de1c3c6ac169b0bf0657922c9c2f0ec865623a47";
+      sha512 = "6fb875991cba1c1edf066f9ef44244c1969ff5204f36ab1c643c606adf81b67d578cd861ea16cd2d2aaba1ae37f24ebcdf58248cee4af37d11cdd608e28a7d54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/dsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/dsb/firefox-61.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "06d58745022be40d690483d0f96b232df31de994efca42bdc43d57554ed38a6c4b36b466dd5b9a28b6f9ad8bad8c672a0cbd1bee5c7dcf0820da479ce4c03b55";
+      sha512 = "40b27493dbacbff086bbb26396a6a2cc717c4b617c021fc4c1fe488550c6a5f7587f7d30ac6e48dfba91dfb4351b02af4da78082a38da5b64fe843455866431a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/el/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/el/firefox-61.0b5.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "74fac2b70c3a5eda6859b7eecb4609569c56ae76b82f880ff9cf9d8bc1af2a3a6efd09ddb2bd32315205faaa6e5cc471cf41edaf139a3da486ce4e7a2788b635";
+      sha512 = "b6a2ae45054d1abaf8e6e0bb58664a5a1e8476bb62f8f3cd3005121eccf38eef68927d1a46de6a6fec48586aee5ee441767e4235c8d6e7029baefea07fb0ebdf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/en-GB/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-GB/firefox-61.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "f842a7fab1eb6bb15a9782838bcda4b69188c2a36114316f984e5e2f21fbde9d8d07b7a680ce3516ee359f638c82524c1961dd67b1f05a430a045851aa6e41e4";
+      sha512 = "55d0e6a65c897da608f6c3ea0a6cb6299ceaff15d29e45b34c3a52ff03c85ab85fd2d39c56763f0d589a9ef5085feb3af355758058bb4c9bc12dbbbba5ac7b4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/en-US/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-US/firefox-61.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "68797571e5cb045872c78db9cf9ba06bbe2982f464199a2c89f35d1b42369f49ce3abff1d01bb6be612efea2a102c2cde5f00d4ae71f02ac0728abfb96bafb65";
+      sha512 = "22be622ed7c9b621a0782ce727416b78ffe81afcc92b5af840a895f54cedc843fed1fa256bb452d8b5ad721450e5b635845b92e621b5555b98a6a16ca59b29d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/en-ZA/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-ZA/firefox-61.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "22369e8b23cb8b30a8e1680f35acfefc3198e2cca558c58ddb0478da8ba11b08f1336cddf1fd9d3bbc7330f43f930ddc9c81b4b25bcbb6f2919aad8b60a30def";
+      sha512 = "0442719c3303a9c1f4de79777a266bb1b7544c8b570a69e49746c9455edfab9aada9330280d6c406c5e89054d15b1e89d0935fac7ad4ff80e2d34159706bbafb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/eo/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/eo/firefox-61.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "44b5d9b3a4fd149942277700ab3ce73246eaa8ab2826843bbd4f4f5db5aca100e6aee1149389cb9d21335b1f928035f872afec1a62874942932614afa01482d4";
+      sha512 = "9addd422b92067287ba5cc0f5ac14b662d55be8ffb65377e13d5a314c8a486057007a6c8287b8e79dbe12fc59e05c5c09fd79419cc56f83ff0ecffa816048224";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-AR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-AR/firefox-61.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "7ac6beeb77e49d5439825a6e909355f95dea535978b8639173c6903013cd1218461b1a8c3f4fc1baf291e9063e7f16c0ad0a985f02fc7c41f1f654ca872c9797";
+      sha512 = "2043201d4622ddfe333f755191a90290a533fc93b27e8ad2a10e75a8994e56e0de9ac08e391c49a48028252dec96bcfcfe14c1d6c362780ee25f02296969d592";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-CL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-CL/firefox-61.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "7b6c6daacb63eb5435a908e9ea95eb205c57e0626059f80237083290af22b4b12feaefc0d47ca23345238fd1f665b08e1f97e6b26633b7fe231b9526137a29a8";
+      sha512 = "365c0f66382ee55f0cdb98770b9e1ed31ad757e1aaab389f2de83f00dc8222397f2ffbe25d2df720715f78e1af19cd3c4c27cc1d8d04e2505fb927474d9dd42d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-ES/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-ES/firefox-61.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "37e8968ccac78447e07fe54965474dd6cfde6fee86be113bff29161af76a83b29806b3ea6c651e8e014f550832012032750daa72d7d1ddbcf99549bae1a6a345";
+      sha512 = "5dcd18d55864e767333026b73b1d931095c1d7845ccdf165e8a6244a0fce84319ff9e7ef212a4c69574160037d231c4b44edd243e15896b79c6e24f14307fe17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-MX/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-MX/firefox-61.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "c61dd6fa039da4724cd5f058c838624f0e5fa8246b6c15fd28e5f501077ff0136dd9f45a3c249eec339b2ebb253a7563e06ec080bfa6bbee823bafddc36bee55";
+      sha512 = "f5e7683eb473e8c411379515836e669aa9755af26746ec5c56c2f6566658b93bd5b8da44e8ee40789d8a378d19e9b63b41ba9a3da95bc82b85f43d0ec34089a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/et/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/et/firefox-61.0b5.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "635bc450686fb89bb67573a313a8b06c4c7ac3f0a7ce2b8d9ae9cfb128e63f6cba4a4701c93016d9111d1ece4b5466bcef7497ef83c9b8c664f903f0ed79da10";
+      sha512 = "e33cf86b0d591e3a28030ec7c7288a0c97f6258bb7730e7edb850840132ea96dd499c8e2f7fb95e09acc344746ad83458b1d32615debd86d47cf2076c298ce46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/eu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/eu/firefox-61.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "9fa8d908bb5b656afa68b67a3289e576a3c64b845a9688261e21de10908c123879bcb87eb1ee8e3f151295c97596a8a122ca57d61eac56badf48e0c1c3efd245";
+      sha512 = "c81cf96e7fcda3cddda4751afcbe0b7515469df72b2bb1fc165659a09796f71d29fc70d6c0bf14474eb81b95490dd160ea4dc7b2292696e1998140f3198932ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fa/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fa/firefox-61.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "f8e8a56dffd9c82289b7bb5c2c953292dfaec1c4737fffef17f8ed32a8abedee90c4d484fd9a8a27d24163bd3005e1931df5bb0b50efba5d42362517861997f7";
+      sha512 = "af7fc526c199b75fb8954897d785ebd7f3006b10e5c1306690fcc1161151197892b802bdb20c389be1d8a799a3298b71fcbbc4eadea7802ec4f163484440d4dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ff/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ff/firefox-61.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "91d0571155490d847b9bd5bdd8cec98e4edb7841a7c32da07b52fb7e3d67fd286ae5d770af47d66d7e80638c5e741f02a3e38e2cef28f08cbf332ae5f1cc50de";
+      sha512 = "906e84d4963bed5a2ebc1fa82a7e901f09ad1e329db89e52788d820cf7aedd8f98c5e4d9ce3ccf9b7171a8438ab91f29121a78e40685d8230ae5726928295d3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fi/firefox-61.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "8a363ade6138222a39520a7e3b02fad03ae846ad0b015f90259c5b6e09f4d309bd84a5b545f67288e3415f406e3efbf6c2dc9e1aba1aceba116318734de30f35";
+      sha512 = "4954b7b1d4ce1028be06d639ca9c68b0e01febab75b4412d6d1f1ccab323add8d95670944782183668a537c44739b09fd3a15eda2db9f0c4643460f21dc4bb22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fr/firefox-61.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "47f2830f33753931516be570f1984624b41009fb0e8402ac6f5bc769fc6791ea50ff7c33ed79deee913539461f1ccb2eb0a0b9b33b9da9d03c204cd0d77c1dae";
+      sha512 = "1693a9ac213487a801d018f7a9f6e8ef61baa8af2c41cf55fc40f320c2d0e6a0b73283725cde09fb9bc64c208a4b9a13825118f0ec7e50cc2c61dd5a8b38b3b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fy-NL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fy-NL/firefox-61.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "df144500225be3ed718e4276062903b4e7cbd9b9d176cab88469ce5ba57960817be80a106bfd20da2e6cf14807dbece026167572e941b3c4d75cdd49e753e4ca";
+      sha512 = "963078489d625db3ac61d38593e5e2e8da801c7205b3622439721da3deec06fd8ac835c8e0ae9eba07ff050853b85f4d3c6afda7a50727244a3c73b9c2bbadc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ga-IE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ga-IE/firefox-61.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "b063d3701661a1d3298f268efceb4ace079a56b8017a0476df13677d1871fb36708984d0a0d03d56e90a02229e7c3b005501259884af0ff8b38c503deb581c68";
+      sha512 = "a437cd4e09c26a4ad86ee37715307bef9fef6f2ac1fdc117ee6793b89995c0e42d2e77bd3517ae2e047faa2ee3dd22a8c2604d5bd285b5283010cf30173eae49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gd/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gd/firefox-61.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "68f34cfd93b5e84017ee06cabef3945797c29668ad6c5574ec11d2bd3f4e6480d48c2161f5908a1782b9ef5b139fab855bfaad2db17646c94f33de2d2e84aca4";
+      sha512 = "6160d0412721f299dc119d5046052e99e2c64dd7f298cf1704d7f0eb6d25123f1fb2d5e6084fe1b347921e49f041798b49f696514ca04583ca885eefabdf15fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gl/firefox-61.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "3bdbcd0efe048104c09e44645bf11d3bc2daf61d3158d02d4407c8290fdd51c7c63d8ae7a111132b173a0fa86e73350617aed47fb33d9a97b911b20d552602c4";
+      sha512 = "8f995ae9b50c0eab7e8ae2a7206ad556e52122b0084b4f24b807f1fbdb4b124a5c539460610cbdbe4f90f1b312b653c9ee52607ade9a1082b270694284e9dbef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gn/firefox-61.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "1fded332e034a7ad70fa2a33d4033301291098b5deed26cce6e3007198f0ed998ad32fb019d0126c5fef7bbc546f5c483be56ff0d0ae299b42482b283c27d4bf";
+      sha512 = "81ef8a83df19437b37b0834a15077ff23e084021c438578fe3b38bb66d2c6b37957557e9e5989674799abfb9f530ebf6ade8f0e25897e6c82842f80a6c36ec50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gu-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gu-IN/firefox-61.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "36b1c695fcd4db371c27d6560c1d39f8cb692a297423fed0e8bd11ec861b26ad0b94c97e7283828954d183ca69c4347b378725e04454fb4ea146836602ab3447";
+      sha512 = "66b0645cca9f77f13fd2c3fd4d38b71cf44567cd86d58e649cbebb1ab0b07d3ca96d14d2b34e33d8fc09e2ece2c4fa6c253f4d55b6c8414b78e95b9e8c4bfe80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/he/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/he/firefox-61.0b5.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "5c96152e5244b5da39b4c86a24282c289516c7555e23d0152796c7ae78ecc186cbe870affde2d25f5d30533d2f73970d28ef7595b9ff5f006f1b7eb17fe78fc1";
+      sha512 = "666642c10644bb2f2f3e31bd813a3a1c6d930a25c879130250a8484d82acb471b1a169181ce7a49a01c6ec78e4e8ce61f8ea5918b8f87715312ac07adb087120";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hi-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hi-IN/firefox-61.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "ddcd5ad522fcc041028d82d212dfb0c05c8ffd6737af6ed044bd7d26d34317cad252cfea2002075dd855a52a86be84e54f02c2038bf1aafb1b10adee90415d31";
+      sha512 = "53a6e801c45691cac7e1946da9a018aff3dd1f0ccc89d1048f31940e0affb33f7fa34e258cb6bd0e7336369a1862a9ad42d0e2c782c459c9de245c99b4e58f70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hr/firefox-61.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "a4131caebecb7d340f8a006684118f801cc8a9987cb51d219d5463e4de5fb934a0a9856655224a3977657879bb45f823ebf41271aea26878efa52ebb1357cf34";
+      sha512 = "11b09786e4e2ab89c814560822067b60681eff0ef43ad5479df5239c729326db6cde52a535600c3b4ff8d9113327cea38224b3e2f54639df868357d08e0e7bbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hsb/firefox-61.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "ad25dd1d0e795150537860b60174ce0c475b341605328d68f4cd1e0bf0c5609e08b6d637ef4ea654f2683a15b8a5dfe2ddf6a9fbc609ae13a4add26d4ddab4c6";
+      sha512 = "da0dd10538f0cfee6f9da54dfb48886e7dc74268a4e800f8b5e4e91fff1adf4b1f0b55dfa30d534d82200d7dced710f2e19382b6eb7e48882b18c6856939413b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hu/firefox-61.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "15227814eb13d55b9a5274cd21da6127b4012292403b06fdd76306b1ca40fa32992ed735a43be6229cb0ada49424c23dd655fe9ecc8361c107352fc40357a804";
+      sha512 = "a03d4b60b08d8379c21010f39065c782dddf2c521043f10746dbbfa83d01a6e4fb7d9422cb637b8d16966616e06c2e631452da1a3da491bc7a18a8ad64d6991d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hy-AM/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hy-AM/firefox-61.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "10a88c32862badf5db544470dc0f3b08276e74f0571b6f4e3af80f6f29009288d9760d553776fd273e0bef41b039a318f09deef478fa63694096d4ed9fb7667a";
+      sha512 = "95c0c4ec529ebe05115f2e6fa31ea9c41e9c543a4da8e68ec911a436eadda7e7f7e3e6cc6f0422d99102e839cf8e19a300e0ec343d1c8f056a84e14e682b40b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ia/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ia/firefox-61.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "4a44abb56c89dd65cc89be06fc17edc79bd6fcdbc600860bfddedaca277e03a5cc146bc89be4e3529bc320e1dad14d080efa6d388a56f0511fad8e69c5752ca4";
+      sha512 = "32adf28b54a7981aee100f9649e75d24ee0e620a62ab814a648caf901a504c483cac675e7c5320f777e2fb02e56ba38e6828efbd59c77d0425642289b99f3178";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/id/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/id/firefox-61.0b5.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "611036954d22acf9b82283e44e869a6cbe6e46f2111b30c410576af281e907f19abe4b885ed1ba68d67de7450ca22bd02c020a9aaf43dce6b64828c55aeac373";
+      sha512 = "3e9aafd39dc1ebda9ee0789c6ea58c25f755c73d70e1c5a16496c81d4f6b222051aa5b46ba3f98319bfcd767df1bef50ff90f81284441758e7b134c3dababc8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/is/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/is/firefox-61.0b5.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "051b1f604bae1d65d8001dc524b2edfe36e1a07e4f8625aa908bf912e7791840f6ee83581cecadec079eabc67961bbe8204f5992795b2cf4b29edc242d741837";
+      sha512 = "1e4f604e74be51e1f2f32e472c4d67183b46d85661c08acac4adf9de2a632e3d32637e92cb5bf2b9141babc136f15aefd74a61a3d7210dc8fe1bcd119d6cccd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/it/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/it/firefox-61.0b5.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "3939de7cb78afe4749d9981cc40bbd8157f028f6f19b247e09d25ce43af7341d2b8544be37a1052ffae17a0de796333c203fd89408fd9d390b16f41947bcb985";
+      sha512 = "7491c8c5f9ea457629de4f907049f5a67d0c412ec430eb29f38bd7d771df779d70733f839fdd1cca978b1b8b89f7b65dd9a3d3af3848dc1ddd5f8376af74efa0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ja/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ja/firefox-61.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "63ca3b592e0473a2cc24bbad734091d90e35464da526d6696b68bc2478d1fed2571f3ba6af51d5d19898d7640c6afc5cc3354593ef9d3d389410b7e50495b326";
+      sha512 = "b1bb46337e10209359b83466fa19d9751470b30434a1d58a030c2bb858d66bbd736ce8e3790292974b069a6dbcc32939d0fcdcc12b64e3db7fb58a9695c2685c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ka/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ka/firefox-61.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "75a3ea5b87058d3e793cffff69c6b13b0e65395241ed2bcb3f566adbfb6c9a7f6f419f211f1fe11c2d44008091f3b7132495961d145c155191d9fc7af29682f2";
+      sha512 = "179c0975bff295c8e052bac86224d7b36d4ae35b6788b0de88e36789d7d3027310515826cb96500c251915cfc936c4762438724552552f17502e913b4536d67f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/kab/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kab/firefox-61.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "290ebd2df481ed5b4b3663e1746b5804d9d7fe6aaedd2e81f10f566fd7668dc27f869e992ef023fa921c77818d8e389676de5cb94459ece81aa3828e02f527b4";
+      sha512 = "bf708a69c2bd801b34ac349934609b5dfccd9104e90b5f2cea09c0d9eec3f5ca4229b64cc2226285af8091a556535c3fe5966c30ee97a6077e190732124f6dce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/kk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kk/firefox-61.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "372ec57b95d63469552683d709862d66cd5ef16c3b6c91c618193799eb9cc1b882666be8137bd1d037e656d7841e4a18cb1f5cd5c477e49e7f933bf7860d4116";
+      sha512 = "77aec4b603d51cab49d2b055bac3036ffa110d324335ea0259b9b8b290ccae717c20c531e64acf4ec287d166a11a888c1fa8da82ca35c75fb68fccffa3a55d27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/km/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/km/firefox-61.0b5.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "56202e87711e0f23e46f361d135f36ed4a2a55f8743db57cdd91d433e70a1d0d45f8b52f574c683f65980df220b194c93726e036624778385bbf1ad7f499a899";
+      sha512 = "53981a550e4e2756ceca86f8b6b23da5a7048f9244bb84fd090cdfd801a9bbff6ecdfbb8bc54146c97936e7d66256c3f9a3415749b79860ecbd8b1f2fb6bcdcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/kn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kn/firefox-61.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "2c507240bf10fde9b7576b95a129e33a06f88d8c962c39a50366d4efa72d2520bb96cf756fcc911c92c04b008ca0199fb8f79f871df6153eab247d228ef5af64";
+      sha512 = "621ce46516f18505868304da207f12c4515a4fe8adc255fcdd86d61a475860093a8f6941902f71cb9b7772d2e0fcd8411f354477bf5b18841cc48cb318f6d1b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ko/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ko/firefox-61.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "925c3d9a67b697493de83c8fd1d59ba7cc309f37c42f7db60668c82790cb90ddde405cc90a0a88073419788dc040c5bcbd4efca38ad415cac73e3e21f6f64fe1";
+      sha512 = "c46f6435f7e50a498ee0bed0918941265aa160d8b932a2b668f324a6a67b82aa2e96cf1a2974ec66c69c1a6aab3afad98fb753cf7d26a62a8d78148ff1343e75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/lij/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lij/firefox-61.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "bbfc7409fde63525642c12f82af5693f7e6857e3abe7ca21c298e45ede687797efe35dd4f874f94729f5eaf01392c49899ee62cc1a48c6565c606267ed59c825";
+      sha512 = "2e75b0e3e25b6c2de02590f922755824dd86cfa46672e0a628fc3a316892e83e08409d1ed7ecd523d878366e5309cdae5908b41bdca81b6e9e6a6079dac1b77a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/lt/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lt/firefox-61.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "2770ac893a60bba546fc44c3e88deb098eea8c04874d363dbbb974f3bc0037fb600f681e95b7184a5e8d74aa61e4721fae21225b9e5506d18e6bcfb39ba24027";
+      sha512 = "8298ddf054f8e011e8fddc517dccd4ae0caf73bc13563b5725b5422e8d6fb1d3e59af216a501dabfd5a2b6fd824b62bd944776343170948edf4fccb414c1d607";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/lv/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lv/firefox-61.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "5a9e58ba15226a919d92efa893e3e8d05ad905eebe737cb7637259279403a545845cbe612389d5aace5cc1791640d9aa0d0e8e73dae032de48312ec55123c387";
+      sha512 = "99ccec4cf5ee280a14c680755b190e3a1d011b8837db405738a36b998816a805d664ad38113b5cf64696276a8d8acddd0daf248aaacfc52ed1178ea6caf32e2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/mai/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mai/firefox-61.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "73ced087da65a903dd9233103dc955b8429cb07dcc262a15e02dd0782c2eed68eb239745d14598ac261e40f7abb5c8004724389956f05a3f607917fd1c68aaaa";
+      sha512 = "f79a4325a3aceb24fad97c191d94d9133719d176f00cb9ee43ca275d29cc582b0a27f6a06f02106bbccd85b53791b6f2e0a7f751d9d0eb68bfd5d34a332e1088";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/mk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mk/firefox-61.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "71c65bd3d47fcf2dc295f595618856f6d37d794655ed5b443c0d4a57667792eeed18a262df3a1c29661ccfe163d5628c1f5980f01fd7bf5781ddaae617118e56";
+      sha512 = "abe2b26198a4d94c2842017d28e3a23229d6c67dab99d436760ed2f7458bb613f31b9f9e56b453f4d7c1c398e681fbb6135f827a313eb5b1ba0a2964b042c198";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ml/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ml/firefox-61.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "f7b9fc140cf6f2632e5b62e1747d0c5e4fa8622f3b1a267d2f43143a4167f99c73a08b54a535ed3b4853a115dd11831143afe100d128aebb07ff46ee406552bd";
+      sha512 = "c197b8bb1f436ba151030f663e686ed41efe6d3dc162551fcf4bbea1d6de0f08354308323ecea722f2068b36503b6a896542fe35f0bb44d6e4e0227e033da3bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/mr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mr/firefox-61.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "7829daa88913ef2d0bdc07549030e6659825e7ec2a22b3431565080e0a18da24e29f057c51fcf1d6b8705b994720c203e04fb71c5dea7ec5780b27f2e6cd463d";
+      sha512 = "5052273c867fbbd433c83acbbe701679ac073dc468ce60516aa326dc798828a03d7bb8d52e14bd45d0a66d0da4f5c9c85a7877ab99565259c659734443e8383b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ms/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ms/firefox-61.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "576c4996091d788d2ef814dd150972abf909bdad4f351b1fc2de31b4b45910e5e565c873b386b88c44f2a4472386335a68a22fe36544b033a7963d80b3252ac1";
+      sha512 = "29bd77b97746166569ccb56ed32bbe4122957fc00738a9ca246fdb2d6dbf4bc1537f53bd07153c4e1605937795a7cc37257618a83676ffce7af1396a626d227a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/my/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/my/firefox-61.0b5.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "869ab9e2bf7494203d44917ef254ed0d74465abf93e93fe6feed03c60988a1e20d932c92290028fc3dfd4e9f53194cfeb229b7f9b254fd45d05451c776ebd077";
+      sha512 = "a8f0b2d6d29ab10053ff9a90fc44aa16c98862337237a5c45c6e4dba98c96545e8fa683814e1ea00d2269cd86f12841d7fede243ffbc3dbc1ee1d7e51cdbebb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/nb-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nb-NO/firefox-61.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "bd2b1e3707d233d248b54dce532b70455414d740993c5526834acaf0ac72f273500e5f601d1fe5c1d747780ce5300317d1e6d0e106726311ebd3e8f3568f721e";
+      sha512 = "40fc4b9a8e6c94199c407e43cefd14c9bab34c2faa4f80d0452519c2a286d77961421340d5bc4103df81e0de6036f058db06614b89d19d4c273a5f7c81d0aa4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ne-NP/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ne-NP/firefox-61.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "ddaac816dacc0d07940dcbb034a6c117e557733b51706ad32aa974ccf76722961aff057e0bac299315a064000d65c92d8547a89cb8e522a8bc8b473e2d3e6425";
+      sha512 = "9c309cc9eb2fdd16a33e15da0bb67998b5d6a1a4768723898293dfdb0bb38138339b566324767b427326e7c89600da199f33a8c4ebadd15cd74dfede718b0e8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/nl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nl/firefox-61.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "56711c59af60b7082bf3f2c413ad94aaea489d3984e4afa55304022f0c57fe072efa597533dbec5ba8e3aefb2ced9d365a7564ebcaf93e77b4911cc28150cc80";
+      sha512 = "281cbcf67bf6a75525b84e6552db454a481cdf92f6382258f05a4081eebc2a4db0ecf0a127f9c99c0d7bfca7a8b33850f2dd412ebf23f3bd2dc794d51a312ca0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/nn-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nn-NO/firefox-61.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "a6939789ea572a5687d2d542d9a5fd57159e7d5c8384e82816fdf69417f5416d23883d571041dce6c285b66e6ab1b90190818f87105f7c06c0f6bb0eac45ab3b";
+      sha512 = "bf540d7ed9ad4e3290f33105bfc228ed096d30da7d99fc60da3c2fa386913cc98c3202666317fc8e52270ac14c5c778cbf8385f113c723062bbd61c18ffe128c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/oc/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/oc/firefox-61.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "9b51e1b2dd125e12bf8de2517432fc9d60a6e807372ad375a949c0c6ed3d8ccd4095eeb30e275ede31aa89a9c831c7f9108173ea2d207e0ecc37593094f67020";
+      sha512 = "1838462fdedd67e5be3836eefb5e06d2607bb7b18459514c5a16c4e31d84910c44e3bad8a3c1a492a96ac60b68fc123214288dd3cf22e067de3cb19ce0e88faa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/or/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/or/firefox-61.0b5.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "6f3e10d95af809d98fee038039d048dd9da04d97465c6ce16a97d3a6bb1d77bc3481dc347b8e120ecd9e10daa47242ea11601e13236c4d7804d993b4ee455ed6";
+      sha512 = "323b67ad29b15e809e9b7d5601abcf107ed4d80452f27e47edae9baaabf664aaff08f662dfe049ceaa1588ddf9efc976c220eee5b1b1c623447c155fd4f56971";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pa-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pa-IN/firefox-61.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "e9d5a3618744e99604a476d39b04b35618b589e90d655ae7ceae942e0944a2395d01a6a05e386adbf3dbf13f6e3eaf8823a04d307d92fdab4086261736800e07";
+      sha512 = "d54705ad2391bc0c4015b0729f86f651e321ef15ac4af72e47f31087e3ba87bfddcbdefcaeb17dcf9dceb4bebee7665785e06eb2537b56f2a22cb55afc7091b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pl/firefox-61.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "cc5cbf37e8af29d9a186ea5e91ea263a77db7ff7758e58877a9227bb1e3591b80bf112e0bd7535d8e30a519427724b52a557799d60acfef053f02b383b25940a";
+      sha512 = "d5db33a8ec5dae3141c6b61d23b0bf3c33c8b2ebd5e29aa71adaa5e03753e646fa45b56cfa4961609580585f9ecbc5b8b899f9bf3ccaeebe036be450740fefc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pt-BR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pt-BR/firefox-61.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "296054c1424fc160b8688d89700b37271d3d16fd29ffb85275e0488fc45a3465c2f060bf77d5b6c1e8d81c2d53ee5cae6853cf26704ae7fb5222351b09e652d9";
+      sha512 = "7507d710c231e8bda52d01d7ca757523790a61f9e8b3cd87d7b81ae341c62fbaaf7b731658d21bef2a66f7b9b65135fb5863f7043dd12f2444d72c3dd89a8d8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pt-PT/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pt-PT/firefox-61.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "c32d68de0fb3a54b38db13f6416be06745e61767d3dd2dbcfa3d397ba54899318aff0ccede0f562b3cb8b5a2b4a126f5f0300c146e9d4d847148d1392bb1a2be";
+      sha512 = "98634081c0976e04794ce53f237ec7c9bcb7dafa106accc50c6cf13ec2e69c1c2e70e3f6c8e3b6f56a7287d60fac632ad027a8bc5d0fc92cc86296ba4440d160";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/rm/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/rm/firefox-61.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "92bf05ae92adbb08e70e610d46e260c63158073598718fc64ba5e14f8f15c8ff712353586da0b2d693d070bdeb48824b0c68a36acb101b483b8af4bf37f74eef";
+      sha512 = "25c77c8ec3e4531522991568c0b380eeb51332afcf086fef9c1a6a583bf615cd4a7fbded7d4fcd292ffacf79ef0f15df92d30f394e58c20bf43888aa8bc155b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ro/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ro/firefox-61.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "3e5da35749bd3a5da3172b9d567e4baa121d268a0d13611becec3e497cec2bf652effd26310a4147204940499fcf837bf20138555c4c0bd7c034ec3d36d983b1";
+      sha512 = "8a70253983d92f187bf96037e4c319961040d8709fb4f71814dbb02b48d6b4565008895a5c0708878680963a2ec04e9ac90d207cea381ee6ea33cb95c6aa9727";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ru/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ru/firefox-61.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "a83c33ead97106e384a4d16f4436e639bc736db9811e162e889f159ed38d37a670c6256a0f3d5b5dd7e62e03dd140cb763c02d5d915b2fdc1de35650de0fa165";
+      sha512 = "0845c354ed3c31b31a9d9e7afe6f573ae1fdffb990aff5cf0a6d100da27cc218d6245024623d665146d7793b6cff209effa9587b6999cc0c5c7b427037616165";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/si/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/si/firefox-61.0b5.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "272cb7022e819e930ada868f2260c991bf21fcbbd8f219ca9d3199e2152059d2956c490bd7ebd10441ccc261210f9b8fabce4a41cf4e01939aaa2054e4ab99b1";
+      sha512 = "6bf31f8262c584ec8c9b719736c516eb179c5f66d384f59761edabb606808928115a850f278894793b392a6d16f9008de5edc8efd1d8023a55041ffdce2d5a60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sk/firefox-61.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "dbe0b1c1e63836eb695a24ff2576190d4a0552c9a7b6b2373a3b55774fbd9891b0cf32f53e95923fc267e8fc052bceb79d3d900ef060b92cbe40d7f0dddbcb49";
+      sha512 = "cf2a01c6d0ce55c43a54afaa439cfb074260cfd4e03c70e2c3a6eac011ff4c77c7fa6f5c3fcdec0823066b7caec7230d46911173f73ed65ccfbfb37d30c9e156";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sl/firefox-61.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "7422cc10f57ebacd937a3153035cb8acf369639f117d71447e002fa151cd108f2a8609563fb9575c2c71271f3f4e50fa5211cdda88a1ae53847045aad8af9b9d";
+      sha512 = "3eb37b8878d2cc28cf385668dac9c6487f76d9c1dd834aa2d81b5712657e3a5a76b229e03bbf9f5f464df54d2df412ff2a4aa5d78900437bcc2c0129317c825f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/son/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/son/firefox-61.0b5.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "8eafe8f6e1fc8170f622f29e598c6a06ccc507dc97d180e0810ff971d7fc4a4a965a75f1eb878483b03069ec0484833bdd0c0c1aafc732982b8cc802249914c7";
+      sha512 = "8f66f2d505fb113cf48561380e350632696201e207cc4a39a6757dbeecd923172fb5ee6d58ff771f8cb578e95c1bf01223c90fa14d4a1253c199978a499a5880";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sq/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sq/firefox-61.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "32a5e3d158e8931cca10777a59765cd8aa823678cb339b013519b07045b8a6614082bd6ae81d7871cf22fda10570fb4934c05be5dd16b0610f9bf7a1f19d671c";
+      sha512 = "3828b306dfaf69b2d5b97ed2d026b40e7d1dd323321712bfd746e930e62c0b83b27a7ddc225c218dcc08ff314104e6287bb3e010985f3df30ecd630d22c8a0d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sr/firefox-61.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "42877a689c178b9ddd8711b2b15e51062411667ac4c978aebcb364ee9c71764c8dd64963966fd17f3bc929c9853bdd54c12ab312a4c1527f7adad277fc9adc32";
+      sha512 = "3eefba51599529796bfb02e5ef558077f0fa65db9cf856d9b189a323284274827f2d10d7f16759a28480167cce7c773d6c59ad7802c303ccc9d7ea8bbfc45fde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sv-SE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sv-SE/firefox-61.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "48605bdcc841dca8a663b61d75d30e2bc7e0722be9e47833c42fc0b6ae275bf778b5ca534e66440db2cd85de70f8725f25a1f9a303b2fd8057fcbc1f4262e0d4";
+      sha512 = "1a15fb14c63c741c068bdbdb2965311ff367acdbaecfaf174a88b42470cc5e36ad190512aba8cda7e816d8d01449cdf9fd34203fc9bc868124381f5daf527e17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ta/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ta/firefox-61.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "7ede0ec9dc91cd2ca4226e5c361b2f14c592e77573bc64feaba4aefd24dce79d8139967f5c394bde440ecec5fc83e21d8d17e00923775fa33ed39b055ed50fba";
+      sha512 = "ee860b0595d2e0a9341d03a49df3cb82db3e272dbd258c791c1c575e5aaff3e29c755054425d8dfec0beaf47af9d05e0266116fe00a3e5ef5e8c298a31fe492b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/te/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/te/firefox-61.0b5.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "b37dd0bbdc6a8227fa76902ddd049281bc4313bbd5cbdd90866036b400ecb0b07d2995015c48e37c69a6c68de3b8810787fdcf138c36075a47fbc43b0106811e";
+      sha512 = "c4782516677864b28e5ebc01cc5cbda67fe7ce2912adcda0cec00958f2bbcf6ee2107b622dcb1170d32735dfceed80a2670f05c6d879ff3f626b7626aadb1811";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/th/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/th/firefox-61.0b5.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "29ce9cafcb24811fe6c9ef33d81d3f43634bf4acee7e3f1905d743a241bbeeb1d8d44d210389d28f6fb740f6ecf37648e808717780319f54f9c198a0a1b3f319";
+      sha512 = "409d4a385efb0b1ef61d7192873839e7b1d99aae50af62c8e7ed689230d2588b3d5b6d197c3c96f1e7ff6b41551880200ae2d32c936cbf4a5fb9e00a71251070";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/tr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/tr/firefox-61.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "b1248f1e115a509554ee8cef5316ea85020fdc8c150bac0b363b25123ec17b40fd46d34f2a33a161fa66822fcbd4b111313986649931e0e6ed2c4afff3ea9279";
+      sha512 = "ed3b6f18e54df3d342bcf7674fc48c84a4321db52af779aabf3d3150d96cca9a0e86314d4ce1476894343f5789e227db5aa8d8dc0abce0474d215eb7cdd3c084";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/uk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/uk/firefox-61.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "6220697e54e30e70267c3d777763da05bfc6625fa9c239a5c761ab3b992d3fa5e1271332011fe7aa218a615917002351c2c5e9fe4cd278f99efaa635f6934237";
+      sha512 = "cce08b4cb1b820ca5bc9832e7ed19e753cc6db066e3bd007f58ce713d85976f060cae4b221833e085d39effc5a2dcb288b6fd89e4a3ec01577afe19585c6061e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ur/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ur/firefox-61.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "bbbc09b0f0a88cf5540c4bcdddd226984bd91dd7aaee1256bd8142535b5e949d54dd8b92990f1d71e3695a8ff0054530dd64564edafb21bcf93e6764988c6568";
+      sha512 = "a9e137a01005de3dd60d05f7145134b3f2d5eb96ba84895effe434228fdebe995994682ba83c3368046732d8ceea7bd0289d4c852a0771feb6099fb29d524666";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/uz/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/uz/firefox-61.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "164c63d66666ee819a88169844859c8db95ec5281eeab77e30a63b1cca1fafd97bde09538665fc433ab9ecd62d05ac7fed68aa43bbb6e16476e34461ead4164e";
+      sha512 = "3ef9a4d7e92d813c3ec236869452372ba1c87cd978ffe7dc230ef410174625fb3d64caaef6c378b7609043ed5f3482dd6e03a975e0574365deeb6b35a1523600";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/vi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/vi/firefox-61.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b12a47314960a28c9527cb2200286070294d4ebaf6260b9b4d4c483e4eb98cef349e4df7ed7c60c032a327aadf101994a49e2226a2a0cedf7793feec42e85cc4";
+      sha512 = "d8b49627c29430ee420e8c878da1fde7df4fa0b3aa5f145b0003f7fd9270d9a7d0e3d5f9941dee9cfc081a376cc922b7652667f559421e5e7ca8aeae8aa4ddfe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/xh/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/xh/firefox-61.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "147b827716182a41fac6170656ab53bea4b658a0de537c57a0ca786d77ef4227c433c1ebc09d1dd00a4b92e07f03eacaba5928b61e055af67ac35b1aa9238890";
+      sha512 = "de32d3f2b715eaba412484d1b3e67d9ccfd53afcaf9d0a829c9873f07edc88d3f8c984d0752ef7dc378888a92ef515f6ace3ad4e4c98ab40f7232ed385445d13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/zh-CN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/zh-CN/firefox-61.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "c47f74481322b2f480893be1ba9f795d951af2db7632b6a0fbed6e00155a4dcba12e7a8f4a7a3f44460540e499c03b2561eaea5a67d22f68d31cbad8fdde58e5";
+      sha512 = "109d325c32a754dcf004e3dab0716a93ec7a29718719128855b0024f75822662df48d6c609cc1c2fc652818f3925972d9d317b928349db9ce4b267cd10e867e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/zh-TW/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/zh-TW/firefox-61.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "41c5b6b561995a4a9a7b954ce0c6981889b89e046ca7420bc17ec4da7de90c11e7e54b1408587e7bb60d58b667e51816dd748f651bf7f3abea6e84bcf86659fb";
+      sha512 = "6c85e5e20da3495ce351ca04ecda4addff13ce8ef09b14194110b409f9aa89c76eb6d4b851667414645249012cfb544ebce1dd41ca05b5d18873d4ecf3bf4960";
     }
     ];
 }
-- 
GitLab


From 4e891cf4d52d246b73f986fe034f4c81f76705c9 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 16 May 2018 14:30:45 +0800
Subject: [PATCH 0786/1085] emacsPackages.emacs-libvterm: Fix build (flipped
 over libvterm-neovim)

---
 .../editors/emacs-modes/emacs-libvterm/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
index 9b7a0ceab5f..f37d2289342 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, emacs, neovim-libvterm }:
+{ stdenv, fetchFromGitHub, cmake, emacs, libvterm-neovim }:
 
 let
   emacsSources = stdenv.mkDerivation {
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ emacs neovim-libvterm ];
+  buildInputs = [ emacs libvterm-neovim ];
 
   cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ];
 
-- 
GitLab


From d273691f6da5490cc7d647261100a7c2fcef0670 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com>
Date: Wed, 16 May 2018 07:41:13 +0100
Subject: [PATCH 0787/1085] trivial-builders.nix: support directories in
 requireFile

Allow recursive hash for requireFile so it can support directories (#40568)
---
 pkgs/build-support/trivial-builders.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index d092efb556e..2ec56c94763 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -138,6 +138,7 @@ rec {
                 , sha1 ? null
                 , url ? null
                 , message ? null
+                , hashMode ? "flat"
                 } :
     assert (message != null) || (url != null);
     assert (sha256 != null) || (sha1 != null);
@@ -158,6 +159,7 @@ rec {
     in
     stdenv.mkDerivation {
       name = name_;
+      outputHashMode = hashMode;
       outputHashAlgo = hashAlgo;
       outputHash = hash;
       preferLocalBuild = true;
-- 
GitLab


From 0910be832708100f20442cf0ec573161b83284bf Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Fri, 11 May 2018 00:49:18 +0900
Subject: [PATCH 0788/1085] btops: init at 0.1.0

---
 .../window-managers/btops/default.nix         |  25 ++++
 .../window-managers/btops/deps.nix            | 120 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 147 insertions(+)
 create mode 100644 pkgs/applications/window-managers/btops/default.nix
 create mode 100644 pkgs/applications/window-managers/btops/deps.nix

diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix
new file mode 100644
index 00000000000..f55c55110a2
--- /dev/null
+++ b/pkgs/applications/window-managers/btops/default.nix
@@ -0,0 +1,25 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "btops-${version}";
+  version = "0.1.0";
+
+  goPackagePath = "github.com/cmschuetz/btops";
+
+  src = fetchgit {
+    url = "https://github.com/cmschuetz/btops.git";
+    rev = version;
+    sha256 = "1ilidvpy7gz49zqp6rf0q7wjrc3r0brdrcp4r5f6i6p9cwybqkbq";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "bspwm desktop management that supports dymanic appending, removing, and renaming";
+    homepage = https://github.com/cmschuetz/btops;
+    maintainers = with maintainers; [ mnacamura ];
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/btops/deps.nix b/pkgs/applications/window-managers/btops/deps.nix
new file mode 100644
index 00000000000..a893d40e210
--- /dev/null
+++ b/pkgs/applications/window-managers/btops/deps.nix
@@ -0,0 +1,120 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
+      sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
+    };
+  }
+  {
+    goPackagePath = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev = "c2353362d570a7bfa228149c62842019201cfb71";
+      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b";
+      sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7";
+    };
+  }
+  {
+    goPackagePath = "github.com/pelletier/go-toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-toml";
+      rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
+      sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev = "63644898a8da0bc22138abf860edaf5277b6102e";
+      sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev = "8965335b8c7107321228e3e3702cab9832751bac";
+      sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
+      sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
+      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4";
+      sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
+      sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5260dbc016f..5079a98bdb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15063,6 +15063,8 @@ with pkgs;
 
   bspwm-unstable = callPackage ../applications/window-managers/bspwm/unstable.nix { };
 
+  btops = callPackage ../applications/window-managers/btops { };
+
   bvi = callPackage ../applications/editors/bvi { };
 
   bviplus = callPackage ../applications/editors/bviplus { };
-- 
GitLab


From d86edd5161c28f59291c23594de5e9002a1a03b6 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 16 May 2018 03:09:22 -0400
Subject: [PATCH 0789/1085] Dont haddock ghcjs in either version

---
 pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix | 6 ------
 pkgs/development/compilers/ghcjs-ng/common-overrides.nix  | 2 +-
 pkgs/top-level/haskell-packages.nix                       | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix

diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
deleted file mode 100644
index 72066ee1701..00000000000
--- a/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ haskellLib }:
-
-let inherit (haskellLib) dontHaddock;
-in self: super: {
-  ghcjs = dontHaddock super.ghcjs;
-}
diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
index 172a48a5a65..a88e2c48d03 100644
--- a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
+++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
@@ -3,6 +3,6 @@
 let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
 in self: super: {
   ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
-  ghcjs = appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install";
+  ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
   haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
 }
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c00bce430c3..2e6bd5ebb85 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -93,7 +93,6 @@ in rec {
       inherit (bootPkgs) alex happy;
       ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
       stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
-      ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.2/dep-overrides.nix {};
     };
     ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec {
       bootPkgs = packages.ghc842;
-- 
GitLab


From 0f850499615ff2327bf5fd16b85b3c75d56edac7 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 16 May 2018 03:09:40 -0400
Subject: [PATCH 0790/1085] bump ghcjs 8.4

---
 pkgs/development/compilers/ghcjs-ng/8.4/git.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
index 2d4a7a42667..49ff19529c6 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.4/git.json
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
@@ -1,6 +1,6 @@
 {
   "url": "https://github.com/ghcjs/ghcjs",
-  "rev": "c494a598d1e5b6d70ddcb97177dc4b6cc71f5bd0",
-  "sha256": "1gpn1y3m2gk2x4anfh11p4cp49blabj761wicawvkw0w9bfhcfhn",
+  "rev": "6770fa38621f55b7a947fc11c69f81b8ce8502cf",
+  "sha256": "0c0x0yylx14mrvzmbvkw6zbprriizk73hvz8iija8i8hwpff79vm",
   "fetchSubmodules": true
 }
-- 
GitLab


From 9326126fdd73ef910441553a815fe300bbfe4d37 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 16 May 2018 03:09:54 -0400
Subject: [PATCH 0791/1085] Add gcc to configured-ghcjs-src for macos

---
 pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
index b9435b31157..e8c24b21134 100644
--- a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
+++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
@@ -20,6 +20,7 @@ runCommand "configured-ghcjs-src" {
     autoconf
     automake
     python3
+    gcc
     ghc
     happy
     alex
-- 
GitLab


From 2a32834ad9ff1d44efdf3a24a3182ddc8eeea2ed Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 16 May 2018 03:10:52 -0400
Subject: [PATCH 0792/1085] Factor out bootGhcjs for justStaticExecutables sake

---
 .../compilers/ghcjs-ng/default.nix            | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index c2fb6a03c6b..71bab1a4e66 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -35,7 +35,7 @@ let
     ]);
 
     targetPrefix = "";
-    inherit (passthru.bootPkgs.ghcjs) version;
+    inherit (bootGhcjs) version;
     isGhcjs = true;
 
     # Relics of the old GHCJS build system
@@ -43,15 +43,24 @@ let
     mkStage2 = _: {};
   };
 
+  bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs;
   libexec =
-    if builtins.compareVersions passthru.bootPkgs.ghcjs.version "8.3" <= 0
-      then "${passthru.bootPkgs.ghcjs}/bin"
-      else "${passthru.bootPkgs.ghcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${passthru.bootPkgs.ghcjs.name}";
+    if builtins.compareVersions bootGhcjs.version "8.3" <= 0
+      then "${bootGhcjs}/bin"
+      else "${bootGhcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
 
 in stdenv.mkDerivation {
     name = "ghcjs";
     src = passthru.configuredSrc;
-    nativeBuildInputs = [passthru.bootPkgs.ghcjs passthru.bootPkgs.ghc cabal-install nodejs makeWrapper xorg.lndir gmp];
+    nativeBuildInputs = [
+      bootGhcjs
+      passthru.bootPkgs.ghc
+      cabal-install
+      nodejs
+      makeWrapper
+      xorg.lndir
+      gmp
+    ];
     phases = ["unpackPhase" "buildPhase"];
     buildPhase = ''
       export HOME=$TMP
@@ -61,7 +70,7 @@ in stdenv.mkDerivation {
       mkdir -p $out/libexec
       lndir ${libexec} $out/bin
 
-      wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec"
+      wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec -dcore-lint"
       wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec"
       wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d"
 
-- 
GitLab


From 54cf5d935893a06c62ca7affd2ba95ea4c1f36e2 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <giulio.eulisse@cern.ch>
Date: Thu, 26 Apr 2018 09:59:20 +0200
Subject: [PATCH 0793/1085] pythonPackages.uproot: init at 2.8.23

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

diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
new file mode 100644
index 00000000000..e58bbde1353
--- /dev/null
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -0,0 +1,22 @@
+{lib, fetchPypi, buildPythonPackage, numpy}:
+
+buildPythonPackage rec {
+  pname = "uproot";
+  version = "2.8.23";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "121ggyl5s0q66yrbdfznvzrc793zq1w2xnr3baadlzfvqdlkhgj7";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+  ];
+
+  meta = with lib; {
+    homepage = https://github.com/scikit-hep/uproot;
+    description = "ROOT I/O in pure Python and Numpy";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ktf ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7748120cd49..bef7cfc0480 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14744,6 +14744,8 @@ in {
 
   uritemplate = callPackage ../development/python-modules/uritemplate { };
 
+  uproot = callPackage ../development/python-modules/uproot {};
+
   uptime = buildPythonPackage rec {
     name = "uptime-${version}";
     version = "3.0.1";
-- 
GitLab


From 84ae5f1ee34c10863d5470f527dbfa7ad281b93c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 16 May 2018 16:12:50 +0800
Subject: [PATCH 0794/1085] vcal: init at 2.7

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

diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix
new file mode 100644
index 00000000000..8e658381b2d
--- /dev/null
+++ b/pkgs/applications/misc/vcal/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "vcal-${version}";
+  version = "2.7";
+
+  src = fetchurl {
+    url    = "http://waynemorrison.com/software/vcal";
+    sha256 = "0fknrlad7vb84ngh242xjaq96vkids85ksnxaflk2cr9wcwxfmix";
+  };
+
+  nativeBuildInputs = [ perl ]; # for pod2man
+
+  unpackPhase = ":";
+  dontBuild = true;
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,share/man/man1}
+    substitute ${src} $out/bin/vcal \
+      --replace /usr/bin/perl ${perl}/bin/perl
+    pod2man -n vcal ${src} > $out/share/man/man1/vcal.1
+
+    runHook postInstall
+  '';
+
+  # There are no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Parser for VCalendar and ICalendar files, usable from the command line";
+    homepage = http://waynemorrison.com/software/;
+    license = licenses.unfree; # "These are made publicly available for personal use."
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5260dbc016f..b371db1f660 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15982,6 +15982,8 @@ with pkgs;
 
   gcalcli = callPackage ../applications/misc/gcalcli { };
 
+  vcal = callPackage ../applications/misc/vcal { };
+
   gcolor2 = callPackage ../applications/graphics/gcolor2 { };
 
   gcolor3 = callPackage ../applications/graphics/gcolor3 { };
-- 
GitLab


From 9292bdba6c5bbe49d97b3737b4fbff42d28256ea Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 16 May 2018 16:50:48 +0800
Subject: [PATCH 0795/1085] vcal: fix executable perms

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

diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix
index 8e658381b2d..0964be1f1ea 100644
--- a/pkgs/applications/misc/vcal/default.nix
+++ b/pkgs/applications/misc/vcal/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{bin,share/man/man1}
     substitute ${src} $out/bin/vcal \
       --replace /usr/bin/perl ${perl}/bin/perl
+    chmod 0755 $out/bin/*
     pod2man -n vcal ${src} > $out/share/man/man1/vcal.1
 
     runHook postInstall
-- 
GitLab


From 56beb9b9fd6a08223946296f3fb560bd8dedb949 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 07:23:33 -0400
Subject: [PATCH 0796/1085] linux: 4.4.131 -> 4.4.132

---
 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 725f3385a80..dd946c28131 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.131";
+  version = "4.4.132";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "02f7sx20l0ljkgffac0yqav1kk7x1gl6026icslcsnn46pfpl4k5";
+    sha256 = "0d06dv7maspgv33dlc6r8cb8pkpg4q2vxbpzz6285n0ah4fb05f4";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From b8aa95185cf42303d12da224814cab5495508254 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 07:23:50 -0400
Subject: [PATCH 0797/1085] linux: 4.9.99 -> 4.9.100

---
 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 c6a94b194b6..3a7dc9353f8 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.99";
+  version = "4.9.100";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1pqk88h8wyqz2ijp0pav1b35m2hs9d9is1kcir649jlbj66fphrx";
+    sha256 = "0z572csacfwn3kl3yaz4wpd7wkzabm42p2z4ysx5rq0kf4x6zfy5";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 8d68eca6d2e1f7d6b0a79d5c3a4ec3d3a1bce7cd Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 07:24:06 -0400
Subject: [PATCH 0798/1085] linux: 4.14.40 -> 4.14.41

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index f1e0bf82cec..f44adb6bc94 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.40";
+  version = "4.14.41";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "03nh71nqgifkamkb0gn12jny5h3lbn5kmpdy0ff886wyrl34sw6l";
+    sha256 = "0vffv1iqcvrzvhs534czdjhj7702gr01pyn9idr8dj85kdx19wfc";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From f58c4d9a9d56555ffca10844569343361ee48822 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 07:24:22 -0400
Subject: [PATCH 0799/1085] linux: 4.16.8 -> 4.16.9

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index 40d7d5d865f..c1df425280e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.8";
+  version = "4.16.9";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1z4q7khag48wildvq4hf4vwaipkfbh9yywm2m9zfj43vk1ysvyp4";
+    sha256 = "12lvdnfz06r7pj5f15x39c4glhbp3sv7bdbwj4yimbp6iqwvndv0";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 3ed41f8c73cf5fd375a416c9fc241baf3ebbc2b7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 07:34:24 -0400
Subject: [PATCH 0800/1085] vscode: 1.23.0 -> 1.23.1

---
 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 41d4c114c75..29de230d38c 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.23.0";
+  version = "1.23.1";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "1nyrcgnf18752n3i7xaq6gpb2k4wsfzk671kxg6za4ycrriw1f5l";
-    "x86_64-linux" = "1mkxyavzav522sl3fjn2hdlbj0bkdl3hagqiw9i6h8wgkxcvsszy";
-    "x86_64-darwin" = "123ggzssd5qd80jxar2pf5g2n2473pd2j8pfjyir1c7xkaqji2w6";
+    "i686-linux" = "0vqaxyg6r6mfm1gz8j7wxgg426hjsmv2ybyi8rfjcm9s8d23y9n6";
+    "x86_64-linux" = "0zycl8zqf5yiqq6k6mr28a20yg37whb8iw527pavvm74knzx3lgk";
+    "x86_64-darwin" = "03r2cvim7swq1fjxh6m9f7rifww3hddnyzpzniqb5132nnq4mrmc";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
-- 
GitLab


From 82550c639ea8fa609bec82605a0c6f66e26566ea Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Tue, 8 May 2018 12:31:35 +0300
Subject: [PATCH 0801/1085] yrd: init at 0.5.3

---
 pkgs/tools/networking/yrd/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  3 +++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/networking/yrd/default.nix

diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix
new file mode 100644
index 00000000000..e5d260ef7d4
--- /dev/null
+++ b/pkgs/tools/networking/yrd/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+let
+  pname = "yrd";
+  version = "0.5.3";
+  sha256 = "1yx1hr8z4cvlb3yi24dwafs0nxq41k4q477jc9q24w61a0g662ps";
+
+in pythonPackages.buildPythonApplication {
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "kpcyrd";
+    repo = "${pname}";
+    rev = "v${version}";
+    inherit sha256;
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ argh ];
+
+  meta = with stdenv.lib; {
+    description = "Cjdns swiss army knife";
+    maintainers = with maintainers; [ akru ];
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    homepage = https://github.com/kpcyrd/yrd;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b65b28bb020..3984fbb2cd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21502,4 +21502,7 @@ with pkgs;
 
   inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { }))
           netbsd;
+
+  yrd = callPackage ../tools/networking/yrd { };
+
 }
-- 
GitLab


From d596db5ea610f272672785f38903839ec85d5ebc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 16 May 2018 05:44:31 -0700
Subject: [PATCH 0802/1085] libite: 2.0.1 -> 2.0.2 (#40484)

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.0.2 with grep in /nix/store/naarzbhrc25il5apxf2s1d6npnv5bdwj-libite-2.0.2
- directory tree listing: https://gist.github.com/5c0e5f0b94104a500555ba038e45c2bf
- du listing: https://gist.github.com/4fa4a3663027f65a44561a901994afc7
---
 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 51a7ab4851c..7580c1b092e 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 = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "libite";
     rev = "v${version}";
-    sha256 = "07zypi3f02ygl7h5yc9sy136iiwgdi3r3nkjai9bq4gzjmzsvyl9";
+    sha256 = "0qk7231c1xwvjhkc9w7hasvafvgns10cx9kdhfdbc4r1hsh6d1ca";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From e03acfe161f6c28518211df6a9d1611c84957b8f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 16 May 2018 05:47:29 -0700
Subject: [PATCH 0803/1085] timescaledb: 0.9.1 -> 0.9.2 (#40468)

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

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.2 with grep in /nix/store/m28fll152hk6ik9fiz2jy66qccjxklq3-timescaledb-0.9.2
- directory tree listing: https://gist.github.com/a922008862652d9f3c6f2e2a678c4c71
- du listing: https://gist.github.com/8c5a0a1374fbb013168d4197d67ba214
---
 pkgs/servers/sql/postgresql/timescaledb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix
index e1a4aed3b7e..ce298cb2745 100644
--- a/pkgs/servers/sql/postgresql/timescaledb/default.nix
+++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   name = "timescaledb-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ postgresql ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner  = "timescale";
     repo   = "timescaledb";
     rev    = "refs/tags/${version}";
-    sha256 = "00k8fk5a1xpv9nxlmafnngk31wh80h6m72vsl1hnyq7nhby7ylic";
+    sha256 = "1zgyd407skqbsw2zj3l9hixwlisnj82yb6hbq5khjg9k0ifvvgyp";
   };
 
   # Fix the install phase which tries to install into the pgsql extension dir,
-- 
GitLab


From 7bec4337936025cdaa5d239f8005dd776b92a89a Mon Sep 17 00:00:00 2001
From: Frank Doepper <github@woffs.de>
Date: Wed, 16 May 2018 15:02:01 +0200
Subject: [PATCH 0804/1085] aircrack-ng: 1.2-rc4 -> 1.2 (#40590)

---
 pkgs/tools/networking/aircrack-ng/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index 2e982d0f912..e3a5a58671c 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools
-, iw, ethtool, pciutils, libnl, pkgconfig, makeWrapper }:
+, iw, ethtool, pciutils, libnl, pkgconfig, makeWrapper
+, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "aircrack-ng-1.2-rc4";
+  name = "aircrack-ng-1.2";
 
   src = fetchurl {
     url = "http://download.aircrack-ng.org/${name}.tar.gz";
-    sha256 = "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr";
+    sha256 = "0z7sl1ihgrnc98bpqa1mmkh51w26fnsanvj6ydwcnd8g83azwkvr";
   };
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ];
   buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ];
 
   patchPhase = ''
-    sed -e 's@^prefix.*@prefix = '$out@ -i common.mak
     sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c
   '';
 
-- 
GitLab


From 727216217962f7d14e83cccb32e4549486d9075d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 16 May 2018 06:08:23 -0700
Subject: [PATCH 0805/1085] stubby: 0.2.2 -> 0.2.3 (#40465)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

These checks were done:

- built on NixOS
- ran ‘/nix/store/f1ycc05g0mc6vpz59wwsg8a2ikg67pjm-stubby-0.2.3/bin/stubby -h’ got 0 exit code
- ran ‘/nix/store/f1ycc05g0mc6vpz59wwsg8a2ikg67pjm-stubby-0.2.3/bin/stubby -V’ and found version 0.2.3
- found 0.2.3 with grep in /nix/store/f1ycc05g0mc6vpz59wwsg8a2ikg67pjm-stubby-0.2.3
- directory tree listing: https://gist.github.com/5e53c11fefe1a4b45ac73905083dcbd6

- du listing: https://gist.github.com/1f5e9d63405c461f5a846e92de6cf816
---
 pkgs/tools/networking/stubby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix
index bd611af2426..2882ba21739 100644
--- a/pkgs/tools/networking/stubby/default.nix
+++ b/pkgs/tools/networking/stubby/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   pname = "stubby";
   name = "${pname}-${version}";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "getdnsapi";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1zq7h3jx6v821phcbjp348ncdicx9s4gqkj7mcz8kd6ps902iag8";
+    sha256 = "1n02dj1hvh0aml54asxj42f0j9wfgiyavbh0gr0j9lm4f2xcd60w";
   };
 
   nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ];
-- 
GitLab


From 99e61887844b20a1dae129322b1742796466b683 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 16 May 2018 21:16:04 +0800
Subject: [PATCH 0806/1085] mpack: fix up broken paths

---
 pkgs/tools/networking/mpack/default.nix | 29 +++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix
index 8c8b40bbd2e..62cec7c41ee 100644
--- a/pkgs/tools/networking/mpack/default.nix
+++ b/pkgs/tools/networking/mpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mpack-1.6";
@@ -10,10 +10,31 @@ stdenv.mkDerivation rec {
 
   patches = [ ./build-fix.patch ];
 
-  preConfigure = "configureFlags=--mandir=$out/share/man";
+  postPatch = ''
+    for f in *.{c,man,pl,unix} ; do
+      substituteInPlace $f --replace /usr/tmp /tmp
+    done
 
-  meta = {
+    for f in unixpk.c ; do
+      substituteInPlace $f \
+        --replace /usr/sbin /run/current-system/sw/bin
+    done
+
+    # this just shuts up some warnings
+    for f in {decode,encode,part,unixos,unixpk,unixunpk,xmalloc}.c ; do
+      sed -i 'i#include <stdlib.h>' $f
+    done
+  '';
+
+  postInstall = ''
+    install -Dm644 -t $out/share/doc/mpack INSTALL README.*
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
     description = "Utilities for encoding and decoding binary files in MIME";
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.free;
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From 380cdd8dd71398721909cd7560f8d0ded44abe21 Mon Sep 17 00:00:00 2001
From: baroncharlus <elliot@ellioteverettwright.com>
Date: Wed, 16 May 2018 08:16:30 -0500
Subject: [PATCH 0807/1085] Add stubby resolver daemon service module (#38667)

* networking/stubby.nix: implementing systemd service module for stubby

This change implements stubby, the DNS-over-TLS stub resolver daemon.
The motivation for this change was the desire to use stubby's
DNS-over-TLS funcitonality in tandem with unbound, which requires
passing certain configuration parameters. This module implements those
config parameters by exposing them for use in configuration.nix.

* networking/stubby.nix: merging back module list

re-merging the module list to remove unecessary changes.

* networking/stubby.nix: removing unecessary capabilities flag

This change removes the unecessary flag for toggling the capabilities
which allows the daemon to bind to low ports.

* networking/stubby.nix: adding debug level logging bool

Adding the option to turn on debug logging.

* networking/stubby.nix: clarifying idleTimeout and adding systemd target

Improving docs to note that idleTimeout is expressed in ms. Adding the
nss-lookup `before' target to the systemd service definition.

* networking/stubby.nix: Restrict options with types.enum

This change restricts fallbackProtocol and authenticationMode to accept
only valid options instead of any list or str types (respectively). This
change also fixes typo in the CapabilityBoundingSet systemd setting.

* networking/stubby.nix: cleaning up documentation

Cleaning up docs, adding literal tags to settings, and removing
whitespace.

* networking/stubby.nix: fixing missing linebreak in comments

* networking/stubby.nix: cleaning errant comments
---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/networking/stubby.nix | 214 +++++++++++++++++++
 2 files changed, 215 insertions(+)
 create mode 100644 nixos/modules/services/networking/stubby.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8ce29e52fb2..7bce8e44ecc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -569,6 +569,7 @@
   ./services/networking/strongswan.nix
   ./services/networking/strongswan-swanctl/module.nix
   ./services/networking/stunnel.nix
+  ./services/networking/stubby.nix
   ./services/networking/supplicant.nix
   ./services/networking/supybot.nix
   ./services/networking/syncthing.nix
diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix
new file mode 100644
index 00000000000..3fbf6eb60e9
--- /dev/null
+++ b/nixos/modules/services/networking/stubby.nix
@@ -0,0 +1,214 @@
+{ config, lib, pkgs, ...}:
+
+with lib;
+
+let
+  cfg = config.services.stubby;
+
+  fallbacks = concatMapStringsSep "\n  " (x: "- ${x}") cfg.fallbackProtocols;
+  listeners = concatMapStringsSep "\n  " (x: "- ${x}") cfg.listenAddresses;
+
+  # By default, the recursive resolvers maintained by the getdns
+  # project itself are enabled. More information about both getdns's servers,
+  # as well as third party options for upstream resolvers, can be found here:
+  # https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Test+Servers
+  #
+  # You can override these values by supplying a yaml-formatted array of your
+  # preferred upstream resolvers in the following format:
+  #
+  # 106 # - address_data: IPv4 or IPv6 address of the upstream
+  #   port: Port for UDP/TCP (default is 53)
+  #   tls_auth_name: Authentication domain name checked against the server
+  #                  certificate
+  #   tls_pubkey_pinset: An SPKI pinset verified against the keys in the server
+  #                      certificate
+  #     - digest: Only "sha256" is currently supported
+  #       value: Base64 encoded value of the sha256 fingerprint of the public
+  #              key
+  #   tls_port: Port for TLS (default is 853)
+
+  defaultUpstream = ''
+    - address_data: 145.100.185.15
+      tls_auth_name: "dnsovertls.sinodun.com"
+      tls_pubkey_pinset:
+        - digest: "sha256"
+          value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
+    - address_data: 145.100.185.16
+      tls_auth_name: "dnsovertls1.sinodun.com"
+      tls_pubkey_pinset:
+        - digest: "sha256"
+          value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
+    - address_data: 185.49.141.37
+      tls_auth_name: "getdnsapi.net"
+      tls_pubkey_pinset:
+        - digest: "sha256"
+          value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q=
+    - address_data: 2001:610:1:40ba:145:100:185:15
+      tls_auth_name: "dnsovertls.sinodun.com"
+      tls_pubkey_pinset:
+        - digest: "sha256"
+          value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
+    - address_data: 2001:610:1:40ba:145:100:185:16
+      tls_auth_name: "dnsovertls1.sinodun.com"
+      tls_pubkey_pinset:
+        - digest: "sha256"
+          value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
+    - address_data: 2a04:b900:0:100::38
+      tls_auth_name: "getdnsapi.net"
+      tls_pubkey_pinset:
+        - digest: "sha256"
+          value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q=
+  '';
+
+  # Resolution type is not changeable here because it is required per the
+  # stubby documentation:
+  #
+  # "resolution_type: Work in stub mode only (not recursive mode) - required for Stubby
+  # operation."
+  #
+  # https://dnsprivacy.org/wiki/display/DP/Configuring+Stubby
+
+  confFile = pkgs.writeText "stubby.yml" ''
+    resolution_type: GETDNS_RESOLUTION_STUB
+    dns_transport_list:
+      ${fallbacks}
+    tls_authentication: ${cfg.authenticationMode}
+    tls_query_padding_blocksize: ${toString cfg.queryPaddingBlocksize}
+    edns_client_subnet_private: ${if cfg.subnetPrivate then "1" else "0"}
+    idle_timeout: ${toString cfg.idleTimeout}
+    listen_addresses:
+      ${listeners}
+    round_robin_upstreams: ${if cfg.roundRobinUpstreams then "1" else "0"}
+    ${cfg.extraConfig}
+    upstream_recursive_servers:
+    ${cfg.upstreamServers}
+  '';
+in
+
+{
+  options = {
+    services.stubby = {
+
+      enable = mkEnableOption "Stubby DNS resolver";
+
+      fallbackProtocols = mkOption {
+        default = [ "GETDNS_TRANSPORT_TLS" ];
+        type = with types; listOf (enum [
+          "GETDNS_TRANSPORT_TLS"
+          "GETDNS_TRANSPORT_TCP"
+          "GETDNS_TRANSPORT_UDP"
+        ]);
+        description = ''
+          Ordered list composed of one or more transport protocols.
+          Strict mode should only use <literal>GETDNS_TRANSPORT_TLS</literal>.
+          Other options are <literal>GETDNS_TRANSPORT_UDP</literal> and
+          <literal>GETDNS_TRANSPORT_TCP</literal>.
+        '';
+      };
+
+      authenticationMode = mkOption {
+        default = "GETDNS_AUTHENTICATION_REQUIRED";
+        type = types.enum [
+          "GETDNS_AUTHENTICATION_REQUIRED"
+          "GETDNS_AUTHENTICATION_NONE"
+        ];
+        description = ''
+          Selects the Strict or Opportunistic usage profile.
+          For strict, set to <literal>GETDNS_AUTHENTICATION_REQUIRED</literal>.
+          for opportunistic, use <literal>GETDNS_AUTHENTICATION_NONE</literal>.
+        '';
+      };
+
+      queryPaddingBlocksize = mkOption {
+        default = 128;
+        type = types.int;
+        description = ''
+          EDNS0 option to pad the size of the DNS query to the given blocksize.
+        '';
+      };
+
+      subnetPrivate = mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          EDNS0 option for ECS client privacy. Default is
+          <literal>true</literal>. If set, this option prevents the client
+          subnet from being sent to authoritative nameservers.
+        '';
+      };
+
+      idleTimeout = mkOption {
+        default = 10000;
+        type = types.int;
+        description = "EDNS0 option for keepalive idle timeout expressed in
+        milliseconds.";
+      };
+
+      listenAddresses = mkOption {
+        default = [ "127.0.0.1" "0::1" ];
+        type = with types; listOf str;
+        description = ''
+          Sets the listen address for the stubby daemon.
+          Uses port 53 by default.
+          Ise IP@port to specify a different port.
+        '';
+      };
+
+      roundRobinUpstreams = mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          Instructs stubby to distribute queries across all available name
+          servers. Default is <literal>true</literal>. Set to
+          <literal>false</literal> in order to use the first available.
+        '';
+      };
+
+      upstreamServers = mkOption {
+        default = defaultUpstream;
+        type = types.lines;
+        description = ''
+          Add additional upstreams. See <citerefentry><refentrytitle>stubby
+          </refentrytitle><manvolnum>1</manvolnum></citerefentry> for an
+          example of the entry formatting. In Strict mode, at least one of the
+          following settings must be supplied for each nameserver:
+          <literal>tls_auth_name</literal> or
+          <literal>tls_pubkey_pinset</literal>.
+        '';
+      };
+
+      debugLogging = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Enable or disable debug level logging.";
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        type = types.lines;
+        description = ''
+          Add additional configuration options. see <citerefentry>
+          <refentrytitle>stubby</refentrytitle><manvolnum>1</manvolnum>
+          </citerefentry>for more options.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.stubby ];
+    systemd.services.stubby = {
+      description = "Stubby local DNS resolver";
+      after = [ "network.target" ];
+      before = [ "nss-lookup.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+        CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
+        ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString cfg.debugLogging "-l"}";
+        DynamicUser = true;
+      };
+    };
+  };
+}
-- 
GitLab


From 6f23e142cbaaf38a3f66104655785f212bcb6200 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 27 Apr 2018 18:53:21 +0200
Subject: [PATCH 0808/1085] gnome3.gdm: clean up

---
 pkgs/desktops/gnome-3/core/gdm/default.nix    | 66 ++++++++++---------
 .../desktops/gnome-3/core/gdm/fix-paths.patch | 49 ++++++++++++++
 2 files changed, 85 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/gdm/fix-paths.patch

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 6b6b23f21b5..88fed09de38 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
+{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg, dbus
 , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
 , gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth
 , librsvg, coreutils }:
@@ -12,50 +12,56 @@ stdenv.mkDerivation rec {
     sha256 = "1yxjjyrp0ywrc25cp81bsdhp79zn0c0jag48hlp00b5wfnkqy1kp";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gdm"; attrPath = "gnome3.gdm"; };
-  };
-
   # Only needed to make it build
   preConfigure = ''
     substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
   '';
 
-  postPatch = ''
-    substituteInPlace daemon/gdm-manager.c --replace "/bin/plymouth" "${plymouth}/bin/plymouth"
-    substituteInPlace data/gdm.service.in  --replace "/bin/kill" "${coreutils}/bin/kill"
-  '';
-
-  configureFlags = [ "--sysconfdir=/etc"
-                     "--localstatedir=/var"
-                     "--with-plymouth=yes"
-                     "--with-initial-vt=7"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-plymouth=yes"
+    "--with-initial-vt=7"
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+  ];
 
   nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ];
-  buildInputs = [ glib accountsservice systemd
-                  gobjectIntrospection libX11 gtk
-                  libcanberra-gtk3 pam plymouth librsvg ];
+  buildInputs = [
+    glib accountsservice systemd
+    gobjectIntrospection libX11 gtk
+    libcanberra-gtk3 pam plymouth librsvg
+  ];
 
   enableParallelBuilding = true;
 
   # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./sessions_dir.patch
-              ./gdm-x-session_extra_args.patch
-              ./gdm-session-worker_xserver-path.patch
-             ];
-
-  postInstall = ''
-    # Prevent “Could not parse desktop file orca-autostart.desktop or it references a not found TryExec binary”
-    rm $out/share/gdm/greeter/autostart/orca-autostart.desktop
-  '';
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit coreutils plymouth;
+    })
+    ./sessions_dir.patch
+    ./gdm-x-session_extra_args.patch
+    ./gdm-session-worker_xserver-path.patch
+  ];
 
-  installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
+  installFlags = [
+    "sysconfdir=$(out)/etc"
+    "dbusconfdir=$(out)/etc/dbus-1/system.d"
+  ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gdm";
+      attrPath = "gnome3.gdm";
+    };
+  };
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GDM;
     description = "A program that manages graphical display servers and handles graphical user logins";
-    platforms = platforms.linux;
+    homepage = https://wiki.gnome.org/Projects/GDM;
+    license = licenses.gpl2Plus;
     maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
new file mode 100644
index 00000000000..d10283d40ea
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
@@ -0,0 +1,49 @@
+--- a/daemon/gdm-manager.c
++++ b/daemon/gdm-manager.c
+@@ -147,7 +147,7 @@
+         GError  *error;
+ 
+         error = NULL;
+-        res = g_spawn_command_line_sync ("/bin/plymouth --ping",
++        res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth --ping",
+                                          NULL, NULL, &status, &error);
+         if (! res) {
+                 g_debug ("Could not ping plymouth: %s", error->message);
+@@ -165,7 +165,7 @@
+         GError  *error;
+ 
+         error = NULL;
+-        res = g_spawn_command_line_sync ("/bin/plymouth deactivate",
++        res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth deactivate",
+                                          NULL, NULL, NULL, &error);
+         if (! res) {
+                 g_warning ("Could not deactivate plymouth: %s", error->message);
+@@ -180,7 +180,7 @@
+         GError  *error;
+ 
+         error = NULL;
+-        res = g_spawn_command_line_async ("/bin/plymouth quit --retain-splash", &error);
++        res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit --retain-splash", &error);
+         if (! res) {
+                 g_warning ("Could not quit plymouth: %s", error->message);
+                 g_error_free (error);
+@@ -196,7 +196,7 @@
+         GError  *error;
+ 
+         error = NULL;
+-        res = g_spawn_command_line_async ("/bin/plymouth quit", &error);
++        res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit", &error);
+         if (! res) {
+                 g_warning ("Could not quit plymouth: %s", error->message);
+                 g_error_free (error);
+--- a/data/gdm.service.in
++++ b/data/gdm.service.in
+@@ -28,7 +28,7 @@
+ StandardOutput=syslog
+ StandardError=inherit
+ EnvironmentFile=-@LANG_CONFIG_FILE@
+-ExecReload=/bin/kill -SIGHUP $MAINPID
++ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID
+ 
+ [Install]
+ Alias=display-manager.service
-- 
GitLab


From 3bfa8563d10e356f085f122d8982ccd13647ff02 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 27 Apr 2018 19:03:19 +0200
Subject: [PATCH 0809/1085] gnome3.gdm: fix wayland detection

Apparently, wayland session were not used at all until now.
---
 pkgs/desktops/gnome-3/core/gdm/default.nix     |  4 ++--
 pkgs/desktops/gnome-3/core/gdm/fix-paths.patch | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 88fed09de38..247d3566d6f 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg, dbus
 , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
 , gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth
-, librsvg, coreutils }:
+, librsvg, coreutils, xwayland }:
 
 stdenv.mkDerivation rec {
   name = "gdm-${version}";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
-      inherit coreutils plymouth;
+      inherit coreutils plymouth xwayland;
     })
     ./sessions_dir.patch
     ./gdm-x-session_extra_args.patch
diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
index d10283d40ea..adac2dc913c 100644
--- a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
@@ -1,3 +1,14 @@
+--- a/daemon/gdm-local-display-factory.c
++++ b/daemon/gdm-local-display-factory.c
+@@ -450,7 +450,7 @@
+ #ifdef ENABLE_WAYLAND_SUPPORT
+                         gboolean wayland_enabled = FALSE;
+                         if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) {
+-                                if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) {
++                                if (wayland_enabled && g_file_test ("@xwayland@/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) {
+                                         session_type = "wayland";
+                                 }
+                         }
 --- a/daemon/gdm-manager.c
 +++ b/daemon/gdm-manager.c
 @@ -147,7 +147,7 @@
-- 
GitLab


From 54135fc73350e03787b2496d3e39f7a520d20e09 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 30 Apr 2018 18:15:28 +0200
Subject: [PATCH 0810/1085] gnome3.gdm: allow choosing user account without
 GNOME

Account chooser depends on AccountsService, which is normally enabled by
GNOME module but it was missing when using GDM without GNOME.
---
 nixos/modules/services/x11/display-managers/gdm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 70fc7388c2a..a6a38a21b61 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -135,6 +135,9 @@ in
 
     systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ];
 
+    # Allow choosing an user account
+    services.accounts-daemon.enable = true;
+
     services.dbus.packages = [ gdm ];
 
     systemd.user.services.dbus.wantedBy = [ "default.target" ];
-- 
GitLab


From 8a93595550fe72371b75c976d0cf8738ddd33d5a Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 31 Dec 2017 15:52:50 +0100
Subject: [PATCH 0811/1085] sysprof: 1.2.0 -> 3.28.1

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/misc/sysprof.nix       | 19 +++++++
 .../tools/profiling/sysprof/configure.patch   | 17 ------
 .../tools/profiling/sysprof/default.nix       | 55 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  4 +-
 5 files changed, 64 insertions(+), 32 deletions(-)
 create mode 100644 nixos/modules/services/misc/sysprof.nix
 delete mode 100644 pkgs/development/tools/profiling/sysprof/configure.patch

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7bce8e44ecc..6fe29af3a00 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -383,6 +383,7 @@
   ./services/misc/sundtek.nix
   ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
+  ./services/misc/sysprof.nix
   ./services/misc/taskserver
   ./services/misc/tzupdate.nix
   ./services/misc/uhub.nix
diff --git a/nixos/modules/services/misc/sysprof.nix b/nixos/modules/services/misc/sysprof.nix
new file mode 100644
index 00000000000..ab91a8b586a
--- /dev/null
+++ b/nixos/modules/services/misc/sysprof.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+
+{
+  options = {
+    services.sysprof = {
+      enable = lib.mkEnableOption "sysprof profiling daemon";
+    };
+  };
+
+  config = lib.mkIf config.services.sysprof.enable {
+    environment.systemPackages = [ pkgs.sysprof ];
+
+    services.dbus.packages = [ pkgs.sysprof ];
+
+    systemd.packages = [ pkgs.sysprof ];
+  };
+
+  meta.maintainers = pkgs.sysprof.meta.maintainers;
+}
diff --git a/pkgs/development/tools/profiling/sysprof/configure.patch b/pkgs/development/tools/profiling/sysprof/configure.patch
deleted file mode 100644
index 212840ee406..00000000000
--- a/pkgs/development/tools/profiling/sysprof/configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- sysprof-1.0.10/configure	2008-04-28 01:41:25.000000000 +0200
-+++ sysprof-1.0.10/configure	2008-06-07 15:40:07.000000000 +0200
-@@ -3342,14 +3342,6 @@ if test $kernel_module = "yes"; then
-      echo \*
-      exit 1
-   fi
--
--  if  ! test -f /lib/modules/`uname -r`/build/Makefile  ; then
--     echo \*
--     echo \* Sysprof requires the kernel source code to be installed.
--     echo \* On a Fedora Core system the relevant package is kernel-devel
--     echo \*
--     exit 1
--  fi
- fi
- 
- # Pkgconfig dependencies
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index a2ea3444db6..f28fe187e6c 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -1,24 +1,53 @@
 { stdenv
-, fetchurl, pkgconfig
-, gtk2, glib, pango, libglade
+, desktop-file-utils
+, fetchurl
+, gettext
+, glib
+, gtk3
+, itstool
+, libxml2
+, meson, ninja
+, pango
+, pkgconfig
+, polkit
+, shared-mime-info
+, systemd
+, wrapGAppsHook
+, gnome3
 }:
+let
+  version = "3.28.1";
+  pname = "sysprof";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
-stdenv.mkDerivation rec {
-  name = "sysprof-1.2.0";
+  outputs = [ "out" "lib" "dev" ];
 
   src = fetchurl {
-    url = "http://www.sysprof.com/sysprof-1.2.0.tar.gz";
-    sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "05534dvwrzrmryb4y2m1sb2q0r8i6nr88pzjg7xs5nr9zq8a87p3";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk2 glib pango libglade ];
+  nativeBuildInputs = [ desktop-file-utils gettext itstool libxml2 meson ninja pkgconfig shared-mime-info wrapGAppsHook ];
+  buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ];
 
-  meta = {
-    homepage = http://sysprof.com/;
-    description = "System-wide profiler for Linux";
-    license = stdenv.lib.licenses.gpl2Plus;
+  mesonFlags = [
+    "-Dsystemdunitdir=lib/systemd/system"
+  ];
+
+  postInstall = ''
+    rm $out/share/applications/mimeinfo.cache
+  '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "System-wide profiler for Linux";
+    homepage = https://wiki.gnome.org/Apps/Sysprof;
     longDescription = ''
       Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open
       system call to profile the entire system, not just a single
@@ -26,6 +55,8 @@ stdenv.mkDerivation rec {
       do not need to be recompiled.  In fact they don't even have to
       be restarted.
     '';
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5df97c1ddb..3193a56514f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14084,9 +14084,7 @@ with pkgs;
 
   sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
 
-  sysprof = callPackage ../development/tools/profiling/sysprof {
-    inherit (gnome2) libglade;
-  };
+  sysprof = callPackage ../development/tools/profiling/sysprof { };
 
   # Provided with sysfsutils.
   libsysfs = sysfsutils;
-- 
GitLab


From 65eb3ec842d0a738e1fc64cfb9f7675243f4b1fb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 16 May 2018 08:35:59 -0500
Subject: [PATCH 0812/1085] dyncall: init at 1.0

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

diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
new file mode 100644
index 00000000000..b60f61299f3
--- /dev/null
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "dyncall-${version}";
+  version = "1.0";
+
+  src = fetchurl {
+    url = http://www.dyncall.org/r1.0/dyncall-1.0.tar.gz;
+    # http://www.dyncall.org/r1.0/SHA256
+    sha256 = "d1b6d9753d67dcd4d9ea0708ed4a3018fb5bfc1eca5f37537fba2bc4f90748f2";
+  };
+
+  doCheck = true;
+  checkTarget = "run-tests";
+
+  meta = with stdenv.lib; {
+    description = "Highly dynamic multi-platform foreign function call interface library";
+    homepage = http://dyncall.org;
+    license = licenses.isc;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4c9f146ca0..211ea11d9a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1165,6 +1165,8 @@ with pkgs;
 
   dynamic-colors = callPackage ../tools/misc/dynamic-colors { };
 
+  dyncall = callPackage ../development/libraries/dyncall { };
+
   earlyoom = callPackage ../os-specific/linux/earlyoom { };
 
   EBTKS = callPackage ../development/libraries/science/biology/EBTKS { };
-- 
GitLab


From 978845967858c9edb544484bc97d152bc2ffab44 Mon Sep 17 00:00:00 2001
From: Ryan Scheel <Ryan.havvy@gmail.com>
Date: Wed, 16 May 2018 09:00:32 -0700
Subject: [PATCH 0813/1085] mdbook 0.1.5 -> 0.1.7 (#40580)

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

diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index 4ea36ddbd5e..30f5b6ceaba 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "mdbook-${version}";
-  version = "0.1.5";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "mdBook";
-    rev = "v${version}";
-    sha256 = "0k86zjrqb5wdxvmzz9cxl9c0mpjnr46fh5r5sbs5q9fk2h4lp4ip";
+    rev = "ea0b835b38aba9566c1cc50ad119fbbf2c56f59d";
+    sha256 = "0jkyys8dg5mchbj8b73mmzsgv0k0zp7knima9s69s5ybplmd2n8s";
   };
 
-  cargoSha256 = "0gj1x996lvn9j87dfmng2fn3fgz8rgvrw3akcz641psj4hlfgm5w";
+  cargoSha256 = "0w3slfzm29pkyr6zhr7k9rx9mddh42asyb46bzy57j0a2qvan3k4";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
 
-- 
GitLab


From 70d64d129e9406c943b24f316689eafd400e3280 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 16 May 2018 18:03:55 +0200
Subject: [PATCH 0814/1085] nixos/statsd: refactor test (#40554)

`statsd` is a daemon written in `node` to gather statistics over UDP.
The current test ensures that a port is open, but the basic
functionality isn't sufficiently tested.

This patch contains the following changes:

* Simplified port scanning (`waitForOpenPort` rather than `netcat` magic).

* Issue a TCP command to check the health of the `statsd` server.

* Simple script to check if `statsd` receives data over UDP and confirms
  the basic functionality of the TCP interface on `8126` for admin
  purposes.
---
 nixos/tests/statsd.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix
index c71949249a4..666961249ce 100644
--- a/nixos/tests/statsd.nix
+++ b/nixos/tests/statsd.nix
@@ -8,7 +8,7 @@ with lib;
     maintainers = [ ma27 ];
   };
 
-  nodes.statsd1 = {
+  machine = {
     services.statsd.enable = true;
     services.statsd.backends = [ "statsd-influxdb-backend" "console" ];
     services.statsd.extraConfig = ''
@@ -33,8 +33,19 @@ with lib;
   };
 
   testScript = ''
-    $statsd1->start();
-    $statsd1->waitForUnit("statsd.service");
-    $statsd1->waitUntilSucceeds("nc -z 127.0.0.1 8126");
+    $machine->start();
+    $machine->waitForUnit("statsd.service");
+    $machine->waitForOpenPort(8126);
+
+    # check state of the `statsd` server
+    $machine->succeed('[ "health: up" = "$(echo health | nc 127.0.0.1 8126 -w 120 -N)" ];');
+
+    # confirm basic examples for metrics derived from docs:
+    # https://github.com/etsy/statsd/blob/v0.8.0/README.md#usage and
+    # https://github.com/etsy/statsd/blob/v0.8.0/docs/admin_interface.md
+    $machine->succeed("echo 'foo:1|c' | nc -u -w 0  127.0.0.1 8125");
+    $machine->succeed("echo counters | nc -w 120 127.0.0.1 8126 -N | grep foo");
+    $machine->succeed("echo 'delcounters foo' | nc -w 120 127.0.0.1 8126 -N");
+    $machine->fail("echo counters | nc -w 120 127.0.0.1 8126 -N | grep foo");
   '';
 })
-- 
GitLab


From 4fbd5a6583343b42c7b301cc8b065e8f3d212fee Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 16 May 2018 11:07:43 -0500
Subject: [PATCH 0815/1085] fac: 1.0.4 -> 1.1.0 (#40597)

---
 pkgs/development/tools/fac/default.nix | 17 +++----
 pkgs/development/tools/fac/deps.nix    | 66 ++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/tools/fac/deps.nix

diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix
index c587505600c..0fae9fad5d1 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -1,14 +1,8 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchurl, makeWrapper, git }:
 
-let
-  # TODO: Remove this on next update, should be included
-  fac_1 = fetchurl {
-    url = https://raw.githubusercontent.com/mkchoi212/fac/0a500c2a2dba9017fe7c2a45f15c328755f561a6/doc/fac.1;
-    sha256 = "1fsyx9i20ryhpihdpvs2z7vccl13b9bnh5hcdxn7bvqjz78mbqhw";
-  };
-in buildGoPackage rec {
+buildGoPackage rec {
   name = "fac-${version}";
-  version = "1.0.4";
+  version = "1.1.0";
 
   goPackagePath = "github.com/mkchoi212/fac";
 
@@ -16,16 +10,19 @@ in buildGoPackage rec {
     owner = "mkchoi212";
     repo = "fac";
     rev = "v${version}";
-    sha256 = "0jhx80jbkxfxj95hmdpb9wwwya064xpfkaa218l1lwm3qwfbpk95";
+    sha256 = "054j8yrblf1frcfn3dwrjbgf000i3ngbaz2c172nwbx75g309ihx";
   };
 
+  goDeps = ./deps.nix;
+
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
     wrapProgram $bin/bin/fac \
       --prefix PATH : ${git}/bin
 
-    install -D ${fac_1} $out/share/man/man1/fac.1
+    # Install man page, not installed by default
+    install -D go/src/${goPackagePath}/assets/doc/fac.1 $out/share/man/man1/fac.1
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/fac/deps.nix b/pkgs/development/tools/fac/deps.nix
new file mode 100644
index 00000000000..65ec5ded5ad
--- /dev/null
+++ b/pkgs/development/tools/fac/deps.nix
@@ -0,0 +1,66 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/alecthomas/chroma";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/chroma";
+      rev =  "1b755a90bd109f170385cb3964f0abdfd3451145";
+      sha256 = "1ilmavg291qhb0xq881f5h172zw40aaynqfb0y4yjyq13jnrf8p8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/danwakefield/fnmatch";
+    fetch = {
+      type = "git";
+      url = "https://github.com/danwakefield/fnmatch";
+      rev =  "cbb64ac3d964b81592e64f957ad53df015803288";
+      sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dlclark/regexp2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dlclark/regexp2";
+      rev =  "7632a260cbaf5e7594fc1544a503456ecd0827f1";
+      sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jroimartin/gocui";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jroimartin/gocui";
+      rev =  "c055c87ae801372cd74a0839b972db4f7697ae5f";
+      sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev =  "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mkchoi212/fac";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mkchoi212/fac";
+      rev =  "642a3ad8d8b4b76c7eb201e6f69b3bddb210c502";
+      sha256 = "10rsmnixs3lybnj4xv09b2ya6x0hjjd03y148f78qfppyz2hsvaz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/nsf/termbox-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsf/termbox-go";
+      rev =  "21a4d435a86280a2927985fd6296de56cbce453e";
+      sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7";
+    };
+  }
+]
\ No newline at end of file
-- 
GitLab


From 136f1c470665a9328bb4120f3a4d9af774dadb2d Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 16 May 2018 12:11:36 -0400
Subject: [PATCH 0816/1085] doc: Fixes documented default option for `<name>`
 for submodules. (#40464)

Fixes #40463

This is related to change 1d56d0c8a79334cd7149fd580512046558eaac78
---
 lib/types.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index 77271689772..5aa09d33e9b 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -372,7 +372,13 @@ rec {
             # This is mandatory as some option declaration might use the
             # "name" attribute given as argument of the submodule and use it
             # as the default of option declarations.
-            args.name = "&lt;name&gt;";
+            #
+            # Using lookalike unicode single angle quotation marks because
+            # of the docbook transformation the options receive. In all uses
+            # &gt; and &lt; wouldn't be encoded correctly so the encoded values
+            # would be used, and use of `<` and `>` would break the XML document.
+            # It shouldn't cause an issue since this is cosmetic for the manual.
+            args.name = "‹name›";
           }).options;
         getSubModules = opts';
         substSubModules = m: submodule m;
-- 
GitLab


From 4956767f534c99d44988c623ab1dcddd25124502 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 21 Sep 2017 11:42:09 -0400
Subject: [PATCH 0817/1085] Make libiconv build for iOS with prefixed tools

---
 .../darwin/apple-source-releases/libiconv/default.nix  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index d9b3dfb7404..3cee697366b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -1,14 +1,18 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  preConfigure = "cd libiconv";
+  preConfigure = "cd libiconv"
+    + stdenv.lib.optionalString stdenv.hostPlatform.isiOS ''
+
+      sed -i 's/darwin\*/ios\*/g' configure libcharset/configure
+    '';
 
   postInstall = ''
     mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib
-    install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
+    ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
 
     # re-export one useless symbol; ld will reject a dylib that only reexports other dylibs
-    echo 'void dont_use_this(){}' | clang -dynamiclib -x c - -current_version 2.4.0 \
+    echo 'void dont_use_this(){}' | ${stdenv.cc.bintools.targetPrefix}clang -dynamiclib -x c - -current_version 2.4.0 \
       -compatibility_version 7.0.0 -current_version 7.0.0 -o $out/lib/libiconv.dylib \
       -Wl,-reexport_library -Wl,$out/lib/libiconv-nocharset.dylib \
       -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib
-- 
GitLab


From ceb8f6e38f39a90637c113116aa42e112b62e6be Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 25 Sep 2017 19:30:40 -0400
Subject: [PATCH 0818/1085] ios-rebuild: Unbreak build

Needs to link with a C compiler, not linker directly
---
 pkgs/development/node-packages/default-v6.nix | 1 +
 pkgs/development/node-packages/default-v8.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix
index 2be09eb1632..97f759ef0cb 100644
--- a/pkgs/development/node-packages/default-v6.nix
+++ b/pkgs/development/node-packages/default-v6.nix
@@ -59,6 +59,7 @@ nodePackages // {
 
   ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
     preRebuild = ''
+      LD=$CC
       tmp=$(mktemp -d)
       ln -s /usr/bin/xcodebuild $tmp
       export PATH="$PATH:$tmp"
diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index ed0477a639a..701648da228 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -59,6 +59,7 @@ nodePackages // {
 
   ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
     preRebuild = ''
+      LD=$CC
       tmp=$(mktemp -d)
       ln -s /usr/bin/xcodebuild $tmp
       export PATH="$PATH:$tmp"
-- 
GitLab


From 4f25cf5124d90fbf5aafb168b124104eda5068f3 Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan.trinkle@gmail.com>
Date: Tue, 1 May 2018 21:43:04 -0400
Subject: [PATCH 0819/1085] ncurses: when cross-compiling for iOS, use built-in
 ncurses

---
 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 f6d3a7a5b93..51a28dc215c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10790,7 +10790,7 @@ with pkgs;
   ncurses6 = callPackage ../development/libraries/ncurses {
     abiVersion = "6";
   };
-  ncurses = ncurses6;
+  ncurses = if hostPlatform.useiOSPrebuilt then null else ncurses6;
 
   neardal = callPackage ../development/libraries/neardal { };
 
-- 
GitLab


From 7a16fd61119cccd5a8cbbe425eca50d6c9add6b5 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Wed, 16 May 2018 20:42:09 +0200
Subject: [PATCH 0820/1085] slimserver: 7.9.0 -> 7.9.1

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

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 18dbed4d1f3..0995ae041bb 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -3,11 +3,11 @@
 
 buildPerlPackage rec {
   name = "slimserver-${version}";
-  version = "7.9.0";
+  version = "7.9.1";
 
   src = fetchurl {
     url = "https://github.com/Logitech/slimserver/archive/${version}.tar.gz";
-    sha256 = "07rhqipg7m28x0nqdd83nyzi88dp9cf8rr2pamdyrfcwyp1h1b44";
+    sha256 = "0szp5zkmx2b5lncsijf97asjnl73fyijkbgbwkl1i7p8qnqrb4mp";
   };
 
   buildInputs = [
-- 
GitLab


From c1efa89126bef82206d4b8123b5373d1f48a5497 Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Mon, 14 May 2018 19:18:19 +0200
Subject: [PATCH 0821/1085] gomuks: init at 2018-05-16

---
 .../instant-messengers/gomuks/default.nix     | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/gomuks/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
new file mode 100644
index 00000000000..5246f8d3d1d
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGo110Package, fetchFromGitHub }:
+
+buildGo110Package rec {
+  name = "gomuks-${version}";
+  version = "2018-05-16";
+
+  goPackagePath = "maunium.net/go/gomuks";
+
+  src = fetchFromGitHub {
+    owner = "tulir";
+    repo = "gomuks";
+    rev = "512ca88804268bf58a754e8a02be556f953db317";
+    sha256 = "1bpgjkpvqqks3ljw9s0hm5pgscjs4rjy8rfpl2444m4rbpz1xvmr";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://maunium.net/go/gomuks/;
+    description = "A terminal based Matrix client written in Go";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ tilpner ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76203b76027..658a466815d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15773,6 +15773,8 @@ with pkgs;
 
   goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
 
+  gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };
+
   inherit (ocamlPackages) google-drive-ocamlfuse;
 
   google-musicmanager = callPackage ../applications/audio/google-musicmanager { };
-- 
GitLab


From e76711fe9d685553318939cfb25c3c23ea374eb6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 16 May 2018 10:09:19 -0700
Subject: [PATCH 0822/1085] mattermost: 4.8.0 -> 4.10.0

---
 pkgs/servers/mattermost/default.nix | 94 ++++++++++++++++-------------
 1 file changed, 53 insertions(+), 41 deletions(-)

diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 936e457eb33..9943c0b9ab0 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,49 +1,61 @@
-{ stdenv, fetchurl, fetchFromGitHub, buildGoPackage }:
+{ stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
 
 let
-  version = "4.8.0";
-  goPackagePath = "github.com/mattermost/mattermost-server";
-  buildFlags = "-ldflags \"-X '${goPackagePath}/model.BuildNumber=nixpkgs-${version}'\"";
-in
+  version = "4.10.0";
 
-buildGoPackage rec {
-  name = "mattermost-${version}";
+  mattermost-server = buildGoPackage rec {
+    name = "mattermost-server-${version}";
 
-  src = fetchFromGitHub {
-    owner = "mattermost";
-    repo = "mattermost-server";
-    rev = "v${version}";
-    sha256 = "16yf4p0n3klgh0zw2ikbahj9cy1wcxbwg86pld0yz63cfvfz5ns4";
-  };
+    src = fetchFromGitHub {
+      owner = "mattermost";
+      repo = "mattermost-server";
+      rev = "v${version}";
+      sha256 = "02isw8qapp35pgriy4w1ar1ppvgc5a10j550hjbc1mylnhzkg1jf";
+    };
+
+    goPackagePath = "github.com/mattermost/mattermost-server";
+
+    buildFlagsArray = ''
+      -ldflags=
+        -X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}
+    '';
+
+    postInstall = ''
+      ln -s $bin/bin/mattermost-server $bin/bin/platform
+      ln -s $bin/bin/mattermost-server $bin/bin/mattermost-platform
+    '';
 
-  webApp = fetchurl {
-    url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz";
-    sha256 = "0ykp9apsv2514bircgay0xi0jigiai65cnb8q77v1qxjzdyx8s75";
   };
 
-  inherit goPackagePath;
-
-  buildPhase = ''
-    runHook preBuild
-    cd go/src/${goPackagePath}/cmd/platform
-    go install ${buildFlags}
-    runHook postBuild
-  '';
-
-  preInstall = ''
-    mkdir -p $bin
-    tar --strip 1 -C $bin -xf $webApp
-  '';
-
-  postInstall = ''
-    ln -s $bin/bin/platform $bin/bin/mattermost-platform
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Open-source, self-hosted Slack-alternative";
-    homepage = https://www.mattermost.org;
-    license = with licenses; [ agpl3 asl20 ];
-    maintainers = with maintainers; [ fpletz ryantm ];
-    platforms = platforms.unix;
+  mattermost-webapp = stdenv.mkDerivation {
+    name = "mattermost-webapp-${version}";
+
+    src = fetchurl {
+      url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
+      sha256 = "0pfj2dxl4qrv4w6yj0385nw0fa4flcg95kkahs0arwhan5bgifl5";
+    };
+
+    installPhase = ''
+      mkdir -p $out
+      tar --strip 1 --directory $out -xf $src \
+        mattermost/client \
+        mattermost/i18n \
+        mattermost/fonts \
+        mattermost/templates \
+        mattermost/config
+    '';
   };
-}
+
+in
+  buildEnv {
+    name = "mattermost-${version}";
+    paths = [ mattermost-server mattermost-webapp ];
+
+    meta = with stdenv.lib; {
+      description = "Open-source, self-hosted Slack-alternative";
+      homepage = https://www.mattermost.org;
+      license = with licenses; [ agpl3 asl20 ];
+      maintainers = with maintainers; [ fpletz ryantm ];
+      platforms = platforms.unix;
+    };
+  }
-- 
GitLab


From 00c4ba1ea0111f50e188cce7ddc3f5fc8dc58be3 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 16 May 2018 21:10:34 +0200
Subject: [PATCH 0823/1085] pacvim: init at 2018-05-16

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

diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix
new file mode 100644
index 00000000000..59e7c874d14
--- /dev/null
+++ b/pkgs/games/pacvim/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "pacvim-${version}";
+  version = "2018-05-16";
+  src = fetchFromGitHub {
+    owner = "jmoon018";
+    repo = "PacVim";
+    rev = "ca7c8833c22c5fe97974ba5247ef1fcc00cedb8e";
+    sha256 = "1kq6j7xmsl5qfl1246lyglkb2rs9mnb2rhsdrp18965dpbj2mhx2";
+  };
+
+  buildInputs = [ ncurses ];
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/jmoon018/PacVim";
+    description = "PacVim is a game that teaches you vim commands.";
+    maintainers = with maintainers; [ infinisil ];
+    license = licenses.lgpl3;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1129a984d27..0f8db2101a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19340,6 +19340,8 @@ with pkgs;
 
   orthorobot = callPackage ../games/orthorobot { love = love_0_7; };
 
+  pacvim = callPackage ../games/pacvim { };
+
   performous = callPackage ../games/performous { };
 
   pingus = callPackage ../games/pingus {};
-- 
GitLab


From c8996506e136cc8cbe4131d2514b801ddca1a3b1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 16 May 2018 14:06:07 -0500
Subject: [PATCH 0824/1085] dyncall: install cmake modules, man pages, use
 upstream's preferred URL

---
 .../development/libraries/dyncall/default.nix | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
index b60f61299f3..704f5c51c9c 100644
--- a/pkgs/development/libraries/dyncall/default.nix
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -10,12 +10,26 @@ stdenv.mkDerivation rec {
     sha256 = "d1b6d9753d67dcd4d9ea0708ed4a3018fb5bfc1eca5f37537fba2bc4f90748f2";
   };
 
-  doCheck = true;
-  checkTarget = "run-tests";
+  # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :)
+  doCheck = false;
+
+  # install bits not automatically installed
+  postInstall = ''
+    # install cmake modules to make using dyncall easier
+    # This is essentially what -DINSTALL_CMAKE_MODULES=ON if using cmake build
+    # We don't use the cmake-based build since it installs different set of headers
+    # (mostly fewer headers, but installs dyncall_alloc_wx.h "instead" dyncall_alloc.h)
+    # and we'd have to patch the cmake module installation to not use CMAKE_ROOT anyway :).
+    install -D -t $out/lib/cmake ./buildsys/cmake/Modules/Find*.cmake
+
+    # manpages are nice, install them
+    # doing this is in the project's "ToDo", so check this when updating!
+    install -D -t $out/share/man/man3 ./*/*.3
+  '';
 
   meta = with stdenv.lib; {
     description = "Highly dynamic multi-platform foreign function call interface library";
-    homepage = http://dyncall.org;
+    homepage = http://www.dyncall.org;
     license = licenses.isc;
     maintainers = with maintainers; [ dtzWill ];
   };
-- 
GitLab


From 3518211d63eb9040483652c8ceed22b420f2d0b1 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 16 May 2018 23:10:58 +0200
Subject: [PATCH 0825/1085] minio: 2018-03-30T00-38-44Z -> 2018-05-11T00-29-24Z

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 786a188bbfd..7f590461d9d 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   name = "minio-${version}";
 
-  version = "2018-03-30T00-38-44Z";
+  version = "2018-05-11T00-29-24Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "17vam9ifi632yfxakanxi2660wqgqrhrhhzywrgh2jmzljippf80";
+    sha256 = "01jw1djfs0jbhsx9pmx3kj31mfhrw45lr1i4lwkmh8k7fxn8w13x";
   };
 
   goPackagePath = "github.com/minio/minio";
-- 
GitLab


From 277806e0d143abcfc18cd3a9543dd43cdd3d0e2b Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 16 May 2018 23:11:26 +0200
Subject: [PATCH 0826/1085] minio-client: 2018-03-25T01-22-22Z ->
 2018-04-28T00-08-20Z

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

diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index bfe7dfc2dc0..c1b2b18b3f4 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   name = "minio-client-${version}";
 
-  version = "2018-03-25T01-22-22Z";
+  version = "2018-04-28T00-08-20Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "1x71va37jaqsi99d0i0mccybrs9kjgmpfsm0dchmc58mmhyagh3k";
+    sha256 = "03c9ahphkpsy6z9i9z50jcsgj5ba6gba2sw2nz22b1ynqiz3ds37";
   };
 
   goPackagePath = "github.com/minio/mc";
-- 
GitLab


From 247a501eb06ef466e366f43fabb0627ece90a640 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Thu, 17 May 2018 00:43:59 +0300
Subject: [PATCH 0827/1085] avocode: 2.26.0 -> 2.26.1 (#40601)

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

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 7bcbc8f2e40..c1e2da20e54 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "avocode-${version}";
-  version = "2.26.0";
+  version = "2.26.1";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "11d3nlshyzh5aqf5vsvnjwhr9qn8a2kd848x0ylv91y9p9njgsl5";
+    sha256 = "0npwwz5m4klswc32fs82icpqqfx9v4786sksiwykj75dsznyv3x8";
   };
 
   libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
@@ -81,9 +81,9 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode
     for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode
-        patchelf --set-rpath ${libPath}:$out/ $file
+      patchelf --set-rpath ${libPath}:$out/ $file
     done
   '';
 
-- 
GitLab


From 13ceaf66aaba8412eecd6e0e8c54ab1712729d24 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Thu, 17 May 2018 00:05:53 +0200
Subject: [PATCH 0828/1085] prometheus: correctly set version information
 (#40617)

The way prometheus expects the version to be set is not what was currently set.
---
 pkgs/servers/monitoring/prometheus/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 3287bc6f258..b71d9b8e58b 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -19,7 +19,7 @@ let
 
         doCheck = true;
 
-        buildFlagsArray = let t = "${goPackagePath}/version"; in ''
+        buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
           -ldflags=
              -X ${t}.Version=${version}
              -X ${t}.Revision=unknown
-- 
GitLab


From e3b3eac630b686dac89895eab6a4d9245362d5f4 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 17 May 2018 00:13:19 +0200
Subject: [PATCH 0829/1085] dunst: add wrapper to find librsvg (#40050)

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

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 75640b2c54e..1a809307cc1 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, makeWrapper
 , pkgconfig, which, perl, libXrandr
 , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
 , libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "1kqlshaflp306yrjjmc28pghi1y5p24vdx4bxf8i4n9khdawb514";
   };
 
-  nativeBuildInputs = [ perl pkgconfig which systemd ];
+  nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ];
 
   buildInputs = [
     cairo dbus gdk_pixbuf glib libX11 libXScrnSaver
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
     "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/dunst \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+  '';
+
   meta = with stdenv.lib; {
     description = "Lightweight and customizable notification daemon";
     homepage = https://dunst-project.org/;
-- 
GitLab


From 570b1e52c68cf7e3e70dd653c38648af1eeb353d Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 17 May 2018 02:04:42 +0300
Subject: [PATCH 0830/1085] top-level: build winePackages on Hydra

---
 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 eb7059212f4..76ef39d5c6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21209,7 +21209,7 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  winePackages = rec {
+  winePackages = recurseIntoAttrs rec {
     minimal = callPackage ../misc/emulators/wine {
       wineRelease = config.wine.release or "stable";
       wineBuild = config.wine.build or "wine32";
-- 
GitLab


From 1b2b126f82b5b8796ac90a22939cbe1449647a1b Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 17 May 2018 02:29:26 +0300
Subject: [PATCH 0831/1085] winePackages: move to
 pkgs/top-level/wine-packages.nix

---
 pkgs/top-level/all-packages.nix  | 49 +------------------------------
 pkgs/top-level/wine-packages.nix | 50 ++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/top-level/wine-packages.nix

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76ef39d5c6e..e7b3c1d3908 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21209,54 +21209,7 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  winePackages = recurseIntoAttrs 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;
-      vulkanSupport = stdenv.isLinux;
-      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"; };
-  };
+  winePackages = recurseIntoAttrs (callPackage ./wine-packages.nix { });
 
   wine = winePackages.full;
 
diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix
new file mode 100644
index 00000000000..109f0136255
--- /dev/null
+++ b/pkgs/top-level/wine-packages.nix
@@ -0,0 +1,50 @@
+{ stdenv, config, callPackage }:
+
+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;
+    vulkanSupport = stdenv.isLinux;
+    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"; };
+}
-- 
GitLab


From b577dc3bd0d989408a6d71b74b5792722c92b6da Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 21:56:19 -0400
Subject: [PATCH 0832/1085] linux-copperhead: 4.14.39.a -> 4.14.41.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
index a1c93e56590..8054ba0be6a 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.14.39";
+  version = "4.14.41";
   revision = "a";
-  sha256 = "19nx537a8kbbyp5d67anrqfw8i8hliw3yb1gyrf70isl3fqifjaa";
+  sha256 = "16jwv1drs6xlwghzn8ps7v8x5xja61b5y6747c86g17idfaac1k3";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
-- 
GitLab


From 1006c8c8d29cc70f9ed0c168449a92e3dc5fe69b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 21:56:50 -0400
Subject: [PATCH 0833/1085] linux-copperhead: 4.16.7.a -> 4.16.9.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
index 9d4b729060a..5c65f2064b4 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.16.7";
+  version = "4.16.9";
   revision = "a";
-  sha256 = "1kdy3sqrn161hm5avhk3nd75p07a21ja0rzar3ybibh1bl2mc6zq";
+  sha256 = "1g1924whb79cflh4wcqpyq9d7nfxdsvsjh2mv5ps85fsg2109kpl";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
-- 
GitLab


From c65686c7f9aa3a8540ae21215d9ee130e3c3b5df Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 22:13:43 -0400
Subject: [PATCH 0834/1085] kafka: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 152e6045574..10e9489833e 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -19,9 +19,9 @@ let
       sha256 = "1wj639h95aq5n132fq1rbyzqh5rsa4mlhbg3c5mszqglnzdz4xn7";
     };
     "1.0" = {
-      kafkaVersion = "1.0.0";
+      kafkaVersion = "1.0.1";
       scalaVersion = "2.12";
-      sha256 = "1cs4nmp39m99gqjpy5klsffqksc0h9pz514jkq99qb95a83x1cfm";
+      sha256 = "1fxn6i0kanwksj1dhcnlni0cn542k50wdg8jkwhfmf4qq8yfl90m";
     };
   };
 in
-- 
GitLab


From fe2deeb4584e7da1d7018d74ec659fa6a0357e45 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 22:26:40 -0400
Subject: [PATCH 0835/1085] kafka: Add 1.1

---
 nixos/tests/kafka.nix                 | 1 +
 pkgs/servers/apache-kafka/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix       | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index 6209b4b8e2b..e48b25d67df 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -65,4 +65,5 @@ in with pkgs; {
   kafka_0_10 = makeKafkaTest "kafka_0_10" apacheKafka_0_10;
   kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11;
   kafka_1_0  = makeKafkaTest "kafka_1_0"  apacheKafka_1_0;
+  kafka_1_1  = makeKafkaTest "kafka_1_1"  apacheKafka_1_1;
 }
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 10e9489833e..fe67bdd0282 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -23,6 +23,11 @@ let
       scalaVersion = "2.12";
       sha256 = "1fxn6i0kanwksj1dhcnlni0cn542k50wdg8jkwhfmf4qq8yfl90m";
     };
+    "1.1" = {
+      kafkaVersion = "1.1.0";
+      scalaVersion = "2.12";
+      sha256 = "04idhsr6pbkb0xkx38faxv2pn5nkjcflz6wl4s3ka82h1fbq74j9";
+    };
   };
 in
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb7059212f4..681f490bf01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7564,11 +7564,12 @@ with pkgs;
 
   apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
 
-  apacheKafka = apacheKafka_1_0;
+  apacheKafka = apacheKafka_1_1;
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
   apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
   apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
   apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; };
+  apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; };
 
   kt = callPackage ../tools/misc/kt {};
 
-- 
GitLab


From b8966f5d87d0cd3623bd67a050c6e16c16fe1964 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 16 May 2018 22:45:17 -0700
Subject: [PATCH 0836/1085] xpra: 2.2.6 -> 2.3

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

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

These checks were done:

- built on NixOS
- /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra passed the binary check.
- Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_Xdummy had a zero exit code or showed the expected version
- /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_udev_product_version passed the binary check.
- Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/.xpra_browser-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_browser had a zero exit code or showed the expected version
- /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/.xpra_launcher-wrapped passed the binary check.
- /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_launcher passed the binary check.
- Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/.xpra_signal_listener-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_signal_listener had a zero exit code or showed the expected version
- /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/..xpra-wrapped-wrapped passed the binary check.
- /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/.xpra-wrapped passed the binary check.
- 6 of 11 passed binary check by having a zero exit code.
- 0 of 11 passed binary check by having the new version present in output.
- found 2.3 with grep in /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3
- directory tree listing: https://gist.github.com/9e03a45b8255a45b7df6fbcf24b6f408
- du listing: https://gist.github.com/a48b995e2d458e3b9da00ae42675dbe6
---
 pkgs/tools/X11/xpra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 9bc13b3260d..f8174a03cac 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -12,11 +12,11 @@ let
   inherit (python2Packages) python cython buildPythonApplication;
 in buildPythonApplication rec {
   name = "xpra-${version}";
-  version = "2.2.6";
+  version = "2.3";
 
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "1zyynghhzjbgnmzcibm17wpj9f7jy31d7dr373li8cwg2yl2swyz";
+    sha256 = "0kq0ambpy8r7m3wxdp79cgxgnl9yfmr19lv88f617gnv0sp0aarp";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From deb8d43e297f14512f3f032cf1de4337c7ebc1b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 16 May 2018 22:46:12 -0700
Subject: [PATCH 0837/1085] you-get: 0.4.1060 -> 0.4.1077

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

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

These checks were done:

- built on NixOS
- /nix/store/r1x8qsdcsnh28msjaxqwa4j07ri7s66p-you-get-0.4.1077/bin/.you-get-wrapped passed the binary check.
- /nix/store/r1x8qsdcsnh28msjaxqwa4j07ri7s66p-you-get-0.4.1077/bin/you-get passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.4.1077 with grep in /nix/store/r1x8qsdcsnh28msjaxqwa4j07ri7s66p-you-get-0.4.1077
- directory tree listing: https://gist.github.com/7dc27079ec72816d18224787520a534c
- du listing: https://gist.github.com/ebb4a641370380db9496be5dadc3d499
---
 pkgs/tools/misc/you-get/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index f0a8eda0028..bfce454473a 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "you-get";
-  version = "0.4.1060";
+  version = "0.4.1077";
 
   # Tests aren't packaged, but they all hit the real network so
   # probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1c4drn6khqrjvyzzsiaracnpcvahbiya6v5p18h2lyl7xia8gk51";
+    sha256 = "1qf4n1zgbr533a0qbxp8548f25jwqdwfl42gi5dyfhm4f1y1jk1a";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From dd51a4a19e823b9828d93e8fdcb4a48648f0508e Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Fri, 11 May 2018 17:32:18 +0100
Subject: [PATCH 0838/1085] add psyanticy as maintainer

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6b9d2a16c53..c49561da51b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3021,6 +3021,11 @@
     email = "philipp@xndr.de";
     name = "Philipp Steinpaß";
   };
+  psyanticy = {
+    email = "iuns@outlook.fr";
+    github = "Assassinkin";
+    name = "Psyanticy";
+  };
   puffnfresh = {
     email = "brian@brianmckenna.org";
     github = "puffnfresh";
-- 
GitLab


From 1ec3c94a21de18c28839ea3b25d8b8aaef0deb41 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 16 May 2018 23:31:23 -0700
Subject: [PATCH 0839/1085] python36Packages.uranium: 3.2.1 -> 3.3.0

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 3.3.0 with grep in /nix/store/s5bmfykrkc953i0qhfkmwj6fj1yv3i56-uranium-3.3.0
- directory tree listing: https://gist.github.com/0c76704986608d25a9223af819e0a259
- du listing: https://gist.github.com/242655ce87890bfe9b511e44306303de
---
 pkgs/development/python-modules/uranium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index 774799f3b4d..0917c5ab6ee 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -5,7 +5,7 @@ then throw "Uranium not supported for interpreter ${python.executable}"
 else
 
 stdenv.mkDerivation rec {
-  version = "3.2.1";
+  version = "3.3.0";
   pname = "uranium";
   name = "${pname}-${version}";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "Ultimaker";
     repo = "Uranium";
     rev = version;
-    sha256 = "1p05iw1x3rvb51p6hj57yq6nsjawjba3pyyr4jx924iq96vcc3fz";
+    sha256 = "1rg0l2blndnbdfcgkjc2r29cnjdm009rz8lnc225ilh9d7w1srbb";
   };
 
   buildInputs = [ python gettext ];
-- 
GitLab


From 8ea265279e65fb83149691e5cdeec70f1e81c706 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Thu, 17 May 2018 15:22:31 +0800
Subject: [PATCH 0840/1085] Allow YAML on other platforms as well.

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

diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index e441d1e6b61..20053190e3b 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     homepage = http://pyyaml.org/;
     description = "A YAML 1.1 parser and emitter written in C";
     license = licenses.mit;
-    platforms = platforms.unix;
+    platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
   };
 }
-- 
GitLab


From 2329df494cf000cf9328b23fea138841a2de1832 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 01:18:07 -0700
Subject: [PATCH 0841/1085] spidermonkey_52: 52.7.4 -> 52.8.0

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

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

These checks were done:

- built on NixOS
- /nix/store/dd4kmbg04pklv4gs9y8cky5bv69id31v-spidermonkey-52.8.0/bin/js52 passed the binary check.
- /nix/store/dd4kmbg04pklv4gs9y8cky5bv69id31v-spidermonkey-52.8.0/bin/js52-config passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 2 of 2 passed binary check by having the new version present in output.
- found 52.8.0 with grep in /nix/store/dd4kmbg04pklv4gs9y8cky5bv69id31v-spidermonkey-52.8.0
- directory tree listing: https://gist.github.com/1ec4dfe6196b463eb8174ab1aa82023d
- du listing: https://gist.github.com/a7355483d743c1a8d6fb1271ee57a5c0
---
 pkgs/development/interpreters/spidermonkey/52.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index 35dcff95029..4657a51e48f 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
 
 let
-  version = "52.7.4";
+  version = "52.8.0";
 in stdenv.mkDerivation rec {
   name = "spidermonkey-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
-    sha256 = "0dn3hbc95qhvcgzbibhy17xwn5m0340f64bq5byvx22c2rf40xwz";
+    sha256 = "11v2wwgrb92z08dv9cvk5x2dj3xj25qxzbjqjgiq6mz91bzd9gms";
   };
 
   buildInputs = [ readline icu zlib nspr ];
-- 
GitLab


From d38852ce2a0e71813956e30d9789df3dc698dc8c Mon Sep 17 00:00:00 2001
From: Andrea Bedini <andrea@andreabedini.com>
Date: Mon, 14 May 2018 20:15:08 +0800
Subject: [PATCH 0842/1085] pythonPackages.docker_pycreds: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix
index 9cc510bf9af..dd20400ea4f 100644
--- a/pkgs/development/python-modules/docker-pycreds/default.nix
+++ b/pkgs/development/python-modules/docker-pycreds/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "docker-pycreds";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299";
+    sha256 = "e3732a03610a00461a716997670c7010bf1c214a3edc440f7d6a2a3a830ecd9d";
   };
 
   # require docker-credential-helpers binaries
-- 
GitLab


From fd95438c6123a36ad21f500cecfa84ba5e26cab0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 16 May 2018 22:36:53 -0700
Subject: [PATCH 0843/1085] xqilla: 2.3.3 -> 2.3.4

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

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

These checks were done:

- built on NixOS
- /nix/store/q0djr7z4ixv0mx02crj7ifqapgm54crr-xqilla-2.3.4/bin/xqilla passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.3.4 with grep in /nix/store/q0djr7z4ixv0mx02crj7ifqapgm54crr-xqilla-2.3.4
- directory tree listing: https://gist.github.com/70c99ca62187f093025b5404d2a4a6da
- du listing: https://gist.github.com/38a73f127b9835b2a8c187242de78a1d
---
 pkgs/development/tools/xqilla/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix
index 77bf313e83d..c163c4cbcf6 100644
--- a/pkgs/development/tools/xqilla/default.nix
+++ b/pkgs/development/tools/xqilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "xqilla-${version}";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchurl {
     url    = "mirror://sourceforge/xqilla/XQilla-${version}.tar.gz";
-    sha256 = "1mjgcyar3qyizpnb0h9lxaj6p9yq4vj09qd8qan1bwv6z6sbjxlg";
+    sha256 = "0m9z7diw7pdyb4qycbqyr2x55s13v8310xsi7yz0inpw27q4vzdd";
   };
 
   configureFlags = [ "--with-xerces=${xercesc}" ];
-- 
GitLab


From 2f6c9947fe5d5ac1d1832337267eb735a7832161 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 17 May 2018 05:26:48 -0400
Subject: [PATCH 0844/1085] Add pkgconfig to ghcjs boot

---
 pkgs/development/compilers/ghcjs-ng/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 71bab1a4e66..03bdf022ecd 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -13,6 +13,7 @@
 , makeWrapper
 , xorg
 , gmp
+, pkgconfig
 , lib
 , ghcjsDepOverrides ? (_:_:{})
 }:
@@ -60,6 +61,7 @@ in stdenv.mkDerivation {
       makeWrapper
       xorg.lndir
       gmp
+      pkgconfig
     ];
     phases = ["unpackPhase" "buildPhase"];
     buildPhase = ''
-- 
GitLab


From 9c6e63ffdac0579b118e3bef5b436fbefb0e0978 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 17 May 2018 05:27:03 -0400
Subject: [PATCH 0845/1085] Expose bootGhcjs for convenience's sake

---
 pkgs/development/compilers/ghcjs-ng/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 03bdf022ecd..a5d0c46e78e 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -36,6 +36,7 @@ let
     ]);
 
     targetPrefix = "";
+    inherit bootGhcjs;
     inherit (bootGhcjs) version;
     isGhcjs = true;
 
-- 
GitLab


From 7b405d35648ac198c1329063d6e3bc820356482c Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 17 May 2018 05:27:19 -0400
Subject: [PATCH 0846/1085] Remove -dcore-lint from GHCJS wrapper

---
 pkgs/development/compilers/ghcjs-ng/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index a5d0c46e78e..785f5b878f7 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -73,7 +73,7 @@ in stdenv.mkDerivation {
       mkdir -p $out/libexec
       lndir ${libexec} $out/bin
 
-      wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec -dcore-lint"
+      wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec"
       wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec"
       wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d"
 
-- 
GitLab


From 4eb49533cbbab3994b0819de966501d994e8b688 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 17 May 2018 05:27:38 -0400
Subject: [PATCH 0847/1085] Work around GHCJS bug with ghcjs-boot -j1

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

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 785f5b878f7..035687a64f3 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -77,10 +77,12 @@ in stdenv.mkDerivation {
       wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec"
       wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d"
 
-      env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j $NIX_BUILD_CORES --with-ghcjs-bin $out/bin
+      env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j1 --with-ghcjs-bin $out/bin
     '';
 
-    enableParallelBuilding = true;
+    # We hard code -j1 as a temporary workaround for
+    # https://github.com/ghcjs/ghcjs/issues/654
+    # enableParallelBuilding = true;
 
     inherit passthru;
 
-- 
GitLab


From 2dd3789d47da95988cea74ff213a7e990c9e3a79 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 17 May 2018 05:35:00 -0400
Subject: [PATCH 0848/1085] Bump GHCJS 8.4

---
 pkgs/development/compilers/ghcjs-ng/8.4/git.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
index 49ff19529c6..b27c75bfe71 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.4/git.json
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
@@ -1,6 +1,6 @@
 {
   "url": "https://github.com/ghcjs/ghcjs",
-  "rev": "6770fa38621f55b7a947fc11c69f81b8ce8502cf",
-  "sha256": "0c0x0yylx14mrvzmbvkw6zbprriizk73hvz8iija8i8hwpff79vm",
+  "rev": "d20da90a4819faad1c6309a06363b34edac0374c",
+  "sha256": "0jmxgfm1zwg6xscjcaycfam7zss8ik4ql4ii5lpryh4h6cdhvkbr",
   "fetchSubmodules": true
 }
-- 
GitLab


From 3bec610cf33d6f754ea362cd982e66a788784f8f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 02:53:14 -0700
Subject: [PATCH 0849/1085] opensc: 0.17.0 -> 0.18.0

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

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

These checks were done:

- built on NixOS
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/opensc-tool passed the binary check.
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/opensc-explorer had a zero exit code or showed the expected version
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/opensc-notify passed the binary check.
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/pkcs15-tool had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/pkcs15-crypt had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/pkcs11-tool had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/cardos-tool had a zero exit code or showed the expected version
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/eidenv passed the binary check.
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/openpgp-tool passed the binary check.
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/iasecc-tool had a zero exit code or showed the expected version
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/egk-tool passed the binary check.
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/opensc-asn1 passed the binary check.
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/cryptoflex-tool had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/pkcs15-init had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/netkey-tool had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/piv-tool had a zero exit code or showed the expected version
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/westcos-tool passed the binary check.
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/sc-hsm-tool passed the binary check.
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/dnie-tool had a zero exit code or showed the expected version
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/gids-tool passed the binary check.
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/npa-tool had a zero exit code or showed the expected version
- 9 of 21 passed binary check by having a zero exit code.
- 3 of 21 passed binary check by having the new version present in output.
- found 0.18.0 with grep in /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0
- directory tree listing: https://gist.github.com/1276953ac55af68ec597ce6744192684
- du listing: https://gist.github.com/b02c245b9a13433013450fc258e41a01
---
 pkgs/tools/security/opensc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index e727180fa3f..819c01a0893 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "opensc-${version}";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "OpenSC";
     rev = version;
-    sha256 = "1mgcf698zhpqzamd52547scdws7mhdva377kc3chpr455n0mw8g0";
+    sha256 = "1shwx1rkmnygk2dp0q8pbvnxcg96bn570vch9yq34gs42ryskihf";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From fb7340d3e546c1272c69a6408d205dedce89e05b Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Fri, 11 May 2018 15:14:15 +0100
Subject: [PATCH 0850/1085] pythonPackages.mail-parser: init at 3.3.1

---
 .../python-modules/mail-parser/default.nix    | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/mail-parser/default.nix

diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix
new file mode 100644
index 00000000000..e05dc3f2861
--- /dev/null
+++ b/pkgs/development/python-modules/mail-parser/default.nix
@@ -0,0 +1,41 @@
+{ lib, buildPythonPackage, python, pythonOlder, glibcLocales, fetchFromGitHub, ipaddress, six, simplejson }:
+
+buildPythonPackage rec {
+  pname = "mail-parser";
+  version = "3.3.1";
+
+  # no tests in PyPI tarball
+  src = fetchFromGitHub {
+    owner = "SpamScope";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1b1v61zwgdx2xjzds3hp6bv53yq424hhlrhf445n4faj1l0c4lkg";
+  };
+
+  LC_ALL = "en_US.utf-8";
+
+  # ipaddress is part of the standard library of Python 3.3+
+  prePatch = lib.optionalString (!pythonOlder "3.3") ''
+    substituteInPlace requirements.txt \
+      --replace "ipaddress" ""
+  '';
+
+  nativeBuildInputs = [ glibcLocales ];
+  propagatedBuildInputs = [ simplejson six ] ++ lib.optional (pythonOlder "3.3") ipaddress;
+
+  # Taken from .travis.yml
+  checkPhase = ''
+    ${python.interpreter} tests/test_main.py
+    ${python.interpreter} -m mailparser -v
+    ${python.interpreter} -m mailparser -h
+    ${python.interpreter} -m mailparser -f tests/mails/mail_malformed_3 -j
+    cat tests/mails/mail_malformed_3 | ${python.interpreter} -m mailparser -k -j
+  '';
+
+  meta = with lib; {
+    description = "A mail parser for python 2 and 3";
+    homepage = https://github.com/SpamScope/mail-parser;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7868f7d7ff0..61c0eac4c6d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -277,6 +277,8 @@ in {
 
   logster = callPackage ../development/python-modules/logster { };
 
+  mail-parser = callPackage ../development/python-modules/mail-parser {  };
+
   mpi4py = callPackage ../development/python-modules/mpi4py {
     mpi = pkgs.openmpi;
   };
-- 
GitLab


From de49ba6c3f17574104d11c817ca3a60649a57cfb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 03:57:50 -0700
Subject: [PATCH 0851/1085] nauty: 26r7 -> 26r10

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

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

These checks were done:

- built on NixOS
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/dreadnaut passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/copyg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/listg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/labelg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/dretog passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/amtog passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/geng passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/complg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/showg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/NRswitchg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/biplabg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/addedgeg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/deledgeg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/countg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/pickg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genrang passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/newedgeg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/catg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genbg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/directg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/gentreeg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genquarticg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/ranlabg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/multig passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/planarg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/gentourng passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/linegraphg passed the binary check.
- Warning: no invocation of /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/watercluster2 had a zero exit code or showed the expected version
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/dretodot passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/subdivideg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/vcolg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/delptg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/cubhamg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/twohamg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/hamheuristic passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/converseg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genspecialg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genbgL passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/shortg passed the binary check.
- Warning: no invocation of /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/configure had a zero exit code or showed the expected version
- 38 of 40 passed binary check by having a zero exit code.
- 0 of 40 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/3bca602211d416ba58097f4f8880b6d0
- du listing: https://gist.github.com/4ac19efe14e18aae8fece0ec1a500bf1
---
 pkgs/applications/science/math/nauty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index 36ac84ece25..d7b4707420b 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   name = "nauty-${version}";
-  version = "26r7";
+  version = "26r10";
   src = fetchurl {
     url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
-    sha256 = "1indcc1im7s5x89x0xn4699izw1wwars1aanpmf8jibnw66n9dcp";
+    sha256 = "16pdklh066z6mx424wkisr88fz9divn2caj7ggs03wy3y848spq6";
   };
   buildInputs = [];
   installPhase = ''
-- 
GitLab


From ffd3f884bddc31fc0ee38d665672d8aaeeca5e16 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 04:04:45 -0700
Subject: [PATCH 0852/1085] nsd: 4.1.20 -> 4.1.21

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

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

These checks were done:

- built on NixOS
- /nix/store/vwidqdayh0l8rf5sjq37hr6ygdxrmkbb-nsd-4.1.21/bin/nsd passed the binary check.
- Warning: no invocation of /nix/store/vwidqdayh0l8rf5sjq37hr6ygdxrmkbb-nsd-4.1.21/bin/nsd-checkconf had a zero exit code or showed the expected version
- /nix/store/vwidqdayh0l8rf5sjq37hr6ygdxrmkbb-nsd-4.1.21/bin/nsd-checkzone passed the binary check.
- Warning: no invocation of /nix/store/vwidqdayh0l8rf5sjq37hr6ygdxrmkbb-nsd-4.1.21/bin/nsd-control had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/vwidqdayh0l8rf5sjq37hr6ygdxrmkbb-nsd-4.1.21/bin/nsd-control-setup had a zero exit code or showed the expected version
- 2 of 5 passed binary check by having a zero exit code.
- 0 of 5 passed binary check by having the new version present in output.
- found 4.1.21 with grep in /nix/store/vwidqdayh0l8rf5sjq37hr6ygdxrmkbb-nsd-4.1.21
- directory tree listing: https://gist.github.com/57f572db82ca8e038bcf1c970d13f10e
- du listing: https://gist.github.com/11c687e733f7222872d6e3733c5f9d0b
---
 pkgs/servers/dns/nsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index b4bd6175f3e..c1c0d4e425c 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -15,11 +15,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.20";
+  name = "nsd-4.1.21";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "04zph9zli3a0zx1sfphwbxx6f8whdxcjai6w0k7a565vgcfzd5wa";
+    sha256 = "1gfjdgb5nc0nrbpdm36ngxml302khl2lnwkykl3q45byl0sbjn3q";
   };
 
   prePatch = ''
-- 
GitLab


From c056694d74fe99c6a0657528fac73645680e0df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 15 May 2018 17:45:48 +0200
Subject: [PATCH 0853/1085] androidndk: Adds versions 17 and 16b

---
 .../mobile/androidenv/androidndk.nix          |  52 +++++---
 .../development/mobile/androidenv/default.nix |  26 +++-
 ...h => make-standalone-toolchain_r10e.patch} |   0
 .../make_standalone_toolchain.py_16b.patch    | 119 ++++++++++++++++++
 .../make_standalone_toolchain.py_17.patch     | 119 ++++++++++++++++++
 5 files changed, 296 insertions(+), 20 deletions(-)
 rename pkgs/development/mobile/androidenv/{make-standalone-toolchain.patch => make-standalone-toolchain_r10e.patch} (100%)
 create mode 100644 pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch
 create mode 100644 pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index a9908d67f1d..d0bfe6c8100 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, zlib, ncurses, p7zip, lib, makeWrapper
 , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
-, platformTools
+, platformTools, python3, version, sha256
 }:
 
 stdenv.mkDerivation rec {
-  name = "android-ndk-r10e";
+  name = "android-ndk-r${version}";
 
   src = if stdenv.system == "x86_64-linux" then fetchurl {
-      url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.bin";
-      sha256 = "0nhxixd0mq4ib176ya0hclnlbmhm8f2lab6i611kiwbzyqinfb8h";
+      url = "https://dl.google.com/android/repository/${name}-linux-x86_64.zip";
+      inherit sha256;
     } else throw "platform ${stdenv.system} not supported!";
 
   phases = "buildPhase";
@@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
     runtime_paths = (lib.makeBinPath [
       coreutils file findutils
       gawk gnugrep gnused
-      jdk
-      which
+      jdk python3 which
     ]) + ":${platformTools}/platform-tools";
   in ''
     set -x
@@ -38,9 +37,22 @@ stdenv.mkDerivation rec {
 
     # so that it doesn't fail because of read-only permissions set
     cd -
-    patch -p1 \
-        --no-backup-if-mismatch \
-        -d $out/libexec/${name} < ${ ./make-standalone-toolchain.patch }
+    ${if (version == "10e") then
+        ''
+          patch -p1 \
+            --no-backup-if-mismatch \
+            -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch }
+        ''
+      else
+        ''
+          patchShebangs ${pkg_path}/build/tools/make-standalone-toolchain.sh
+
+          patch -p1 \
+            --no-backup-if-mismatch \
+            -d $out/libexec/${name} < ${ ./. + builtins.toPath ("/make_standalone_toolchain.py_" + "${version}" + ".patch") }
+          wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
+        ''
+    }
     cd ${pkg_path}
 
     find $out \( \
@@ -49,29 +61,31 @@ stdenv.mkDerivation rec {
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
                           --set-rpath ${stdenv.lib.makeLibraryPath [ zlib.out ncurses ]} {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
-    for i in ndk-build ndk-gdb ndk-gdb-py
+    for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
     do
         sed -i -e ${sed_script_1} $i
     done
-    sed -i -e ${sed_script_2} ndk-which
-    # a bash script
-    patchShebangs ndk-which
+    ${lib.optionalString (version == "10e") ''
+      sed -i -e ${sed_script_2} ndk-which
+      # a bash script
+      patchShebangs ndk-which
+    ''}
     # wrap
-    for i in ndk-build ndk-gdb ndk-gdb-py ndk-which
+    for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"}
     do
         wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
     done
     # make some executables available in PATH
     mkdir -pv ${bin_path}
     for i in \
-        ndk-build ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which
+        ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"}
     do
         ln -sf ${pkg_path}/$i ${bin_path}/$i
     done
   '';
 
-    meta = {
-        platforms = stdenv.lib.platforms.linux;
-        hydraPlatforms = [];
-    };
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
+  };
 }
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index b77cc68fa0e..d122ffe241e 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -215,13 +215,37 @@ rec {
     useInstantApps = true;
   };
 
+  androidndk_10e = import ./androidndk.nix {
+    inherit (buildPackages)
+      p7zip makeWrapper;
+    inherit (pkgs)
+      stdenv fetchurl zlib ncurses lib python3
+      coreutils file findutils gawk gnugrep gnused jdk which;
+    inherit platformTools;
+    version = "10e";
+    sha256 = "032j3sgk93bjbkny84i17ph61dhjmsax9ddqng1zbi2p7dgl0pzf";
+  };
+
+  androidndk_16b = import ./androidndk.nix {
+    inherit (buildPackages)
+      p7zip makeWrapper;
+    inherit (pkgs)
+      stdenv fetchurl zlib ncurses lib python3
+      coreutils file findutils gawk gnugrep gnused jdk which;
+    inherit platformTools;
+    version = "16b";
+    sha256 = "00frcnvpcsngv00p6l2vxj4cwi2mwcm9lnjvm3zv4wrp6pss9pmw";
+  };
+
   androidndk = import ./androidndk.nix {
     inherit (buildPackages)
       p7zip makeWrapper;
     inherit (pkgs)
-      stdenv fetchurl zlib ncurses lib
+      stdenv fetchurl zlib ncurses lib python3
       coreutils file findutils gawk gnugrep gnused jdk which;
     inherit platformTools;
+    version = "17";
+    sha256 = "1jj3zy958zsidywqd5nwdyrnr72rf9zhippkl8rbqxfy8wxq2gds";
   };
 
   androidndk_r8e = import ./androidndk_r8e.nix {
diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch
similarity index 100%
rename from pkgs/development/mobile/androidenv/make-standalone-toolchain.patch
rename to pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch
diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch
new file mode 100644
index 00000000000..70b1f7e7f4a
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch
@@ -0,0 +1,119 @@
+diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py
+index a6ae8448..2739912e 100755
+--- a/build/tools/make_standalone_toolchain.py
++++ b/build/tools/make_standalone_toolchain.py
+@@ -398,7 +398,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+                      sysroot_path, stl, host_tag):
+     """Create a standalone toolchain."""
+     copy_directory_contents(gcc_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+     copy_directory_contents(clang_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+     triple = get_triple(arch)
+     make_clang_scripts(
+         install_path, triple, api, host_tag.startswith('windows'))
+@@ -406,23 +408,28 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+     sysroot = os.path.join(NDK_DIR, 'sysroot')
+     install_sysroot = os.path.join(install_path, 'sysroot')
+     shutil.copytree(sysroot, install_sysroot)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     arch_headers = os.path.join(sysroot, 'usr/include', triple)
+     copy_directory_contents(
+         arch_headers, os.path.join(install_sysroot, 'usr/include'))
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     lib_path = os.path.join(sysroot_path, 'usr/lib')
+     lib_install = os.path.join(install_sysroot, 'usr/lib')
+     if os.path.exists(lib_path):
+         shutil.copytree(lib_path, lib_install)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     lib64_path = os.path.join(sysroot_path, 'usr/lib64')
+     lib64_install = os.path.join(install_sysroot, 'usr/lib64')
+     if os.path.exists(lib64_path):
+         shutil.copytree(lib64_path, lib64_install)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag)
+     copy_directory_contents(prebuilt_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple)
+     dirs = os.listdir(toolchain_lib_dir)
+@@ -444,29 +451,37 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+     if stl == 'gnustl':
+         gnustl_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gnu-libstdc++/4.9')
+         shutil.copytree(os.path.join(gnustl_dir, 'include'), cxx_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         for abi in get_abis(arch):
+             copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple,
+                                     abi)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             copy_gnustl_libs(gnustl_dir, install_path, triple, abi)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             if arch == 'arm':
+                 copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver,
+                                         triple, abi, thumb=True)
++                os.system('chmod -R +w "{}"'.format(install_path))
+                 copy_gnustl_libs(gnustl_dir, install_path, triple, abi,
+                                  thumb=True)
++                os.system('chmod -R +w "{}"'.format(install_path))
+     elif stl == 'libc++':
+         libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++')
+         libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi')
+         support_dir = os.path.join(NDK_DIR, 'sources/android/support')
+         copy_directory_contents(os.path.join(libcxx_dir, 'include'),
+                                 cxx_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+         copy_directory_contents(os.path.join(support_dir, 'include'),
+                                 support_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         # I have no idea why we need this, but the old one does it too.
+         copy_directory_contents(
+             os.path.join(libcxxabi_dir, 'include'),
+             os.path.join(install_path, 'include/llvm-libc++abi/include'))
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         headers = [
+             'cxxabi.h',
+@@ -482,21 +497,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+             dest_libdir = get_dest_libdir(install_path, triple, abi)
+             include_libunwind = arch == 'arm'
+             copy_libcxx_libs(src_libdir, dest_libdir, include_libunwind)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             if arch == 'arm':
+                 thumb_libdir = os.path.join(dest_libdir, 'thumb')
+                 copy_libcxx_libs(src_libdir, thumb_libdir, include_libunwind)
++                os.system('chmod -R +w "{}"'.format(install_path))
+     elif stl == 'stlport':
+         stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport')
+         gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++')
+ 
+         copy_directory_contents(
+             os.path.join(stlport_dir, 'stlport'), cxx_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         # Same as for libc++. Not sure why we have this extra directory, but
+         # keep the cruft for diff.
+         copy_directory_contents(
+             os.path.join(gabixx_dir, 'include'),
+             os.path.join(install_path, 'include/gabi++/include'))
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         headers = [
+             'cxxabi.h',
+@@ -512,9 +531,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+ 
+         for abi in get_abis(arch):
+             copy_stlport_libs(stlport_dir, install_path, triple, abi)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             if arch == 'arm':
+                 copy_stlport_libs(stlport_dir, install_path, triple, abi,
+                                   thumb=True)
++                os.system('chmod -R +w "{}"'.format(install_path))
+     else:
+         raise ValueError(stl)
+ 
diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch
new file mode 100644
index 00000000000..88ce69be3e8
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch
@@ -0,0 +1,119 @@
+diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py
+index daba3351..424b7fef 100755
+--- a/build/tools/make_standalone_toolchain.py
++++ b/build/tools/make_standalone_toolchain.py
+@@ -421,7 +421,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+                      platforms_path, stl, host_tag):
+     """Create a standalone toolchain."""
+     copy_directory_contents(gcc_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+     copy_directory_contents(clang_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+     triple = get_triple(arch)
+     make_clang_scripts(
+         install_path, triple, api, host_tag.startswith('windows'))
+@@ -432,9 +434,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+     install_headers = os.path.join(install_sysroot, 'usr/include')
+     os.makedirs(os.path.dirname(install_headers))
+     shutil.copytree(headers, install_headers)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     arch_headers = os.path.join(sysroot, 'usr/include', triple)
+     copy_directory_contents(arch_headers, os.path.join(install_headers))
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     for lib_suffix in ('', '64'):
+         lib_path = os.path.join(platforms_path, 'usr/lib{}'.format(lib_suffix))
+@@ -442,20 +446,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+             install_sysroot, 'usr/lib{}'.format(lib_suffix))
+         if os.path.exists(lib_path):
+             shutil.copytree(lib_path, lib_install)
++            os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     static_lib_path = os.path.join(sysroot, 'usr/lib', triple)
+     static_lib_install = os.path.join(install_sysroot, 'usr/lib')
+     if arch == 'x86_64':
+         static_lib_install += '64'
+     copy_directory_contents(static_lib_path, static_lib_install)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag)
+     copy_directory_contents(prebuilt_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     gdbserver_path = os.path.join(
+         NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver')
+     gdbserver_install = os.path.join(install_path, 'share', 'gdbserver')
+     shutil.copytree(gdbserver_path, gdbserver_install)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple)
+     dirs = os.listdir(toolchain_lib_dir)
+@@ -481,26 +489,33 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+         for abi in get_abis(arch):
+             copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple,
+                                     abi)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             copy_gnustl_libs(gnustl_dir, install_path, triple, abi)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             if arch == 'arm':
+                 copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver,
+                                         triple, abi, thumb=True)
++                os.system('chmod -R +w "{}"'.format(install_path))
+                 copy_gnustl_libs(gnustl_dir, install_path, triple, abi,
+                                  thumb=True)
++                os.system('chmod -R +w "{}"'.format(install_path))
+     elif stl == 'libc++':
+         libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++')
+         libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi')
+         copy_directory_contents(os.path.join(libcxx_dir, 'include'),
+                                 cxx_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+         if api < 21:
+             support_dir = os.path.join(NDK_DIR, 'sources/android/support')
+             copy_directory_contents(os.path.join(support_dir, 'include'),
+                                     support_headers)
++            os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         # I have no idea why we need this, but the old one does it too.
+         copy_directory_contents(
+             os.path.join(libcxxabi_dir, 'include'),
+             os.path.join(install_path, 'include/llvm-libc++abi/include'))
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         headers = [
+             'cxxabi.h',
+@@ -515,21 +530,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+             src_libdir = get_src_libdir(libcxx_dir, abi)
+             dest_libdir = get_dest_libdir(install_path, triple, abi)
+             copy_libcxx_libs(src_libdir, dest_libdir, abi, api)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             if arch == 'arm':
+                 thumb_libdir = os.path.join(dest_libdir, 'thumb')
+                 copy_libcxx_libs(src_libdir, thumb_libdir, abi, api)
++                os.system('chmod -R +w "{}"'.format(install_path))
+     elif stl == 'stlport':
+         stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport')
+         gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++')
+ 
+         copy_directory_contents(
+             os.path.join(stlport_dir, 'stlport'), cxx_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         # Same as for libc++. Not sure why we have this extra directory, but
+         # keep the cruft for diff.
+         copy_directory_contents(
+             os.path.join(gabixx_dir, 'include'),
+             os.path.join(install_path, 'include/gabi++/include'))
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         headers = [
+             'cxxabi.h',
+@@ -548,6 +567,7 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+             if arch == 'arm':
+                 copy_stlport_libs(stlport_dir, install_path, triple, abi,
+                                   thumb=True)
++                os.system('chmod -R +w "{}"'.format(install_path))
+     else:
+         raise ValueError(stl)
+ 
-- 
GitLab


From ec9bb1bb34f1743c0c533b76cd24ec5f69a15907 Mon Sep 17 00:00:00 2001
From: WilliButz <WilliButz@users.noreply.github.com>
Date: Thu, 17 May 2018 13:18:07 +0200
Subject: [PATCH 0854/1085] grafana: 5.1.2 -> 5.1.3 (#40621)

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index f9fb4efa04b..646401ce02f 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 = "5.1.2";
+  version = "5.1.3";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0iw0mr6m99z6vy9mz9fdhmn4fxi359n3ns71bm5a71np8lf4qs36";
+    sha256 = "09q4xrh4j02b8nrkskndahs039rhmcs8hrcgvnnpg36qqyvs1x0g";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "18bqmvyfjkvkrdbxa989aa6c7ri3b4wdb7ai543hiaz00s9mnpzm";
+    sha256 = "131dxpjnzhsjh6c0fp48jhxf5piy6wh287pfm2s7pm4ywq9m0q46";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
-- 
GitLab


From 1d424ba1699a0b955a974ec316f770004eb0f004 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Thu, 17 May 2018 07:33:27 -0400
Subject: [PATCH 0855/1085] hack-font: 3.002 -> 3.003 (#40627)

---
 pkgs/data/fonts/hack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix
index eb794326539..e77fcc3c3a3 100644
--- a/pkgs/data/fonts/hack/default.nix
+++ b/pkgs/data/fonts/hack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "3.002";
+  version = "3.003";
 in fetchzip rec {
   name = "hack-font-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip rec {
     unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack
   '';
 
-  sha256 = "11f3hl4nvxq6pvsmwr1c1r5wrxhrp7ixr5bshrz2dmqn7l8bxa63";
+  sha256 = "1l6ih6v7dqali5c7zh6z2xnbf9h2wz0ag6fdgszmqd5lnhw39v6s";
 
   meta = with stdenv.lib; {
     description = "A typeface designed for source code";
-- 
GitLab


From 596645d5d265e9a20a041714ee19585a81e1d9c8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 04:46:07 -0700
Subject: [PATCH 0856/1085] libu2f-host: 1.1.5 -> 1.1.6

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

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

These checks were done:

- built on NixOS
- /nix/store/8jbzdkhk2krc8yc37c9bcxsbmam5csaa-libu2f-host-1.1.6/bin/u2f-host passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.1.6 with grep in /nix/store/8jbzdkhk2krc8yc37c9bcxsbmam5csaa-libu2f-host-1.1.6
- directory tree listing: https://gist.github.com/bc0958f894bcdad9565006be8be45096
- du listing: https://gist.github.com/e9a255d64be0442f7d14fca45cbcb6f0
---
 pkgs/development/libraries/libu2f-host/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix
index 2def14b1c10..675ca1cd220 100644
--- a/pkgs/development/libraries/libu2f-host/default.nix
+++ b/pkgs/development/libraries/libu2f-host/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, json_c, hidapi }:
 
 stdenv.mkDerivation rec {
-  name = "libu2f-host-1.1.5";
+  name = "libu2f-host-1.1.6";
 
   src = fetchurl {
     url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz";
-    sha256 = "159slvjfq4bqslx5amjkk90xnkiv3x0yzvbi54pl2vnzbr1p2azk";
+    sha256 = "19xxwwqfzg3njfpxvhlyxd05wjwsdw3m4lpn7gk31cna6agbp82d";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From ea7404dcd743c06e815263ccc64d3fa9904bfe4e Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Wed, 16 May 2018 22:32:31 +0200
Subject: [PATCH 0857/1085] ries: init at 2018-04-11

---
 .../science/math/ries/default.nix             | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/science/math/ries/default.nix

diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/applications/science/math/ries/default.nix
new file mode 100644
index 00000000000..4b237a01a3e
--- /dev/null
+++ b/pkgs/applications/science/math/ries/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchzip }:
+stdenv.mkDerivation {
+  name = "ries-2018-04-11";
+
+  # upstream does not provide a stable link
+  src = fetchzip {
+    url = "https://salsa.debian.org/debian/ries/-/archive/debian/2018.04.11-1/ries-debian-2018.04.11-1.zip";
+    sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  meta = with stdenv.lib; {
+    homepage = https://mrob.com/pub/ries/;
+    description = "Tool to produce a list of equations that approximately solve to a given number";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ symphorien ];
+    license = licenses.gpl3Plus;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d827d7e16d..29d348511d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17244,6 +17244,8 @@ with pkgs;
 
   ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { };
 
+  ries = callPackage ../applications/science/math/ries { };
+
   ripser = callPackage ../applications/science/math/ripser { };
 
   rkt = callPackage ../applications/virtualization/rkt { };
-- 
GitLab


From dd2b5b9400f7181c4babc4e7366eee846b2f74ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 15:21:14 +0200
Subject: [PATCH 0858/1085] multi-ghc-travis: update to latest git version from
 May 16th

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

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 454bb5d5881..2ba1d64675a 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -8,8 +8,8 @@ mkDerivation {
   src = fetchFromGitHub {
     owner = "haskell-CI";
     repo = "haskell-ci";
-    rev = "105005cde6bde903e477e5b9724d02bdea06bae4";
-    sha256 = "1l76782aa29mi88a2brvkyi6k0v33rpihxlskx99mak06bjrmnhh";
+    rev = "b65ea5b35c59d1e7d0f89ff4e21840dc0e2ec3a0";
+    sha256 = "0qgsll772x24nnkarj30mplmvvwzz5vn5aadn5xzkcn77g5jiqmg";
   };
   isLibrary = true;
   isExecutable = true;
-- 
GitLab


From b1890946af8a2dbf1eb1f5f65fefb2b30c5d71bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 07:32:04 -0700
Subject: [PATCH 0859/1085] firejail: 0.9.52 -> 0.9.54

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/5zjr9idl48c08apan8gh45wh971i49i9-firejail-0.9.54/bin/firejail had a zero exit code or showed the expected version
- /nix/store/5zjr9idl48c08apan8gh45wh971i49i9-firejail-0.9.54/bin/firemon passed the binary check.
- /nix/store/5zjr9idl48c08apan8gh45wh971i49i9-firejail-0.9.54/bin/firecfg passed the binary check.
- 2 of 3 passed binary check by having a zero exit code.
- 2 of 3 passed binary check by having the new version present in output.
- found 0.9.54 with grep in /nix/store/5zjr9idl48c08apan8gh45wh971i49i9-firejail-0.9.54
- directory tree listing: https://gist.github.com/3fb76054296d9e45fea3c47ae6a9f03f
- du listing: https://gist.github.com/a732bad0be0159f527ca4e8c532400ed
---
 pkgs/os-specific/linux/firejail/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 1c7ebce9f87..9f2374e75a8 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.52";
+    version="0.9.54";
     name="${baseName}-${version}";
-    hash="0w8l8z4j7iph8fp7rchhnfsrik3f00f9v5xr191fp38fphzcj56s";
-    url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.52.tar.xz";
-    sha256="0w8l8z4j7iph8fp7rchhnfsrik3f00f9v5xr191fp38fphzcj56s";
+    hash="0mkpqlhi1vxiwd1pmlsk02vpydy1gj61k1gi3zlz6qw84xa6i6ff";
+    url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.54.tar.xz";
+    sha256="0mkpqlhi1vxiwd1pmlsk02vpydy1gj61k1gi3zlz6qw84xa6i6ff";
   };
   buildInputs = [
     which
-- 
GitLab


From 24f61ca48e02620a6590d66e74ee07cf5cc0e9ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 17 May 2018 17:06:33 +0200
Subject: [PATCH 0860/1085] knot-dns: 2.6.6 -> 2.6.7

https://lists.nic.cz/pipermail/knot-dns-users/2018-May/001356.html
Some of the fixed bugs could be exploited to crash knot-resolver
if running in --verbose mode.
---
 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 88fa07009f8..5fe7a8608c5 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.6.6";
+  version = "2.6.7";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "02h8qdkja4kic3br79svws6r2pq1ijz945238v99d998d2jxh6ci";
+    sha256 = "1c2a004b05c161f7b36d5eeccebd9d4cdf60aa09930a7cc766514e468ca92243";
   };
 
   outputs = [ "bin" "out" "dev" ];
-- 
GitLab


From 0b4b3e648c263084bfa58cc144d1fca630bf067c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 17 May 2018 10:06:56 -0500
Subject: [PATCH 0861/1085] perlPackages.AppSt: 1.1.2 -> 1.1.4

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9a23eff2e7f..4d06204ad39 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -365,10 +365,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   AppSt = buildPerlPackage rec {
-    name = "App-St-1.1.2";
+    name = "App-St-1.1.4";
     src = fetchurl {
-      url = https://github.com/nferraz/st/archive/v1.1.2.tar.gz;
-      sha256 = "1j1iwcxl16m4x5kl1vcv0linb93r55ndh3jm0w6qf459jl4x38s6";
+      url = https://github.com/nferraz/st/archive/v1.1.4.tar.gz;
+      sha256 = "1f4bqm4jiazcxgzzja1i48671za96621k0s3ln87cdacgvv1can0";
     };
     postInstall =
       ''
-- 
GitLab


From a5c9b87d78cc08354e5a3375a8acc4154d75f6b1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 17 May 2018 10:10:58 -0500
Subject: [PATCH 0862/1085] App::St: no need for fixup anymore

FWIW the fixup is the update 1.1.2 -> 1.1.4 is reverted.
---
 pkgs/top-level/perl-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4d06204ad39..8956f980668 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -372,7 +372,6 @@ let self = _self // overrides; _self = with self; {
     };
     postInstall =
       ''
-        sed -e "1 s|\(.*\)|\1 -I $out/lib/perl5/site_perl|" -i $out/bin/st
         ($out/bin/st --help || true) | grep Usage
       '';
     meta = {
-- 
GitLab


From 832a8ca087b748db7be7969581e0e10ae1eb486c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 17 May 2018 17:22:27 +0200
Subject: [PATCH 0863/1085] androidndk: Fix usage as crossSystem

---
 lib/systems/examples.nix                      |  2 +-
 .../mobile/androidenv/androidndk-pkgs.nix     | 21 +++++++++++++------
 .../mobile/androidenv/androidndk.nix          |  1 +
 .../development/mobile/androidenv/default.nix | 15 +++++++++++++
 pkgs/stdenv/cross/default.nix                 |  4 +++-
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 9c43d9b1bbc..4c7dd991791 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -45,7 +45,7 @@ rec {
 
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
-    sdkVer = "21";
+    sdkVer = "24";
     platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index 663a1f1ee8f..1323466ea86 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -98,10 +98,19 @@ rec {
   # We use androidndk from the previous stage, else we waste time or get cycles
   # cross-compiling packages to wrap incorrectly wrap binaries we don't include
   # anyways.
-  libraries = {
-    name = "bionic-prebuilt";
-    type = "derivation";
-    outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/";
-    drvPath = throw "fake derivation, build ${buildAndroidndk} to use";
-  };
+  libraries =
+    let
+      includePath = if buildAndroidndk.version == "10e" then
+          "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/include/"
+        else
+          "${buildAndroidndk}/libexec/${buildAndroidndk.name}/sysroot/usr/include";
+      libPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/";
+    in
+    runCommand "bionic-prebuilt" {} ''
+      mkdir -p $out
+      cp -r ${includePath} $out/include
+      chmod +w $out/include
+      ${lib.optionalString (lib.versionOlder buildAndroidndk.version "10e") "ln -s $out/include/${targetInfo.triple}/asm $out/include/asm"}
+      ln -s ${libPath} $out/lib
+    '';
 }
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index d0bfe6c8100..78e278be237 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -5,6 +5,7 @@
 
 stdenv.mkDerivation rec {
   name = "android-ndk-r${version}";
+  inherit version;
 
   src = if stdenv.system == "x86_64-linux" then fetchurl {
       url = "https://dl.google.com/android/repository/${name}-linux-x86_64.zip";
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index d122ffe241e..3978ae1aeb7 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -281,4 +281,19 @@ rec {
     inherit androidndk;
     targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs;
   };
+
+  androidndkPkgs_10e = import ./androidndk-pkgs.nix {
+    inherit (buildPackages)
+      makeWrapper;
+    inherit (pkgs)
+      lib hostPlatform targetPlatform
+      runCommand wrapBintoolsWith wrapCCWith;
+    # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
+    # but for splicing messing up on infinite recursion for the variants we
+    # *dont't* use. Using this workaround, but also making a test to ensure
+    # these two really are the same.
+    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_10e;
+    androidndk = androidndk_10e;
+    targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_10e;
+  };
 }
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 973be983186..41b5fd99504 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -41,7 +41,9 @@ in lib.init bootStages ++ [
       targetPlatform = crossSystem;
       cc = if crossSystem.useiOSPrebuilt or false
              then buildPackages.darwin.iosSdkPkgs.clang
-           else if crossSystem.useAndroidPrebuilt
+           else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit)
+             then buildPackages.androidenv.androidndkPkgs_10e.gcc
+           else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit)
              then buildPackages.androidenv.androidndkPkgs.gcc
            else buildPackages.gcc;
     };
-- 
GitLab


From e5861b8e0da8b13fceab9e841359f51da66664c2 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 17 May 2018 10:27:08 -0500
Subject: [PATCH 0864/1085] tigervnc: add makeWrapper to nativeBuildInputs

Fixes #40654
---
 pkgs/tools/admin/tigervnc/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 3818f361cb5..69f6e056b73 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -5,7 +5,8 @@
 , cmake, gettext, libtool
 , glproto, libGLU
 , gnutls, pam, nettle
-, xterm, openssh }:
+, xterm, openssh
+, makeWrapper}:
 
 with stdenv.lib;
 
@@ -87,7 +88,7 @@ stdenv.mkDerivation rec {
     glproto libGLU
   ] ++ xorgserver.buildInputs;
 
-  nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil ]
+  nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil makeWrapper ]
     ++ xorg.xorgserver.nativeBuildInputs;
 
   propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs;
-- 
GitLab


From 276f2897cb567593ae7f071d13bdeec5fad61240 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 17 May 2018 17:35:01 +0200
Subject: [PATCH 0865/1085] oracle-instantclient: move rpmextract and patchelf
 to nativeBuildInputs

---
 pkgs/development/libraries/oracle-instantclient/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index 1c629c13779..5affd14708b 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -34,9 +34,11 @@ in stdenv.mkDerivation rec {
   srcSqlplus = (requireSource version "1" "sqlplus" "303e82820a10f78e401e2b07d4eebf98b25029454d79f06c46e5f9a302ce5552");
   srcOdbc = optionalString odbcSupport (requireSource version "2" "odbc" "e870c84d2d4be6f77c0760083b82b7ffbb15a4bf5c93c4e6c84f36d6ed4dfdf1");
 
-  buildInputs = [ glibc patchelf rpmextract ] ++
+  buildInputs = [ glibc ] ++
     optional odbcSupport unixODBC;
 
+  nativeBuildInputs = [ rpmextract patchelf ];
+
   buildCommand = ''
     mkdir -p "${name}"
     cd "${name}"
-- 
GitLab


From 0f4269bf48458bcc9ec089364e9dd234585f7667 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 17 May 2018 17:37:08 +0200
Subject: [PATCH 0866/1085] oracle-instantclient: remove unused arguments

---
 pkgs/development/libraries/oracle-instantclient/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index 5affd14708b..9abb3e5f9e0 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio
-, odbcSupport ? false, unixODBC
-}:
+{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, odbcSupport ? false, unixODBC }:
 
 assert odbcSupport -> unixODBC != null;
 
-- 
GitLab


From ccb4558a91f6466eb2aee4caeb8cb6dd42b8a082 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 17 May 2018 17:38:06 +0200
Subject: [PATCH 0867/1085] oracle-instantclient: prefix LD_LIBRARY_PATH

---
 pkgs/development/libraries/oracle-instantclient/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index 9abb3e5f9e0..edb07800d98 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, odbcSupport ? false, unixODBC }:
+{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, makeWrapper, odbcSupport ? false, unixODBC }:
 
 assert odbcSupport -> unixODBC != null;
 
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [ glibc ] ++
     optional odbcSupport unixODBC;
 
-  nativeBuildInputs = [ rpmextract patchelf ];
+  nativeBuildInputs = [ rpmextract patchelf makeWrapper ];
 
   buildCommand = ''
     mkdir -p "${name}"
@@ -70,6 +70,7 @@ in stdenv.mkDerivation rec {
       patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
                --force-rpath --set-rpath "$out/lib:${libaio}/lib" \
                $exe
+      wrapProgram $exe --prefix LD_LIBRARY_PATH ":" $out/lib
     done
   '';
 
-- 
GitLab


From 7824c60a439810bc068db5d67756161ac62527fa Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 17 May 2018 17:38:32 +0200
Subject: [PATCH 0868/1085] oracle-instantclient: patchelf and wrap adrci and
 genezi, too

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

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index edb07800d98..6ed3e584fa3 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
                $lib
     done
 
-    for exe in $out/bin/sqlplus; do
+    for exe in $out/bin/{adrci,genezi,sqlplus}; do
       patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
                --force-rpath --set-rpath "$out/lib:${libaio}/lib" \
                $exe
-- 
GitLab


From a88354d99f8298a45a2e5e3632fb793a83f2b940 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 17 May 2018 18:40:48 +0200
Subject: [PATCH 0869/1085] pythonPackages.cx_oracle: 6.2.1 -> 6.3.1

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

diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
index f2e10caad72..637518b1969 100644
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "cx_Oracle";
-  version = "6.2.1";
+  version = "6.3.1";
 
   buildInputs = [
     oracle-instantclient
@@ -10,10 +10,10 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01970bc843b3c699a7fd98af19e0401fe69abfbd2acdf464e0bf2ae06ea372b9";
+    sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7";
   };
 
-  # Check need an Oracle database to run  
+  # Check need an Oracle database to run
   doCheck = false;
 
   meta = with stdenv.lib; {
-- 
GitLab


From d7ac3818d3addea49eceebe175222b8357e32138 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 06:22:02 -0700
Subject: [PATCH 0870/1085] gpsprune: 18.6 -> 19

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/akzrr13fzbw4ympkxcjp4v434hbfw6nb-gpsprune-19/bin/gpsprune had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 19 with grep in /nix/store/akzrr13fzbw4ympkxcjp4v434hbfw6nb-gpsprune-19
- directory tree listing: https://gist.github.com/093deda67a3697cfb7ceb5e487494b74
- du listing: https://gist.github.com/c4d02de001bcd6a66916da90695ae515
---
 pkgs/applications/misc/gpsprune/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index a51ec8c1b04..3c40457062b 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gpsprune-${version}";
-  version = "18.6";
+  version = "19";
 
   src = fetchurl {
     url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
-    sha256 = "1ii9pkj24jcwzs225nyi17ks07dfc5x3940hpqrsb5xzxy2vkw7q";
+    sha256 = "0n08fg55zgpfg1f6lq0n3ngi0n8af1r0rhmbnpik5mjng4m9g3x5";
   };
 
   phases = [ "installPhase" ];
-- 
GitLab


From 838bfaa8edf2c1224715eda00f143a5dc363e65a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 17 May 2018 19:12:17 +0200
Subject: [PATCH 0871/1085] gpsbabel: remove use of phases

Also make use of `makeWrapper`.
---
 pkgs/applications/misc/gpsprune/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 3c40457062b..b6391d06eb9 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }:
+{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }:
 
 stdenv.mkDerivation rec {
   name = "gpsprune-${version}";
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0n08fg55zgpfg1f6lq0n3ngi0n8af1r0rhmbnpik5mjng4m9g3x5";
   };
 
-  phases = [ "installPhase" ];
-
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre8 ];
 
   desktopItem = makeDesktopItem {
@@ -23,15 +22,11 @@ stdenv.mkDerivation rec {
     categories = "Education;Geoscience;";
   };
 
-  installPhase = ''
+  buildCommand = ''
     mkdir -p $out/bin $out/share/java
     cp -v $src $out/share/java/gpsprune.jar
-    cat > $out/bin/gpsprune <<EOF
-    #!${bash}/bin/bash
-    exec ${jre8}/bin/java -jar $out/share/java/gpsprune.jar "\$@"
-    EOF
-    chmod 755 $out/bin/gpsprune
-
+    makeWrapper ${jre8}/bin/java $out/bin/gpsprune \
+      --add-flags "-jar $out/share/java/gpsprune.jar"
     mkdir -p $out/share/applications
     cp $desktopItem/share/applications"/"* $out/share/applications
     mkdir -p $out/share/pixmaps
-- 
GitLab


From 639f7952be31f89d22512bf661d03a4fe2b075a2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 17 May 2018 18:43:25 +0200
Subject: [PATCH 0872/1085] pythonPackages.cx_oracle: fix dlopen

previously, $ORACLE_HOME had to be set for each python script using this
library.

We now patch odpi to load libclntsh.so from oracle-instantclient if
$ORACLE_HOME was not provided.
---
 ...-dpiOci.c-nixify-libclntsh.so-dlopen.patch | 27 +++++++++++++++++++
 .../python-modules/cx_oracle/default.nix      |  6 +++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch

diff --git a/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch b/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch
new file mode 100644
index 00000000000..a2de7b24853
--- /dev/null
+++ b/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch
@@ -0,0 +1,27 @@
+From 355b9d812efdfbd041e14b365258b69c81689981 Mon Sep 17 00:00:00 2001
+From: Florian Klink <flokli@flokli.de>
+Date: Thu, 17 May 2018 18:37:40 +0200
+Subject: [PATCH] odpi/src/dpiOci.c: nixify libclntsh.so dlopen
+
+---
+ odpi/src/dpiOci.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/odpi/src/dpiOci.c b/odpi/src/dpiOci.c
+index 76b9867..22c2987 100644
+--- a/odpi/src/dpiOci.c
++++ b/odpi/src/dpiOci.c
+@@ -1575,6 +1575,10 @@ static int dpiOci__loadLib(dpiError *error)
+             }
+         }
+     }
++    if(!dpiOciLibHandle) {
++        dpiOciLibHandle = dlopen("@libclntsh@", RTLD_LAZY);
++    }
++
+ #endif
+ 
+     if (!dpiOciLibHandle) {
+-- 
+2.16.3
+
diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
index 637518b1969..c9925fad88d 100644
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -13,6 +13,12 @@ buildPythonPackage rec {
     sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7";
   };
 
+  patches = [ ./0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch ];
+
+  postPatch = ''
+    substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ ${oracle-instantclient}/lib/libclntsh.so";
+  '';
+
   # Check need an Oracle database to run
   doCheck = false;
 
-- 
GitLab


From bd648f321c2c1e52a4b8d2a7d7183ba076937ac4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 17 May 2018 20:28:12 +0200
Subject: [PATCH 0873/1085] nixos/nginx: emphasize that useACMEHost does not
 create certs

It was not entirely clean that `services.nginx.virtualHosts.<name>.useACMEHost` does not create certificates, see https://github.com/NixOS/nixpkgs/issues/40593
---
 nixos/modules/services/web-servers/nginx/vhost-options.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index f014d817e80..e4494dff37d 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -62,6 +62,7 @@ with lib;
         This is useful if you have many subdomains and want to avoid hitting the
         <link xlink:href="https://letsencrypt.org/docs/rate-limits/">rate limit</link>.
         Alternately, you can generate a certificate through <option>enableACME</option>.
+        <emphasis>Note that this option does not create any certificates, nor it does add subdomains to existing ones – you will need to create them manually using  <xref linkend="opt-security.acme.certs"/>.</emphasis>
       '';
     };
 
-- 
GitLab


From d9266340e187b0d29f3ea898a9983cb0727a9b1a Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Mon, 23 Apr 2018 00:52:01 +0200
Subject: [PATCH 0874/1085] Adds gerschtli to maintainer-list

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2add8fa2c4f..790b72c039e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1483,6 +1483,11 @@
     github = "georgewhewell";
     name = "George Whewell";
   };
+  gerschtli = {
+    email = "tobias.happ@gmx.de";
+    github = "Gerschtli";
+    name = "Tobias Happ";
+  };
   gilligan = {
     email = "tobias.pflug@gmail.com";
     github = "gilligan";
-- 
GitLab


From 93fedb03fe4618c8a5bc51c2d7bf3502e0d80939 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Mon, 23 Apr 2018 01:13:19 +0200
Subject: [PATCH 0875/1085] cargo-release: Init at 0.10.0

---
 .../cargo-release/default.nix                 | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/package-management/cargo-release/default.nix

diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
new file mode 100644
index 00000000000..562f92121d6
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  name = "cargo-release-${version}";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner = "sunng87";
+    repo = "cargo-release";
+    rev = "${version}";
+    sha256 = "1wp7x6nmmhi019iyvyva26k14f4fsxrh424s2pgrr09nqlrfjbz0";
+  };
+
+  cargoSha256 = "0qxwkp6w7ir3hs0r587k3jmh69afc7j411bsy6k8hlm8g9clgby5";
+
+  meta = with stdenv.lib; {
+    description = ''Cargo subcommand "release": everything about releasing a rust crate'';
+    homepage = https://github.com/sunng87/cargo-release;
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ gerschtli ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47719d7ab56..424c15ac715 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6894,6 +6894,7 @@ with pkgs;
     });
 
   cargo-edit = callPackage ../tools/package-management/cargo-edit { };
+  cargo-release = callPackage ../tools/package-management/cargo-release { };
 
   cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
 
-- 
GitLab


From e0fccdcc8d03da8ec306db3ac9710fbe5e135293 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 May 2018 11:09:33 -0500
Subject: [PATCH 0876/1085] rust: add more sys overrides

---
 pkgs/build-support/rust/default-crate-overrides.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index 488fcb94372..c9d2913c4fd 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -3,7 +3,7 @@
   libsodium, postgresql, ... }:
 
 let
-  inherit (darwin.apple_sdk.frameworks) CoreFoundation;
+  inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
 in
 {
   cargo = attrs: {
@@ -19,7 +19,8 @@ in
     crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
   };
   curl-sys = attrs: {
-    buildInputs = [ pkgconfig curl ];
+    buildInputs = [ pkgconfig ];
+    propagatedBuiltInputs = [ curl ];
   };
   libgit2-sys = attrs: {
     LIBGIT2_SYS_USE_PKG_CONFIG = true;
@@ -69,4 +70,7 @@ in
   pq-sys = attr: {
     buildInputs = [ pkgconfig postgresql ];
   };
+  security-framework-sys = attr: {
+    propagatedBuildInputs = [ Security ];
+  };
 }
-- 
GitLab


From 768bd58a4890f00a42d3e5578f37534350fba7a2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 May 2018 14:19:36 -0500
Subject: [PATCH 0877/1085] crate-overrides: curl-sys needs zlib

---
 pkgs/build-support/rust/default-crate-overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index c9d2913c4fd..971c4d0f5e2 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -19,7 +19,7 @@ in
     crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
   };
   curl-sys = attrs: {
-    buildInputs = [ pkgconfig ];
+    buildInputs = [ pkgconfig zlib ];
     propagatedBuiltInputs = [ curl ];
   };
   libgit2-sys = attrs: {
-- 
GitLab


From 9bca8edce0bb70111d8971d558e745068c3f6041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 17 May 2018 20:21:11 +0100
Subject: [PATCH 0878/1085] python.pkgs.cx_oracle: add missing quote

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

diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
index c9925fad88d..717faf1128f 100644
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   patches = [ ./0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch ];
 
   postPatch = ''
-    substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ ${oracle-instantclient}/lib/libclntsh.so";
+    substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ "${oracle-instantclient}/lib/libclntsh.so";
   '';
 
   # Check need an Oracle database to run
-- 
GitLab


From 99b4eb99872c46fd10aacdab4162be0f09f817f0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 17 May 2018 21:38:00 +0200
Subject: [PATCH 0879/1085] disorderfs: 0.5.2 -> 0.5.3

---
 pkgs/tools/filesystems/disorderfs/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix
index 0551198cded..0bde9b0b26e 100644
--- a/pkgs/tools/filesystems/disorderfs/default.nix
+++ b/pkgs/tools/filesystems/disorderfs/default.nix
@@ -2,17 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "disorderfs-${version}";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchurl {
-    url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.bz2";
-    sha256 = "0jdadb1ppd5qrnngpjv14az32gwslag2wwv1k8rs29iqlfy38cjf";
+    url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz";
+    sha256 = "1zx6248cwfcci5555sk9iwl9lz6x8kzc9qgiq4jv04zjiapivdnq";
   };
 
   nativeBuildInputs = [ pkgconfig asciidoc ];
 
   buildInputs = [ fuse attr ];
 
+  sourceRoot = ".";
+
   installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 85cc1364adfed5c439c6dea6f1563af2220c276a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 12:40:38 -0700
Subject: [PATCH 0880/1085] babl: 0.1.46 -> 0.1.48

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 0.1.48 with grep in /nix/store/1pffxdly3bs42aqxf9zzmh3kcn304r8i-babl-0.1.48
- directory tree listing: https://gist.github.com/42f46e6f60e3db18a7a54f4ec1c31b80
- du listing: https://gist.github.com/3382dcb9c594fd5e06a9432be1c8d80b
---
 pkgs/development/libraries/babl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 285f4dea802..ac9056d1e03 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.46";
+  name = "babl-0.1.48";
 
   src = fetchurl {
     url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "0nwyhvfca6m35wjcccvwca7fcihzgdfyc012qi703y5d3cxl1hmv";
+    sha256 = "0596flzqzdlq4y6lsg34szh1ffgyccghp8y1k9h4d3jwymfd16xy";
   };
 
   doCheck = true;
-- 
GitLab


From 33a94b0448351215a8d0f5d259327625c53989b7 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 17 May 2018 22:43:51 +0300
Subject: [PATCH 0881/1085] franz: switch to autoPatchelfHook

---
 .../instant-messengers/franz/default.nix      | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 95e01e586ec..75df17bd5b0 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook
 , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
 
@@ -8,17 +8,6 @@ let
 
   version = "4.0.4";
 
-  runtimeDeps = [
-    udev libnotify
-  ];
-  deps = (with xorg; [
-    libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
-    libXrender libX11 libXtst libXScrnSaver
-  ]) ++ [
-    gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
-    gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
-  ] ++ runtimeDeps;
-
   desktopItem = makeDesktopItem rec {
     name = "Franz";
     exec = name;
@@ -39,16 +28,21 @@ in stdenv.mkDerivation rec {
   # don't remove runtime deps
   dontPatchELF = true;
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+  buildInputs = (with xorg; [
+    libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
+    libXrender libX11 libXtst libXScrnSaver
+  ]) ++ [
+    gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+    gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
+  ];
+  runtimeDependencies = [ udev.lib libnotify ];
 
   unpackPhase = ''
     tar xzf $src
   '';
 
   installPhase = ''
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz
-    patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz
-
     mkdir -p $out/bin $out/opt/franz
     cp -r * $out/opt/franz
     ln -s $out/opt/franz/Franz $out/bin
-- 
GitLab


From 7e29dcf3ccc91a2bb0209dd76d02911a5284f240 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 12:49:56 -0700
Subject: [PATCH 0882/1085] babeld: 1.8.1 -> 1.8.2

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

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

These checks were done:

- built on NixOS
- /nix/store/7vd417z6awqq3wyqjg3wzyq3868qfh5f-babeld-1.8.2/bin/babeld passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.8.2 with grep in /nix/store/7vd417z6awqq3wyqjg3wzyq3868qfh5f-babeld-1.8.2
- directory tree listing: https://gist.github.com/560ddce597cdbadf44146673690eeba5
- du listing: https://gist.github.com/b9dcee589270b1bf6e38fcdac5771b9c
---
 pkgs/tools/networking/babeld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index 801863fb95a..9c8f8d31c0c 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babeld-1.8.1";
+  name = "babeld-1.8.2";
 
   src = fetchurl {
     url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
-    sha256 = "1gq6q1zly40ngs9wl3qa3yjvyb6zbqck82fp3n6w2bi9ymrrq94w";
+    sha256 = "1p751zb7h75f8w7jz37432dj610f432jnj37lxhmav9q6aqyrv87";
   };
 
   preBuild = ''
-- 
GitLab


From 636fce50fef349302e1e237c7cbb45231c635bd3 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 17 May 2018 22:54:57 +0300
Subject: [PATCH 0883/1085] maxx: switch to autoPatchelfHook

---
 pkgs/desktops/maxx/default.nix | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 69d16c9b20a..10fa745d978 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, makeWrapper, libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg
+{ stdenv, fetchurl, makeWrapper, autoPatchelfHook
+, libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg
 
 , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
 , libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2
@@ -9,11 +10,6 @@
 let
   version = "Indy-1.1.0";
 
-  deps = [
-    stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
-    libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2
-    gdk_pixbuf libGL ncurses
-  ];
   runtime_deps = [
     xclock xsettingsd
   ];
@@ -31,7 +27,12 @@ in stdenv.mkDerivation {
     })
   ];
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
+  buildInputs = [
+    stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
+    libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2
+    gdk_pixbuf libGL ncurses
+  ];
 
   buildPhase = ''
     while IFS= read -r -d ''$'\0' i; do
@@ -58,15 +59,11 @@ in stdenv.mkDerivation {
       --prefix PATH : ${stdenv.lib.makeBinPath runtime_deps}
 
     while IFS= read -r -d ''$'\0' i; do
-      if isELF "$i"; then
-        bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?`
-        patchelf --set-rpath "$maxx/lib64:$maxx/OpenMotif-2.1.32/lib64:$maxx/OpenMotif-2.3.1/lib64:${stdenv.lib.makeLibraryPath deps}" "$i"
-        if [ "$bin" -eq 0 ]; then
-          wrapProgram "$i" \
-            --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-            --set NIX_REDIRECTS /opt/MaXX=$maxx \
-            --prefix PATH : $maxx/sbin
-        fi
+      if isExecutable "$i"; then
+        wrapProgram "$i" \
+          --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+          --set NIX_REDIRECTS /opt/MaXX=$maxx \
+          --prefix PATH : $maxx/sbin
       fi
     done < <(find "$maxx" -type f -print0)
 
-- 
GitLab


From 0f7eaddc5032b5b2276239dd1150f6a507626c98 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 16 May 2018 21:42:14 -0500
Subject: [PATCH 0884/1085] sqlar: init at 2018-01-07

---
 pkgs/development/libraries/sqlite/sqlar.nix | 26 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/sqlite/sqlar.nix

diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix
new file mode 100644
index 00000000000..734d68ca3d4
--- /dev/null
+++ b/pkgs/development/libraries/sqlite/sqlar.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, fuse, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "sqlar-${version}";
+  version = "2018-01-07";
+
+  src = fetchurl {
+    url = "https://www.sqlite.org/sqlar/tarball/4824e73896/sqlar-src-4824e73896.tar.gz";
+    sha256 = "09pikkbp93gqypn3da9zi0dzc47jyypkwc9vnmfzhmw7kpyv8nm9";
+  };
+
+  buildInputs = [ fuse zlib ];
+
+  buildFlags = [ "sqlar" "sqlarfs" ];
+
+  installPhase = ''
+    install -D -t $out/bin sqlar sqlarfs
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://sqlite.org/sqlar;
+    description = "SQLite Archive utilities";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47719d7ab56..88a9ad7e14d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11650,6 +11650,8 @@ with pkgs;
 
   sqlite3_analyzer = lowPrio (callPackage ../development/libraries/sqlite/sqlite3_analyzer.nix { });
 
+  sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { };
+
   sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin;
 
   sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { };
-- 
GitLab


From f2849abd7e3ea9ed7d8baf0899331a876261cbfe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 13:08:26 -0700
Subject: [PATCH 0885/1085] openresty: 1.13.6.1 -> 1.13.6.2 (#40648)

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

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

These checks were done:

- built on NixOS
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/opm passed the binary check.
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/md2pod.pl passed the binary check.
- Warning: no invocation of /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/nginx-xml2pod had a zero exit code or showed the expected version
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/resty passed the binary check.
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/restydoc passed the binary check.
- Warning: no invocation of /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/restydoc-index had a zero exit code or showed the expected version
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/openresty passed the binary check.
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/luajit-openresty passed the binary check.
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/nginx passed the binary check.
- 7 of 9 passed binary check by having a zero exit code.
- 2 of 9 passed binary check by having the new version present in output.
- found 1.13.6.2 with grep in /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2
- directory tree listing: https://gist.github.com/3d4adc0eb55d63d7e2b269541039384b
- du listing: https://gist.github.com/f8dd4bb690e9b8615ede14c9f250f9f7
---
 pkgs/servers/http/openresty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 093f5f0e502..252e1a97dfd 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -5,11 +5,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "openresty-${version}";
-  version = "1.13.6.1";
+  version = "1.13.6.2";
 
   src = fetchurl {
     url = "http://openresty.org/download/openresty-${version}.tar.gz";
-    sha256 = "0sv93nw1j597mdpnibmgaa3nnghdk0z6k27vavm8w2c1z9n6w96i";
+    sha256 = "0hi9zw4344a4i636g3nbnnlm8qbnq37f50irhd1xncih4xc1jvll";
   };
 
   buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ];
-- 
GitLab


From c521ad3528c00eefc004ab531fbb6fa2c5234a9d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 13:14:13 -0700
Subject: [PATCH 0886/1085] soapyhackrf: 0.3.2 -> 0.3.3 (#40643)

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/2cb235b01daec8f6f3de0f0217e17bda
- du listing: https://gist.github.com/4ad265d40e6ea8558f6cccfbfb8d9d35
---
 pkgs/applications/misc/soapyhackrf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/soapyhackrf/default.nix b/pkgs/applications/misc/soapyhackrf/default.nix
index f5543af9c60..2c5dd058ced 100644
--- a/pkgs/applications/misc/soapyhackrf/default.nix
+++ b/pkgs/applications/misc/soapyhackrf/default.nix
@@ -3,7 +3,7 @@
 } :
 
 let
-  version = "0.3.2";
+  version = "0.3.3";
 
 in stdenv.mkDerivation {
   name = "soapyhackrf-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "pothosware";
     repo = "SoapyHackRF";
     rev = "soapy-hackrf-${version}";
-    sha256 = "1sgx2nk8yrzfwisjfs9mw0xwc47bckzi17p42s2pbv7zcxzpb66p";
+    sha256 = "1awn89z462500gb3fjb7x61b1znkjri9n1d39bqfip1qk4s11pxc";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From 43a28c2083dac448056567f908382f70394d2f6a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 13:26:35 -0700
Subject: [PATCH 0887/1085] prosody: 0.10.0 -> 0.10.1 (#40645)

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

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

These checks were done:

- built on NixOS
- /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/prosody passed the binary check.
- Warning: no invocation of /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/prosodyctl had a zero exit code or showed the expected version
- /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/.prosody-wrapped passed the binary check.
- Warning: no invocation of /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/.prosodyctl-wrapped had a zero exit code or showed the expected version
- 2 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 0.10.1 with grep in /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1
- directory tree listing: https://gist.github.com/e1e8caae1a498d8e07f1c35d990846d3
- du listing: https://gist.github.com/9b3a9c7a8711da781e548e894e848cdc
---
 pkgs/servers/xmpp/prosody/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 2d0e1a529da..6f092dd80cd 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -25,12 +25,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.10.0";
+  version = "0.10.1";
   name = "prosody-${version}";
 
   src = fetchurl {
     url = "http://prosody.im/downloads/source/${name}.tar.gz";
-    sha256 = "1644jy5dk46vahmh6nna36s79k8k668sbi3qamjb4q3c4m3y853l";
+    sha256 = "1kmmpkkgymg1r8r0k8j83pgmiskg1phl8hmpzjrnvlvsfnrnjplr";
   };
 
   communityModules = fetchhg {
-- 
GitLab


From 94cb35748e21ef60db030e259ae838bdada876bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 13:44:42 -0700
Subject: [PATCH 0888/1085] debootstrap: 1.0.97 -> 1.0.98 (#40682)

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

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

These checks were done:

- built on NixOS
- /nix/store/m0h3f8pqvj25qgxc3z8qr9dz5id09ak7-debootstrap-1.0.98/bin/debootstrap passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.0.98 with grep in /nix/store/m0h3f8pqvj25qgxc3z8qr9dz5id09ak7-debootstrap-1.0.98
- directory tree listing: https://gist.github.com/f2964467bd7a4c6fb63e26c0c192fdc2
- du listing: https://gist.github.com/987ba3269a198a4eb67c50f8263d192d
---
 pkgs/tools/misc/debootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 7b143183bc0..0ed883bf342 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -4,13 +4,13 @@
 # There is also cdebootstrap now. Is that easier to maintain?
 stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.97";
+  version = "1.0.98";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "1w2wdiazfykjkwainxfk72rccqsh1l1i90h93phsvayv0gsbxrnk";
+    sha256 = "07wfvjhzc5schhpn1dkvhwbi115yn4f1q99g0g39m79bbyxm50d8";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];
-- 
GitLab


From 00ddd6a8ae9989ada2cb1a70b0c6cfb1022f6b1e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 14:08:28 -0700
Subject: [PATCH 0889/1085] dash: 0.5.10 -> 0.5.10.1 (#40677)

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

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

These checks were done:

- built on NixOS
- /nix/store/xdfhswm4pr989ad5582dphj02nlhd09g-dash-0.5.10.1/bin/dash passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/c7533f80b4151e29fb67f31acbea016b
- du listing: https://gist.github.com/455f25b553fefbc281441c80772198d1
---
 pkgs/shells/dash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix
index 5f26801ca6d..c852e1feb33 100644
--- a/pkgs/shells/dash/default.nix
+++ b/pkgs/shells/dash/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dash-0.5.10";
+  name = "dash-0.5.10.1";
 
   src = fetchurl {
     url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
-    sha256 = "1arimvc9zcghhb3nin9z3yr5706vxfri4a9r3j9j9d0n676f0w5d";
+    sha256 = "1bl4brz5vy07lrss54glp4vfca3q8d73hyc87sqdk99f76z95b6s";
   };
 
   hardeningDisable = [ "format" ];
-- 
GitLab


From 157eb22351f9d0a9d8337b104ddb8bdb5ec4c01e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 14:09:01 -0700
Subject: [PATCH 0890/1085] debianutils: 4.8.4 -> 4.8.6 (#40678)

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

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

These checks were done:

- built on NixOS
- /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/run-parts passed the binary check.
- /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/tempfile passed the binary check.
- /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/ischroot passed the binary check.
- Warning: no invocation of /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/which had a zero exit code or showed the expected version
- /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/savelog passed the binary check.
- Warning: no invocation of /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/add-shell had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/installkernel had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/remove-shell had a zero exit code or showed the expected version
- 4 of 8 passed binary check by having a zero exit code.
- 1 of 8 passed binary check by having the new version present in output.
- found 4.8.6 with grep in /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6
- directory tree listing: https://gist.github.com/d23555dbc7c71f2c0b98dcd75d09c013
- du listing: https://gist.github.com/58757b8859445f56eba651aa845fe59f
---
 pkgs/tools/misc/debianutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix
index d93cc479a80..bec0cbbd2b9 100644
--- a/pkgs/tools/misc/debianutils/default.nix
+++ b/pkgs/tools/misc/debianutils/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "4.8.4";
+  version = "4.8.6";
   name = "debianutils-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz";
-    sha256 = "1chypq3dbkgvl16lgzdvqvlr7cdm3814nqmp8ch8j7x6mscsnqf0";
+    sha256 = "0wrz8ak4896f5i8wirijr9hdvc43xzxpg2gjs0snmpys8iqh82fv";
   };
 
   meta = {
-- 
GitLab


From 3432fa3fd5197f0cd2c723a1f14641e30ccb173d Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Thu, 17 May 2018 16:16:26 -0500
Subject: [PATCH 0891/1085] bashplotlib: init at 2017-10-11 (#40685)

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

diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix
new file mode 100644
index 00000000000..2757f5f3e21
--- /dev/null
+++ b/pkgs/tools/misc/bashplotlib/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, pythonPackages, fetchFromGitHub }:
+
+pythonPackages.buildPythonApplication rec {
+  pname = "bashplotlib-${version}";
+  version = "2017-10-11";
+
+  src = fetchFromGitHub {
+    owner = "glamp";
+    repo = "bashplotlib";
+    rev = "fdc52be2c1fed13753692eced328143ab1db6f3d";
+    sha256 = "1ycql6j65zywyav2n3c0x1i5cm9w6glzqc3v0cgdvv1bdg4wi0gf";
+  };
+
+  # No tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/glamp/bashplotlib;
+    description = "Plotting in the terminal";
+    maintainers = with maintainers; [ dtzWill ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d51e6fbe857..698a0c8ed30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -784,6 +784,8 @@ with pkgs;
 
   basex = callPackage ../tools/text/xml/basex { };
 
+  bashplotlib = callPackage ../tools/misc/bashplotlib { };
+
   babeld = callPackage ../tools/networking/babeld { };
 
   badvpn = callPackage ../tools/networking/badvpn {};
-- 
GitLab


From bb898dbc89cbca92850306f35ab8cfcc0f074e60 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 14:56:24 -0700
Subject: [PATCH 0892/1085] pam_u2f: 1.0.6 -> 1.0.7 (#40649)

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

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

These checks were done:

- built on NixOS
- /nix/store/ny1mv10yj3az2yjn25sla3aybl550rwi-pam_u2f-1.0.7/bin/pamu2fcfg passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.0.7 with grep in /nix/store/ny1mv10yj3az2yjn25sla3aybl550rwi-pam_u2f-1.0.7
- directory tree listing: https://gist.github.com/7da727fb06490bc549a719fda2ada9ab
- du listing: https://gist.github.com/a984153d959e953899879d365ffc7852
---
 pkgs/os-specific/linux/pam_u2f/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
index 5cc235c3104..58e3f79d42b 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "pam_u2f-${version}";
-  version = "1.0.6";
+  version = "1.0.7";
 
   src     = fetchurl {
     url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz";
-    sha256 = "0fpdb49596zywnbx1cfcx1k83rbs1ylhi1cnn25pq9d3b92hj50h";
+    sha256 = "1kz7d3vr5dag1d5zq14kcp887p5d0q079dy1sqyl8ndi567asjh3";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From f1323634c1083c3594e6a62a7c2ff065e3e9a36d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 15:32:15 -0700
Subject: [PATCH 0893/1085] armadillo: 8.500.0 -> 8.500.1 (#40700)

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 8.500.1 with grep in /nix/store/fgj0bi559rzmrmzm0y0fyfr75wljlwzz-armadillo-8.500.1
- directory tree listing: https://gist.github.com/6b042c178fafc84e571bb6d2ed67ae65
- du listing: https://gist.github.com/32fd420f41d621a7b6b540cabbcf3f53
---
 pkgs/development/libraries/armadillo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 4c98bbc182c..abf251f97f9 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
-  version = "8.500.0";
+  version = "8.500.1";
   name = "armadillo-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "1wdvii5sncq3d8dh272s1n79mpcwzz437lyyfwy7gm7vbks6j77m";
+    sha256 = "0bm1g93yr79i74382pq1almakpyf42yipiqkqy742jyzwbxhxr5c";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 81a0a3b39c7812cd6c9d1734f276fe72d33e842a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 16:08:47 -0700
Subject: [PATCH 0894/1085] ntp: 4.2.8p10 -> 4.2.8p11 (#40661)

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

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

These checks were done:

- built on NixOS
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/calc_tickadj passed the binary check.
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntp-wait passed the binary check.
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntptrace passed the binary check.
- Warning: no invocation of /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/update-leap had a zero exit code or showed the expected version
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/sntp passed the binary check.
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntpd passed the binary check.
- Warning: no invocation of /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntpdate had a zero exit code or showed the expected version
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntpdc passed the binary check.
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntpq passed the binary check.
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntp-keygen passed the binary check.
- Warning: no invocation of /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntptime had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/tickadj had a zero exit code or showed the expected version
- 8 of 12 passed binary check by having a zero exit code.
- 0 of 12 passed binary check by having the new version present in output.
- found 4.2.8p11 with grep in /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11
- directory tree listing: https://gist.github.com/643849ae077bac0514537c8aa923dd6d
- du listing: https://gist.github.com/1b2abf7cee80b022945ff72be1eb7070
---
 pkgs/tools/networking/ntp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 29f8e1ae257..1178f5f0107 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -8,11 +8,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.8p10";
+  name = "ntp-4.2.8p11";
 
   src = fetchurl {
     url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "17xrk7gxrl3hgg0i73n8qm53knyh01lf0f3l1zx9x6r1cip3dlnx";
+    sha256 = "13i7rp1va29ffjdk08fvsfl6n47zzwsp147zhgb550k8agvkjjpi";
   };
 
   # The hardcoded list of allowed system calls for seccomp is
-- 
GitLab


From b1b49e114b249a385025ed7acec1766713d8bb68 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 16:23:42 -0700
Subject: [PATCH 0895/1085] usbutils: 009 -> 010 (#40635)

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010/bin/lsusb.py had a zero exit code or showed the expected version
- /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010/bin/usbhid-dump passed the binary check.
- /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010/bin/lsusb passed the binary check.
- /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010/bin/usb-devices passed the binary check.
- 3 of 4 passed binary check by having a zero exit code.
- 1 of 4 passed binary check by having the new version present in output.
- found 010 with grep in /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010
- directory tree listing: https://gist.github.com/ea1dc2aa0de1416d4359481ce7edb85e
- du listing: https://gist.github.com/f46f6ac9b995df459105446dc2761e28
---
 pkgs/os-specific/linux/usbutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 31e4a3dd26f..adb2a0ee2fb 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb1, hwdata }:
 
 stdenv.mkDerivation rec {
-  name = "usbutils-009";
+  name = "usbutils-010";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz";
-    sha256 = "0q3iavmak2bs9xw486w4xfbjl0hbzii93ssgpr95mxmm9kjz1gwb";
+    sha256 = "06aag4jfgsfjxk563xsp9ik9nadihmasrr37a1gb0vwqni5kdiv1";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 285a90b714bfee4004ffa84c83f15bebc36df0b9 Mon Sep 17 00:00:00 2001
From: Roland Koebler <rk@simple-is-better.org>
Date: Fri, 18 May 2018 01:35:31 +0200
Subject: [PATCH 0896/1085] lighttpd: add option to enable WebDAV (#40623)

---
 pkgs/servers/http/lighttpd/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 7bf1b1ffa64..31b3449d5f6 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -2,11 +2,14 @@
 , openssl, enableMagnet ? false, lua5_1 ? null
 , enableMysql ? false, mysql ? null
 , enableLdap ? false, openldap ? null
+, enableWebDAV ? true, sqlite ? null, libuuid ? null
 }:
 
 assert enableMagnet -> lua5_1 != null;
 assert enableMysql -> mysql != null;
 assert enableLdap -> openldap != null;
+assert enableWebDAV -> sqlite != null;
+assert enableWebDAV -> libuuid != null;
 
 stdenv.mkDerivation rec {
   name = "lighttpd-1.4.49";
@@ -20,12 +23,16 @@ stdenv.mkDerivation rec {
   buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ]
              ++ stdenv.lib.optional enableMagnet lua5_1
              ++ stdenv.lib.optional enableMysql mysql.connector-c
-             ++ stdenv.lib.optional enableLdap openldap;
+             ++ stdenv.lib.optional enableLdap openldap
+             ++ stdenv.lib.optional enableWebDAV sqlite
+             ++ stdenv.lib.optional enableWebDAV libuuid;
 
   configureFlags = [ "--with-openssl" ]
                 ++ stdenv.lib.optional enableMagnet "--with-lua"
                 ++ stdenv.lib.optional enableMysql "--with-mysql"
-                ++ stdenv.lib.optional enableLdap "--with-ldap";
+                ++ stdenv.lib.optional enableLdap "--with-ldap"
+                ++ stdenv.lib.optional enableWebDAV "--with-webdav-props"
+                ++ stdenv.lib.optional enableWebDAV "--with-webdav-locks";
 
   preConfigure = ''
     sed -i "s:/usr/bin/file:${file}/bin/file:g" configure
-- 
GitLab


From 3a5fcbbd911b0ee2a82903bacb06e4c508d7c1b3 Mon Sep 17 00:00:00 2001
From: Herdiansyah <herdiansyah@netc.eu>
Date: Fri, 18 May 2018 06:41:03 +0700
Subject: [PATCH 0897/1085] neofetch: 3.4.0 -> 4.0.0 (#40651)

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

diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index 097eb2408f8..cece77b8d3e 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "neofetch-${version}";
-  version = "3.4.0";
+  version = "4.0.0";
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "neofetch";
     rev = version;
-    sha256 = "10h4f7n6bllbq459nm9wppvk65n81zzv556njfqplzw3mpdrbiyx";
+    sha256 = "1ijg6fmrqjgn87899q8cpbir93hqrq4070wzm62s9nmggdgzx6mn";
   };
 
   dontBuild = true;
-- 
GitLab


From 63f2c2f73f4436e5a334814c3bd0b4c88c29750e Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Wed, 14 Mar 2018 13:10:59 +0700
Subject: [PATCH 0898/1085] ape: init at 6.7-131003

---
 pkgs/applications/misc/ape/apeclex.nix |  8 +++++
 pkgs/applications/misc/ape/clex.nix    | 25 ++++++++++++++
 pkgs/applications/misc/ape/default.nix | 45 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  4 +++
 4 files changed, 82 insertions(+)
 create mode 100644 pkgs/applications/misc/ape/apeclex.nix
 create mode 100644 pkgs/applications/misc/ape/clex.nix
 create mode 100644 pkgs/applications/misc/ape/default.nix

diff --git a/pkgs/applications/misc/ape/apeclex.nix b/pkgs/applications/misc/ape/apeclex.nix
new file mode 100644
index 00000000000..710ddfec994
--- /dev/null
+++ b/pkgs/applications/misc/ape/apeclex.nix
@@ -0,0 +1,8 @@
+{ stdenv, attemptoClex, callPackage }:
+
+callPackage ./. {
+  pname = "ape-clex";
+  lexicon = "${attemptoClex}/clex_lexicon.pl";
+  description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)";
+  license = with stdenv.lib; [ licenses.lgpl3 licenses.gpl3 ];
+}
diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix
new file mode 100644
index 00000000000..37d140e19ba
--- /dev/null
+++ b/pkgs/applications/misc/ape/clex.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "attempto-clex-${version}";
+  version = "5133afe";
+
+  src = fetchFromGitHub {
+     owner = "Attempto";
+     repo = "Clex";
+     rev = version;
+     sha256 = "0p9s64g1jic213bwm6347jqckszgnni9szrrz31qjgaf32kf7nkp";
+  };
+
+  installPhase = ''
+    mkdir -p $out
+    cp clex_lexicon.pl $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Large lexicon for APE (~100,000 entries)";
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ yrashk ];
+  };
+}
diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix
new file mode 100644
index 00000000000..e78ba2df999
--- /dev/null
+++ b/pkgs/applications/misc/ape/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, swiProlog, makeWrapper,
+  fetchFromGitHub,
+  lexicon ? "lexicon/clex_lexicon.pl",
+  pname ? "ape",
+  description ? "Parser for Attempto Controlled English (ACE)",
+  license ? with stdenv.lib; licenses.lgpl3
+  }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "6.7-131003";
+
+  buildInputs = [ swiProlog makeWrapper ];
+
+  src = fetchFromGitHub {
+     owner = "Attempto";
+     repo = "APE";
+     rev = version;
+     sha256 = "0cw47qjg4896kw3vps6rfs02asvscsqvcfdiwgfmqb3hvykb1sdx";
+  };
+
+  patchPhase = ''
+    # We move the file first to avoid "same file" error in the default case
+    cp ${lexicon} new_lexicon.pl
+    rm lexicon/clex_lexicon.pl
+    cp new_lexicon.pl lexicon/clex_lexicon.pl
+  '';
+
+  buildPhase = ''
+    make build
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ape.exe $out
+    makeWrapper $out/ape.exe $out/bin/ape --add-flags ace
+  '';
+
+  meta = with stdenv.lib; {
+    description = description;
+    license = license;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ yrashk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 698a0c8ed30..64cdad2282b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21457,6 +21457,10 @@ with pkgs;
 
   teseq = callPackage ../applications/misc/teseq {  };
 
+  ape = callPackage ../applications/misc/ape { };
+  attemptoClex = callPackage ../applications/misc/ape/clex.nix { };
+  apeClex = callPackage ../applications/misc/ape/apeclex.nix { };
+
   # Unix tools
   unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
   inherit (unixtools) hexdump ps logger eject umount
-- 
GitLab


From e63bc58d7bb22b40e61a6af2ce9dff5e6dc5b5d9 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Fri, 18 May 2018 11:45:25 +0300
Subject: [PATCH 0899/1085] iosevka: 1.14.2 -> 1.14.3

---
 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 657eb80c539..4fc47793661 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -26,13 +26,13 @@ in
 let pname = if set != null then "iosevka-${set}" else "iosevka"; in
 
 let
-  version = "1.14.2";
+  version = "1.14.3";
   name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "be5invis";
     repo ="Iosevka";
     rev = "v${version}";
-    sha256 = "18vh5rjffqgiliyfia40lh7cygz6fv3rwgq28fxl26i9sc95qsqd";
+    sha256 = "0ba8hwxi88bp2jb9xfhk95nnlv8ykl74cv62xr4ybzm3b8ahpwqf";
   };
 in
 
-- 
GitLab


From e44659509f68e65078d3d57f4ac4fc305c5c420a Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Fri, 18 May 2018 11:46:25 +0300
Subject: [PATCH 0900/1085] iosevka-bin: 1.14.0 -> 1.14.3

---
 pkgs/data/fonts/iosevka/bin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 1571f8e573d..95093f4eefc 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "1.14.0";
+  version = "1.14.3";
 in fetchzip rec {
   name = "iosevka-bin-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip rec {
     unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
   '';
 
-  sha256 = "03zgh5dfx58sxrprhqi8cyc18sh05k84yc262bn81vavl6lm14ns";
+  sha256 = "0qc5i6ijr25d2jwi5r4bcvbaw74y1p05a5fvlwss3l9rhmmxsfpl";
 
   meta = with stdenv.lib; {
     homepage = https://be5invis.github.io/Iosevka/;
-- 
GitLab


From a270cbde1847742f3e63dc9cc863819bd6776110 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 May 2018 01:59:19 -0700
Subject: [PATCH 0901/1085] lsscsi: 0.28 -> 0.29 (#40663)

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

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

These checks were done:

- built on NixOS
- /nix/store/2z22y23xx308psxsxn605hsizfhll3jd-lsscsi-0.29/bin/lsscsi passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.29 with grep in /nix/store/2z22y23xx308psxsxn605hsizfhll3jd-lsscsi-0.29
- directory tree listing: https://gist.github.com/8a27d93aa9459ec96b068a78e73f6f1c
- du listing: https://gist.github.com/1c65dda6f5dc9d0ef0fa880d016dc260
---
 pkgs/os-specific/linux/lsscsi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix
index 084a7e7c9a3..d250d658282 100644
--- a/pkgs/os-specific/linux/lsscsi/default.nix
+++ b/pkgs/os-specific/linux/lsscsi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "lsscsi-0.28";
+  name = "lsscsi-0.29";
 
   src = fetchurl {
-    url = "http://sg.danny.cz/scsi/lsscsi-0.28.tgz";
-    sha256 = "0l6xz8545lnfd9f4z974ar1pbzfdkr6c8r56zjrcaazl3ad00p82";
+    url = "http://sg.danny.cz/scsi/lsscsi-0.29.tgz";
+    sha256 = "0538fjgxky03yn7mzyslkyi2af3yy5llsnjjcgjx73x08wd6hv5n";
   };
 
   preConfigure = ''
-- 
GitLab


From d5662440393578659cc2d668274b77af9c7fe04b Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin+git@pm.me>
Date: Fri, 18 May 2018 11:04:13 +0200
Subject: [PATCH 0902/1085] typora: 0.9.47 -> 0.9.48 (#40714)

---
 pkgs/applications/editors/typora/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index d687712fc08..ed4aefd90bc 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, atk, cairo
+{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gtk3, atk, cairo
 , freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev }:
 
 stdenv.mkDerivation rec {
   name = "typora-${version}";
-  version = "0.9.47";
+  version = "0.9.48";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
-        sha256 = "431741948f5a2faba04984c495bea56b4a800c6dbb7e21e24ad3124fb8ffcbc9";
+        sha256 = "36a7c5f855306bcbe3364d12aca94c2f6d013a013e59b46f89df81496ec11800";
       }
     else
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_i386.deb";
-        sha256 = "a95c8c1e296d8587a4dc6182af3b24253c3c2abc991badb7c758cd6d1bf5b1b6";
+        sha256 = "7197c526918a791b15b701846f9f2f1747a5b8ceac77c4cba691ee6d74d07d1d";
       }
     ;
 
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
       gnome2.gdk_pixbuf
       gnome2.pango
       expat
+      gtk3
       atk
       nspr
       nss
-- 
GitLab


From 73a12c0403831756977a3c326caa716633bafe14 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 May 2018 02:18:12 -0700
Subject: [PATCH 0903/1085] duperemove: 0.10 -> 0.11 (#40684)

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/mcgis270lv4waah1f68insh0n8j7ja52-duperemove-0.11/bin/btrfs-extent-same had a zero exit code or showed the expected version
- /nix/store/mcgis270lv4waah1f68insh0n8j7ja52-duperemove-0.11/bin/duperemove passed the binary check.
- /nix/store/mcgis270lv4waah1f68insh0n8j7ja52-duperemove-0.11/bin/hashstats passed the binary check.
- /nix/store/mcgis270lv4waah1f68insh0n8j7ja52-duperemove-0.11/bin/show-shared-extents passed the binary check.
- 2 of 4 passed binary check by having a zero exit code.
- 2 of 4 passed binary check by having the new version present in output.
- found 0.11 with grep in /nix/store/mcgis270lv4waah1f68insh0n8j7ja52-duperemove-0.11
- directory tree listing: https://gist.github.com/0df1e551a8c77ca4dd4bb8f2783f75c4
- du listing: https://gist.github.com/4dc88fc1b6adba1caf3a67e67383c3c9
---
 pkgs/tools/filesystems/duperemove/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix
index 613ab7bab1e..4e71d910a5d 100644
--- a/pkgs/tools/filesystems/duperemove/default.nix
+++ b/pkgs/tools/filesystems/duperemove/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "duperemove-${version}";
-  version = "0.10";
+  version = "0.11";
 
   src = fetchFromGitHub {
     owner = "markfasheh";
     repo = "duperemove";
     rev = "v${version}";
-    sha256 = "1fll0xjg1p3pabgjiddild4ragk9spbdmdzrkq0hv5pxb1qrv7lp";
+    sha256 = "09bwpsvnppl9bm2l5pym5673x04ah3hddb0xip61gdq8ws3ri5yj";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 05a6e94f3437af6c28fa8b794136e193553e98c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 18 May 2018 12:07:01 +0200
Subject: [PATCH 0904/1085] inkscape: disable parallelBuilding

Try to avoid non-deterministic build failure.
---
 pkgs/applications/graphics/inkscape/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 5978612fdf3..de4849e2162 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -51,7 +51,9 @@ stdenv.mkDerivation rec {
     libvisio libcdr libexif potrace python2Env icu
   ];
 
-  enableParallelBuilding = true;
+  # To avoid non-deterministic build failure using make.
+  # When switching back to cmake turn parallel back on, see #40046.
+  enableParallelBuilding = false;
 
   preConfigure = ''
     intltoolize -f
-- 
GitLab


From 31712afa7b08a46c8e393a1b63c9fbae576762e6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 18 May 2018 14:24:35 +0200
Subject: [PATCH 0905/1085] androidStudioPackages.{dev,canary}: 3.2.0.13 ->
 3.2.0.14

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 328370c2501..ecc6e244a58 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk";
   };
   latestVersion = {
-    version = "3.2.0.13"; # "Android Studio 3.2 Canary 14"
-    build = "181.4763614";
-    sha256Hash = "1rx3bip5a7v349whg26kxvj05qlvm7zwacfqnfzfmvvhzbh7xnyh";
+    version = "3.2.0.14"; # "Android Studio 3.2 Canary 15"
+    build = "181.4773949";
+    sha256Hash = "10lhy6sdvvh4a8kj8jyk4z9nzh67v8f5zpkwparvk3pb2s5mf3mk";
   };
 in rec {
   # Old alias
-- 
GitLab


From 60216b2f3961be9086c018b52f45f41d866df982 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 18 May 2018 13:45:20 +0100
Subject: [PATCH 0906/1085] libsForQt5.libkdegames: init at 18.04.1

---
 pkgs/applications/kde/default.nix     |  1 +
 pkgs/applications/kde/libkdegames.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/kde/libkdegames.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index f602e5c92d9..14a4e597760 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -140,6 +140,7 @@ let
       libgravatar = callPackage ./libgravatar.nix {};
       libkcddb = callPackage ./libkcddb.nix {};
       libkdcraw = callPackage ./libkdcraw.nix {};
+      libkdegames = callPackage ./libkdegames.nix {};
       libkdepim = callPackage ./libkdepim.nix {};
       libkexiv2 = callPackage ./libkexiv2.nix {};
       libkgapi = callPackage ./libkgapi.nix {};
diff --git a/pkgs/applications/kde/libkdegames.nix b/pkgs/applications/kde/libkdegames.nix
new file mode 100644
index 00000000000..494b193b832
--- /dev/null
+++ b/pkgs/applications/kde/libkdegames.nix
@@ -0,0 +1,26 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, kdoctools
+, kdelibs4support
+, qtdeclarative
+, kdeclarative
+, kdnssd
+, knewstuff
+, openal
+, libsndfile
+, qtquickcontrols
+}:
+
+mkDerivation {
+  name = "libkdegames";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kdelibs4support qtdeclarative kdeclarative kdnssd knewstuff openal libsndfile
+    qtquickcontrols
+  ];
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ lheckemann ];
+  };
+}
-- 
GitLab


From 9eb61e8408115a5ca6b82cf0bdd83c3988a6f48c Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 18 May 2018 13:46:12 +0100
Subject: [PATCH 0907/1085] kdeApplications.konquest: init at 2.4

---
 pkgs/applications/kde/default.nix  |  1 +
 pkgs/applications/kde/konquest.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/kde/konquest.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 14a4e597760..8f64c884931 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -127,6 +127,7 @@ let
       konsole = callPackage ./konsole.nix {};
       kontact = callPackage ./kontact.nix {};
       kontactinterface = callPackage ./kontactinterface.nix {};
+      konquest = callPackage ./konquest.nix {};
       korganizer = callPackage ./korganizer.nix {};
       kpimtextedit = callPackage ./kpimtextedit.nix {};
       ksmtp = callPackage ./ksmtp {};
diff --git a/pkgs/applications/kde/konquest.nix b/pkgs/applications/kde/konquest.nix
new file mode 100644
index 00000000000..cfef018de6c
--- /dev/null
+++ b/pkgs/applications/kde/konquest.nix
@@ -0,0 +1,18 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, kdoctools
+, kdelibs4support
+, libkdegames
+, qtquickcontrols
+}:
+
+mkDerivation {
+  name = "konquest";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kdelibs4support libkdegames qtquickcontrols ];
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ lheckemann ];
+  };
+}
-- 
GitLab


From 536a41171b70dd3ef2c064d11705d11ee86f3269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philippe=20Gr=C3=A9goire?= <pg@pgregoire.xyz>
Date: Fri, 18 May 2018 09:53:04 -0400
Subject: [PATCH 0908/1085] Remove all references to absent nixos-prepare-root

Fixes the broken 0f5d5970b28c9d85e7166f85ecfa3f86064d3f25 commit.
---
 nixos/modules/installer/tools/tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index beac9e29d59..42b00b2025d 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -76,7 +76,7 @@ in
       ];
 
     system.build = {
-      inherit nixos-install nixos-prepare-root nixos-generate-config nixos-option nixos-rebuild nixos-enter;
+      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter;
     };
 
   };
-- 
GitLab


From 82fbc339a5b8e6c74b259306d3a0bcf414fe869d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 06:43:34 -0700
Subject: [PATCH 0909/1085] jhiccup: 2.0.8 -> 2.0.9

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/di6qgm16dycmq6xg4jhwbmin207kykkr-jhiccup-2.0.9/bin/jHiccup had a zero exit code or showed the expected version
- /nix/store/di6qgm16dycmq6xg4jhwbmin207kykkr-jhiccup-2.0.9/bin/jHiccupLogProcessor passed the binary check.
- 1 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.0.9 with grep in /nix/store/di6qgm16dycmq6xg4jhwbmin207kykkr-jhiccup-2.0.9
- directory tree listing: https://gist.github.com/83abe7e20b3fd3db4dd38e3223479de0
- du listing: https://gist.github.com/196b47d4bb8d9ecf736bb2a7be08ce2c
---
 pkgs/development/tools/java/jhiccup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix
index 03aa841dc7b..39b57302337 100644
--- a/pkgs/development/tools/java/jhiccup/default.nix
+++ b/pkgs/development/tools/java/jhiccup/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jhiccup-${version}";
-  version = "2.0.8";
+  version = "2.0.9";
 
   src = fetchzip {
     url    = "https://www.azul.com/files/jHiccup-${version}-dist.zip";
-    sha256 = "1q4wd5ywisgh0f4ic7iglxai0gc8mnl1pkjw1hm1xdij8j5i488g";
+    sha256 = "1y089kzj191j3vclkma4vi1w66pw4jqrnm5z0qw264wqcn0hnq11";
   };
 
   configurePhase = ":";
-- 
GitLab


From 364f922cbf9c30d30f8da30792825fa441ddde1e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 06:30:10 -0700
Subject: [PATCH 0910/1085] gtkwave: 3.3.89 -> 3.3.90

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

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

These checks were done:

- built on NixOS
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/evcd2vcd passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/fst2vcd passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vcd2fst passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/fstminer passed the binary check.
- Warning: no invocation of /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/ghwdump had a zero exit code or showed the expected version
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/lxt2miner passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/lxt2vcd passed the binary check.
- Warning: no invocation of /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/shmidcat had a zero exit code or showed the expected version
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vcd2lxt passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vcd2lxt2 passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vcd2vzt passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vzt2vcd passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vztminer passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/gtkwave passed the binary check.
- Warning: no invocation of /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/twinwave had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/rtlbrowse had a zero exit code or showed the expected version
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vermin passed the binary check.
- 13 of 17 passed binary check by having a zero exit code.
- 0 of 17 passed binary check by having the new version present in output.
- found 3.3.90 with grep in /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90
- directory tree listing: https://gist.github.com/cf30f5f6dd398a3083156aed84f02f36
- du listing: https://gist.github.com/6d77f0a1fdfe06cfe325c3873fdfd97c
---
 pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 671c53365ab..4ca489c40b3 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtkwave-${version}";
-  version = "3.3.89";
+  version = "3.3.90";
 
   src = fetchurl {
     url    = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "1j7byy0kmapa66dp17gjvs4pa4gckjccljydixswdknpxs5ma45g";
+    sha256 = "1q1fi0nqja9d8xj24h7ykvnpms6zqgn24jmyj1mxn48qig301c6m";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From e80957d5163932c9cc46bfd8b20878a3a0e9a136 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 May 2018 08:21:25 -0700
Subject: [PATCH 0911/1085] imagemagick7: 7.0.7-29 -> 7.0.7-32 (#40669)

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

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

These checks were done:

- built on NixOS
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/animate passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/compare passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/composite passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/conjure passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/convert passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/display passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/identify passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/import passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/magick-script passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/mogrify passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/montage passed the binary check.
- Warning: no invocation of /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/stream had a zero exit code or showed the expected version
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/magick passed the binary check.
- 12 of 13 passed binary check by having a zero exit code.
- 0 of 13 passed binary check by having the new version present in output.
- found 7.0.7-32 with grep in /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32
- directory tree listing: https://gist.github.com/f22a02931178895b4d9ac8401f7d6eb8
- du listing: https://gist.github.com/d5150ae0b886668b2b42f583409a14a4
---
 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 65a3238ef57..1a9bb44cabb 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.7-29";
-    sha256 = "0jfpfydz50zxs776knz6w2f5g0l4nhivp9g1fz4cf5clgjcpa3z6";
+    version = "7.0.7-32";
+    sha256 = "1i3rvq0f4lq1las4g12ipfs6h5vyngwh5fllvynpci2lh32gd48j";
     patches = [];
   };
 in
-- 
GitLab


From e8b8ba148e6966b367e293d85b0b2bb15a02e472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 18 May 2018 12:28:16 -0300
Subject: [PATCH 0912/1085] enlightenment: add xkeyboard-config dependency
 (#40690)

- Add runtime dependence on xkeyboard-config

- Add base.lst from xkeyboard-config to the list of keyboard layout
files. Something similar to this has been removed in a previous patch
by mistake.

- Fix location of binary edge_cc. This has been removed in a previous
patch by mastake.

- Make the explanation for the wrapping of some binaries more clear.
---
 pkgs/desktops/enlightenment/enlightenment.nix | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index b0fd5f3db2b..dc538625bf0 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -35,15 +35,44 @@ stdenv.mkDerivation rec {
     gdbm
     pcre
     mesa_noglu
+    xkeyboard_config
   ] ++
     stdenv.lib.optionals stdenv.isLinux [ libcap ];
 
-  # Instead of setting owner to root and permissions to setuid/setgid
-  # (which is not allowed for files in /nix/store) of some
-  # enlightenment programs, the file $out/e-wrappers.nix is created,
-  # containing the needed configuration for that purpose. It can be
-  # used in the enlightenment module.
-  patches = [ ./enlightenment.suid-exes.patch ];
+  patches = [
+    # Some programs installed by enlightenment (to set the cpu frequency,
+    # for instance) need root ownership and setuid/setgid permissions, which
+    # are not allowed for files in /nix/store. Instead of allowing the
+    # installer to try to do this, the file $out/e-wrappers.nix is created,
+    # containing the needed configuration for wrapping those programs. It
+    # can be used in the enlightenment module. The idea is:
+    # 
+    #  1) rename the original binary adding the extension .orig
+    #  2) wrap the renamed binary at /run/wrappers/bin/
+    #  3) create a new symbolic link using the original binary name (in the
+    #     original directory where enlightenment wants it) pointing to the
+    #     wrapper
+
+    ./enlightenment.suid-exes.patch
+  ];
+
+  postPatch = ''
+    # In order to get the available keyboard layouts Enlightenment looks for
+    # the file xorg.lst, that should be provided by xkeyboard-config (when
+    # configured with option --with-xkb-rules-symlink=xorg). Currently
+    # xkeyboard-config is not configured with this option in
+    # NixOS. Therefore it is needed to add base.lst (which xorg.lst would be
+    # a symbolic link to) explicitly as an alternative.
+
+    sed "/#ifdef XKB_BASE/a XKB_BASE \"\/rules\/base.lst\"," \
+      -i src/modules/wizard/page_011.c src/modules/xkbswitch/e_mod_parse.c
+
+    # edge_cc is a binary provided by efl and cannot be found at the directory
+    # given by e_prefix_bin_get(), which is $out/bin
+
+    substituteInPlace src/bin/e_import_config_dialog.c \
+      --replace "e_prefix_bin_get()" "\"${efl}/bin\""
+  '';
 
   mesonFlags = [ "-Dsystemdunitdir=lib/systemd/user" ];
 
-- 
GitLab


From 218b60b85d807092cec43d1a3de8d71ccb24ed81 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 May 2018 08:34:52 -0700
Subject: [PATCH 0913/1085] ace: 6.4.7 -> 6.4.8 (#40696)

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

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

These checks were done:

- built on NixOS
- /nix/store/2bjwljxg8xr8f44h622mqc3xacy9419y-ace-6.4.8/bin/ace_gperf passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 6.4.8 with grep in /nix/store/2bjwljxg8xr8f44h622mqc3xacy9419y-ace-6.4.8
- directory tree listing: https://gist.github.com/246159b0e45b5fe1369de042fd0534cf
- du listing: https://gist.github.com/dc07102e153c9c3a7f97e1fe743aed1b
---
 pkgs/development/libraries/ace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index d61315f7db8..e428b9a8c78 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ace-${version}";
-  version = "6.4.7";
+  version = "6.4.8";
 
   src = fetchurl {
     url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
-    sha256 = "1zbncdxkkwnx4aphy0apnp7xn4aspxvq2h9bbjh33dpsy0j81afd";
+    sha256 = "190cyfs2najph2yycyj8abzddwa8s4wx8lx38iv237plwfl2308g";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 2921c447d4fdd7d0aabdf0572099c311bfa6c8e5 Mon Sep 17 00:00:00 2001
From: Thomas Kerber <tk@drwx.org>
Date: Fri, 18 May 2018 18:09:48 +0200
Subject: [PATCH 0914/1085] astroid: 0.10.2 -> 0.11.1 (#40720)

---
 .../networking/mailreaders/astroid/default.nix   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 610b16dab5b..9a348fc03f7 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3
-, libsass, notmuch, boost, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3
+, libsass, notmuch, boost, wrapGAppsHook, glib-networking }:
 
 stdenv.mkDerivation rec {
   name = "astroid-${version}";
-  version = "0.10.2";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "astroidmail";
     repo = "astroid";
     rev = "v${version}";
-    sha256 = "0y1i40xbjjvnylqpdkvj0m9fl6f5k9zk1z4pqg3vhj8x1ys8am1c";
+    sha256 = "1z48rvlzwi7bq7j55rnb0gg1a4k486yj910z2cxz1p46lxk332j1";
   };
 
-  nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
 
   buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas
-                  notmuch boost gnome3.gsettings-desktop-schemas ];
-
-  buildPhase = "scons --propagate-environment --prefix=$out build";
-  installPhase = "scons --propagate-environment --prefix=$out install";
+                  notmuch boost gnome3.gsettings-desktop-schemas
+                  glib-networking ];
 
   meta = with stdenv.lib; {
     homepage = https://astroidmail.github.io/;
-- 
GitLab


From 641a62305305692c294ab3f67c597bc90067a667 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 18 May 2018 18:24:53 +0200
Subject: [PATCH 0915/1085] nixos/xss-lock: add module (#40619)

`xsslock` (which was originally packaged in 6cb1d1aaaf02a72329bedf9c6960e54fea6f5c6e)
is a simple screensaver which connects a given screen locker (e.g.
`i3lock`) with `logind`. Whenever `loginctl lock-sessions` is invoked
the locker will be used to lock the screen. This works with its power
management features (e.g. `lid switch`) as well, so the PC can be locked
automatically when the lid is closed.

The module can be used like this:

```
{
  services.xserver.enable = true;

  programs.xss-lock.enable = true;
  programs.xss-lock.lockerCommand = "i3lock";
}
```
---
 nixos/modules/module-list.nix       |  1 +
 nixos/modules/programs/xss-lock.nix | 26 ++++++++++++++++++++++++++
 nixos/release.nix                   |  1 +
 nixos/tests/xss-lock.nix            | 25 +++++++++++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 nixos/modules/programs/xss-lock.nix
 create mode 100644 nixos/tests/xss-lock.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6fe29af3a00..d5cfd87520c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -122,6 +122,7 @@
   ./programs/wireshark.nix
   ./programs/xfs_quota.nix
   ./programs/xonsh.nix
+  ./programs/xss-lock.nix
   ./programs/yabar.nix
   ./programs/zsh/oh-my-zsh.nix
   ./programs/zsh/zsh.nix
diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix
new file mode 100644
index 00000000000..49d522c604f
--- /dev/null
+++ b/nixos/modules/programs/xss-lock.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.xss-lock;
+in
+{
+  options.programs.xss-lock = {
+    enable = mkEnableOption "xss-lock";
+    lockerCommand = mkOption {
+      example = "xlock";
+      type = types.string;
+      description = "Locker to be used with xsslock";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.xss-lock = {
+      description = "XSS Lock Daemon";
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
+      serviceConfig.ExecStart = "${pkgs.xss-lock}/bin/xss-lock ${cfg.lockerCommand}";
+    };
+  };
+}
diff --git a/nixos/release.nix b/nixos/release.nix
index 4c0bb7bfb75..f7c2943b96f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -402,6 +402,7 @@ in rec {
   tests.xfce = callTest tests/xfce.nix {};
   tests.xmonad = callTest tests/xmonad.nix {};
   tests.xrdp = callTest tests/xrdp.nix {};
+  tests.xss-lock = callTest tests/xss-lock.nix {};
   tests.yabar = callTest tests/yabar.nix {};
   tests.zookeeper = callTest tests/zookeeper.nix {};
 
diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix
new file mode 100644
index 00000000000..3e3864cab77
--- /dev/null
+++ b/nixos/tests/xss-lock.nix
@@ -0,0 +1,25 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+
+with lib;
+
+{
+  name = "xss-lock";
+  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
+
+  machine = {
+    imports = [ ./common/x11.nix ./common/user-account.nix ];
+    programs.xss-lock.enable = true;
+    programs.xss-lock.lockerCommand = "${pkgs.xlockmore}/bin/xlock";
+    services.xserver.displayManager.auto.user = "alice";
+  };
+
+  testScript = ''
+    $machine->start;
+    $machine->waitForX;
+    $machine->waitForUnit("xss-lock.service", "alice");
+
+    $machine->fail("pgrep xlock");
+    $machine->succeed("su -l alice -c 'xset dpms force standby'");
+    $machine->succeed("pgrep xlock");
+  '';
+})
-- 
GitLab


From 0f8749b092d8b28c91255546892d7af6643ff617 Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Fri, 18 May 2018 07:16:34 +0000
Subject: [PATCH 0916/1085] udono: Add myself to maintainer list

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 790b72c039e..9fa89838d16 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3895,6 +3895,11 @@
     github = "typetetris";
     name = "Eric Wolf";
   };
+  udono = {
+    email = "udono@virtual-things.biz";
+    github = "udono";
+    name = "Udo Spallek";
+  };
   unode = {
     email = "alves.rjc@gmail.com";
     github = "unode";
-- 
GitLab


From 31ebb53b1205260fb1bc875831ab50f650355787 Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Fri, 18 May 2018 09:34:12 +0000
Subject: [PATCH 0917/1085] pythonPackages goocalendar: init at 0.3

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

diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix
new file mode 100644
index 00000000000..f6e67ad4392
--- /dev/null
+++ b/pkgs/development/python-modules/goocalendar/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, pkgconfig
+, gtk3
+, gobjectIntrospection
+, pygtk
+, pygobject3
+, goocanvas2
+, isPy3k
+ }:
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+  pname = "GooCalendar";
+  version = "0.3";
+
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1p7qbcv06xipg48sgpdlqf72ajl3n1qlypcc0giyi1a72zpyf823";
+  };
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  propagatedBuildInputs = [
+    pygtk
+    pygobject3
+  ];
+  buildInputs = [
+    gtk3
+    goocanvas2
+  ];
+
+  # No upstream tests available
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A calendar widget for GTK using PyGoocanvas.";
+    homepage    = https://goocalendar.tryton.org/;
+    license     = licenses.gpl2;
+    maintainers = [ maintainers.udono ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ca5cfb677a2..4e30f2057f5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -253,6 +253,8 @@ in {
 
   globus-sdk = callPackage ../development/python-modules/globus-sdk { };
 
+  goocalendar = callPackage ../development/python-modules/goocalendar { };
+
   gssapi = callPackage ../development/python-modules/gssapi { };
 
   h5py = callPackage ../development/python-modules/h5py {
-- 
GitLab


From 5a3ccf19c4cc5503bc1196dfdee42b32362dd2a9 Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Fri, 18 May 2018 17:07:59 +0000
Subject: [PATCH 0918/1085] pythonPackages cdecimal: init at 2.3

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

diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix
new file mode 100644
index 00000000000..2c0b0e623ca
--- /dev/null
+++ b/pkgs/development/python-modules/cdecimal/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, wget, buildPythonPackage, isPy3k }:
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+  pname = "cdecimal";
+  version = "2.3";
+
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url="http://www.bytereef.org/software/mpdecimal/releases/${pname}-${version}.tar.gz";
+    sha256 = "d737cbe43ed1f6ad9874fb86c3db1e9bbe20c0c750868fde5be3f379ade83d8b";
+  };
+
+  # Upstream tests are not included s. a. http://www.bytereef.org/mpdecimal/testing.html
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Fast drop-in replacement for decimal.py";
+    homepage    = http://www.bytereef.org/mpdecimal/;
+    license     = licenses.bsd2;
+    maintainers = [ maintainers.udono ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4e30f2057f5..998aac285c4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -223,6 +223,8 @@ in {
 
   bugseverywhere = callPackage ../applications/version-management/bugseverywhere {};
 
+  cdecimal = callPackage ../development/python-modules/cdecimal { };
+
   dendropy = callPackage ../development/python-modules/dendropy { };
 
   dbf = callPackage ../development/python-modules/dbf { };
-- 
GitLab


From 2a1c4bf07a8119e0208b067be48d5772ae767abf Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Mon, 14 May 2018 18:16:09 +0000
Subject: [PATCH 0919/1085] tryton: 4.6 -> 4.8

Major upstream release.
Use GTK-3.
Use extras-depends: cdecimal, goocalendar
---
 pkgs/applications/office/tryton/default.nix | 37 +++++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix
index 51d5b083e6b..0df9fd899dc 100644
--- a/pkgs/applications/office/tryton/default.nix
+++ b/pkgs/applications/office/tryton/default.nix
@@ -1,22 +1,45 @@
-{ stdenv, fetchurl, python2Packages, librsvg }:
+{ stdenv
+, python2Packages
+, pkgconfig
+, librsvg
+, gobjectIntrospection
+, atk
+, gtk3
+, gtkspell3
+, gnome3
+, goocanvas2
+}:
 
 with stdenv.lib;
 
 python2Packages.buildPythonApplication rec {
-  name = "tryton-${version}";
-  version = "4.6.2";
-  src = fetchurl {
-    url = "mirror://pypi/t/tryton/${name}.tar.gz";
-    sha256 = "0bamr040np02gfjk8c734rw3mbgg75irfgpdcl2npgkdzyw1ksf9";
+  pname = "tryton";
+  version = "4.8.0";
+  src = python2Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "1ywgna4hhmji8pfrwhdfj1ns49vs9nwppqb7iy7jr27wrxk4bm6b";
   };
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
   propagatedBuildInputs = with python2Packages; [
     chardet
     dateutil
     pygtk
     librsvg
+    pygobject3
+    goocalendar
+    cdecimal
+  ];
+  buildInputs = [
+    atk
+    gtk3
+    gnome3.defaultIconTheme
+    gtkspell3
+    goocanvas2
   ];
   makeWrapperArgs = [
     ''--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"''
+    ''--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH"''
+    ''--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"''
   ];
   meta = {
     description = "The client of the Tryton application platform";
@@ -30,6 +53,6 @@ python2Packages.buildPythonApplication rec {
     '';
     homepage = http://www.tryton.org/;
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.johbo ];
+    maintainers = with maintainers; [ johbo udono ];
   };
 }
-- 
GitLab


From e708c8f120cbcfa7144b89bd3cb2c868cbbb0675 Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Fri, 18 May 2018 15:03:23 +0000
Subject: [PATCH 0920/1085] trytond: 4.6 -> 4.8

Major upstream release.
Use extras-depends: cdecimal html2text ipaddress
---
 pkgs/applications/office/trytond/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix
index efa7f2a410d..31c6a7059fc 100644
--- a/pkgs/applications/office/trytond/default.nix
+++ b/pkgs/applications/office/trytond/default.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 
 python2Packages.buildPythonApplication rec {
-  name = "trytond-${version}";
-  version = "4.6.2";
-  src = fetchurl {
-    url = "mirror://pypi/t/trytond/${name}.tar.gz";
-    sha256 = "0asc3pd37h8ky8j66iqxr0fv0k6mpjcwxwm0xgm5hrdi32l5cdda";
+  pname = "trytond";
+  version = "4.8.0";
+  src = python2Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "114c0ea15b8395117bf8c669b7da8af4961001297fbd034c780a42a40e079e3a";
   };
 
   # Tells the tests which database to use
@@ -25,12 +25,15 @@ python2Packages.buildPythonApplication rec {
     relatorio
     werkzeug
     wrapt
+    ipaddress
 
     # extra dependencies
     bcrypt
     pydot
     python-Levenshtein
     simplejson
+    cdecimal
+    html2text
   ] ++ stdenv.lib.optional withPostgresql psycopg2);
   meta = {
     description = "The server of the Tryton application platform";
@@ -44,6 +47,6 @@ python2Packages.buildPythonApplication rec {
     '';
     homepage = http://www.tryton.org/;
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.johbo ];
+    maintainers = with maintainers; [ udono johbo ];
   };
 }
-- 
GitLab


From 0c30d6597ef1d01d150ce556e1df4717ae45b089 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 18 May 2018 09:05:44 -0500
Subject: [PATCH 0921/1085] xbps: init at 0.52

---
 .../package-management/xbps/cert-paths.patch  | 25 ++++++++++++
 .../tools/package-management/xbps/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 65 insertions(+)
 create mode 100644 pkgs/tools/package-management/xbps/cert-paths.patch
 create mode 100644 pkgs/tools/package-management/xbps/default.nix

diff --git a/pkgs/tools/package-management/xbps/cert-paths.patch b/pkgs/tools/package-management/xbps/cert-paths.patch
new file mode 100644
index 00000000000..569161d9f2e
--- /dev/null
+++ b/pkgs/tools/package-management/xbps/cert-paths.patch
@@ -0,0 +1,25 @@
+From d13a550dbc8876c35b912fe3e0eadd45b278be27 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Fri, 18 May 2018 09:51:48 -0500
+Subject: [PATCH] add certificate path fallbacks
+
+---
+ lib/fetch/common.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/fetch/common.c b/lib/fetch/common.c
+index 94fb2651..79b50115 100644
+--- a/lib/fetch/common.c
++++ b/lib/fetch/common.c
+@@ -1012,6 +1012,8 @@ fetch_ssl_setup_peer_verification(SSL_CTX *ctx, int verbose)
+ 
+ 	if (getenv("SSL_NO_VERIFY_PEER") == NULL) {
+ 		ca_cert_file = getenv("SSL_CA_CERT_FILE");
++		ca_cert_file = ca_cert_file ? ca_cert_file : getenv("NIX_SSL_CERT_FILE");
++		ca_cert_file = ca_cert_file ? ca_cert_file : "/etc/ssl/certs/ca-certificates.crt";
+ 		ca_cert_path = getenv("SSL_CA_CERT_PATH") != NULL ?
+ 		    getenv("SSL_CA_CERT_PATH") : X509_get_default_cert_dir();
+ 		if (verbose) {
+-- 
+2.17.0
+
diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix
new file mode 100644
index 00000000000..b78b0ae110e
--- /dev/null
+++ b/pkgs/tools/package-management/xbps/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }:
+
+stdenv.mkDerivation rec {
+  name = "xbps-${version}";
+  version = "0.52";
+
+  src = fetchFromGitHub {
+    owner = "voidlinux";
+    repo = "xbps";
+    rev = version;
+    sha256 = "1sf6iy9l3dijsczsngzbhksshfm1374g2rrdasc04l6gz35l2cdp";
+  };
+
+  nativeBuildInputs = [ pkgconfig which ];
+
+  buildInputs = [ zlib openssl libarchive ];
+
+  patches = [ ./cert-paths.patch ];
+
+  postPatch = ''
+    # fix unprefixed ranlib (needed on cross)
+    substituteInPlace lib/Makefile \
+      --replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) '
+
+    # Don't try to install keys to /var/db/xbps, put in $out/share for now
+    substituteInPlace data/Makefile \
+      --replace '$(DESTDIR)/$(DBDIR)' '$(DESTDIR)/$(SHAREDIR)'
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/voidlinux/xbps;
+    description = "The X Binary Package System";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64cdad2282b..7290f39927d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21257,6 +21257,8 @@ with pkgs;
 
   xboxdrv = callPackage ../misc/drivers/xboxdrv { };
 
+  xbps = callPackage ../tools/package-management/xbps { };
+
   xcftools = callPackage ../tools/graphics/xcftools { };
 
   xhyve = callPackage ../applications/virtualization/xhyve {
-- 
GitLab


From 208abdba78a4f8fe7d0bf9a02dd9462122382e82 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 18 May 2018 12:54:47 -0500
Subject: [PATCH 0922/1085] gllvm: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index 470ba291825..6cf36e44dd1 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "gllvm-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
 
   goPackagePath = "github.com/SRI-CSL/gllvm";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "SRI-CSL";
     repo = "gllvm";
     rev = "v${version}";
-    sha256 = "0779828kzw9ihdnw5r3h2fzzd8ml8cskyf5hmaqqksinjb7bm3is";
+    sha256 = "1rbvn7qhzb7xxqv0wrkwxq4sm657vsl6q7nwrfq2zwb21573811z";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 41ede7f4c48b8973047aaa954e18ffd86a247d95 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 18 May 2018 12:55:04 -0500
Subject: [PATCH 0923/1085] wllvm: 1.2.0 -> 1.2.1

Also add myself as another maintainer.
---
 pkgs/development/tools/wllvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix
index 399a8e66860..8fa7574f311 100644
--- a/pkgs/development/tools/wllvm/default.nix
+++ b/pkgs/development/tools/wllvm/default.nix
@@ -1,20 +1,20 @@
 { stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.2.0";
+  version = "1.2.1";
   pname = "wllvm";
   name = "${pname}-${version}";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1hriyv5gfkcxjqk71l3030qfy3scsjr3mp12hkxfknh65inlqs5z";
+    sha256 = "1yr0gijhgbxx1sl5a8dygr3a8g5wfkh9rk4v789r2aplvcbanv5a";
   };
 
   meta = with stdenv.lib; {
     homepage = https://github.com/travitch/whole-program-llvm;
     description = "A wrapper script to build whole-program LLVM bitcode files";
     license = licenses.mit;
-    maintainers = with maintainers; [ mic92 ];
+    maintainers = with maintainers; [ mic92 dtzWill ];
     platforms = platforms.all;
   };
 }
-- 
GitLab


From a9d3d4dc6dad3e1c95cedd8ddc407b2fe9b6c57c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 18 May 2018 12:42:00 -0500
Subject: [PATCH 0924/1085] xbps: limit to platforms.linux

Darwin is a no-go at least:
https://github.com/NixOS/nixpkgs/pull/40730#issuecomment-390284212
---
 pkgs/tools/package-management/xbps/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix
index b78b0ae110e..dbcd9dafbef 100644
--- a/pkgs/tools/package-management/xbps/default.nix
+++ b/pkgs/tools/package-management/xbps/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/voidlinux/xbps;
     description = "The X Binary Package System";
+    platforms = platforms.linux; # known to not work on Darwin, at least
     license = licenses.bsd2;
     maintainers = with maintainers; [ dtzWill ];
   };
-- 
GitLab


From 5e49920d410b27e9430bfa97f94d40ba67d26666 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Fri, 18 May 2018 20:35:26 +0200
Subject: [PATCH 0925/1085] iasl: 20180313 -> 20180508 (#40613)

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

diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 22f80ae559f..6cf4c85fb20 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "iasl-${version}";
-  version = "20180313";
+  version = "20180508";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm";
+    sha256 = "1n7lqmv77kg28drahvxzybwl9v4hzwi8i7xkpgliclfcp5ff909b";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";
-- 
GitLab


From d33322d449502a5e200f876478ae44dcd049eedd Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 15 May 2018 22:02:00 -0700
Subject: [PATCH 0926/1085] haskellPackages.developPackage: Add a defaulted
 provideDrv argument

The purpose of this argument is to allow you to get at the derivation (rather
than it's env) even when in the evaluation context of a nix-shell invocation.
---
 .../haskell-modules/make-package-set.nix      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index bde4f85f678..bbc3d856ff2 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -176,6 +176,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     #   , source-overrides : Defaulted (Either Path VersionNumber)
     #   , overrides : Defaulted (HaskellPackageOverrideSet)
     #   , modifier : Defaulted
+    #   , returnShellEnv : Defaulted
     #   } -> NixShellAwareDerivation
     # Given a path to a haskell package directory whose cabal file is
     # named the same as the directory name, an optional set of
@@ -183,11 +184,19 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     # function, an optional set of arbitrary overrides, and an optional
     # haskell package modifier,  return a derivation appropriate
     # for nix-build or nix-shell to build that package.
-    developPackage = { root, source-overrides ? {}, overrides ? self: super: {}, modifier ? drv: drv }:
-      let name = builtins.baseNameOf root;
-          drv =
-            (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)).callCabal2nix name root {};
-      in if pkgs.lib.inNixShell then (modifier drv).env else modifier drv;
+    developPackage =
+      { root
+      , source-overrides ? {}
+      , overrides ? self: super: {}
+      , modifier ? drv: drv
+      , returnShellEnv ? pkgs.lib.inNixShell }:
+      let drv =
+        (extensible-self.extend
+           (pkgs.lib.composeExtensions
+              (self.packageSourceOverrides source-overrides)
+              overrides))
+        .callCabal2nix (builtins.baseNameOf root) root {};
+      in if returnShellEnv then (modifier drv).env else modifier drv;
 
     ghcWithPackages = selectFrom: withPackages (selectFrom self);
 
-- 
GitLab


From 986bc559684da28d1ed1883f123b3b98f54b2c5a Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Wed, 16 May 2018 20:46:16 +0200
Subject: [PATCH 0927/1085] slimserver: Relax Audio::Scan dependency bounds

---
 pkgs/servers/slimserver/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 0995ae041bb..f79e53b64cf 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPerlPackage, fetchurl
-, perl, perlPackages }:
+, perl, perlPackages, fetchpatch }:
 
 buildPerlPackage rec {
   name = "slimserver-${version}";
@@ -10,6 +10,11 @@ buildPerlPackage rec {
     sha256 = "0szp5zkmx2b5lncsijf97asjnl73fyijkbgbwkl1i7p8qnqrb4mp";
   };
 
+  patches = [ (fetchpatch {
+    url = "https://github.com/Logitech/slimserver/pull/204.patch";
+    sha256 = "0n1c8nsbvqkmwj5ivkcxh1wkqqm1lwymmfz9i47ih6ifj06hkpxk";
+  } ) ];
+
   buildInputs = [
     perl
     perlPackages.AnyEvent
-- 
GitLab


From 2355a7f0e401043bcc83b4baf6c7142adcc2b0fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 May 2018 13:57:13 -0700
Subject: [PATCH 0928/1085] linuxPackages.wireguard: 0.0.20180420 ->
 0.0.20180514 (#40631)

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/ed69b3dfb89cc9d82136b356d54d21bb
- du listing: https://gist.github.com/0f8c8caf71b9d18efa2341ce03a212f1
---
 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 6e3e444240a..c5daaabd5be 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.20180420";
+  version = "0.0.20180514";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "05nsn5pkzvkfsc8z0mm4fdb1znklpmb00v608j8gxlz8z6nd535m";
+    sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From d44e68c856b1c21c355d79d4016510581de9fe6c Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 18 May 2018 23:01:05 +0200
Subject: [PATCH 0929/1085] prometheus_1: 1.8.1 -> 1.8.2

---
 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 b71d9b8e58b..37d82326cc2 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -45,8 +45,8 @@ let
     } // attrs');
 in rec {
   prometheus_1 = generic {
-    version = "1.8.1";
-    sha256 = "07xvpjhhxc0r73qfmkvf94zhv19zv76privw6blg35k5nxcnj7j4";
+    version = "1.8.2";
+    sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv";
   };
 
   prometheus_2 = generic {
-- 
GitLab


From e3a7d55d3e6bf6243fafcd102ccb886bdb495a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Fri, 18 May 2018 23:06:25 +0200
Subject: [PATCH 0930/1085] nixos/tests/home-assistant: ignore "Timer got out
 of sync" error (#40735)

---
 nixos/tests/home-assistant.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 3d920dccc16..797706a062c 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -71,6 +71,7 @@ in {
     print "$log\n";
 
     # Check that no errors were logged
-    $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR");
+    # The timer can get out of sync due to Hydra's load, so this error is ignored
+    $hass->fail("cat ${configDir}/home-assistant.log | grep -vF 'Timer got out of sync' | grep -qF ERROR");
   '';
 })
-- 
GitLab


From 0828bc5b1fc94abcaf5b9443774909c91d9f1e49 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Thu, 17 May 2018 15:21:23 +0800
Subject: [PATCH 0931/1085] wine: Enable on macOS

---
 pkgs/misc/emulators/wine/base.nix     | 16 ++++++++++------
 pkgs/misc/emulators/wine/packages.nix |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index e0646099415..0ff6f3f041e 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -6,8 +6,6 @@
   buildScript ? null, configureFlags ? ""
 }:
 
-assert stdenv.cc.cc.isGNU or false;
-
 with import ./util.nix { inherit lib; };
 
 stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
@@ -54,9 +52,14 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   ++ lib.optionals xmlSupport    [ pkgs.libxml2 pkgs.libxslt ]
   ++ lib.optionals tlsSupport    [ pkgs.openssl pkgs.gnutls ]
   ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa_noglu.osmesa pkgs.libdrm ]
-  ++ (with pkgs.xorg; [
-    libX11  libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext
-  ])));
+  ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
+     CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security
+     ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon
+  ])
+  ++ lib.optionals stdenv.isLinux  (with pkgs.xorg; [
+     libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext
+  ])
+  ++ [ pkgs.xorg.libX11 ]));
 
   # Wine locates a lot of libraries dynamically through dlopen().  Add
   # them to the RPATH so that the user doesn't have to set them in
@@ -105,7 +108,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
 
   # https://bugs.winehq.org/show_bug.cgi?id=43530
   # https://github.com/NixOS/nixpkgs/issues/31989
-  hardeningDisable = [ "bindnow" ];
+  hardeningDisable = [ "bindnow" ]
+    ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify";
 
   passthru = { inherit pkgArches; };
   meta = {
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index a786babc79d..d2305aa37ba 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -20,7 +20,7 @@ in with src; {
     geckos = [ gecko64 ];
     monos =  [ mono ];
     configureFlags = [ "--enable-win64" ];
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
   wineWow = callPackage ./base.nix {
     name = "wine-wow-${version}";
-- 
GitLab


From bd078c1a313a0eadb8232f3732e9700cc52253b1 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 18 May 2018 17:03:35 -0500
Subject: [PATCH 0932/1085] gcc5: remove patch

The patch fails to apply & may not be necessary any more. Trying to remove it for now just to see.

Hydra log: https://hydra.nixos.org/build/72726891/nixlog/1

Also see #33722

/cc @copumpkin
---
 pkgs/development/compilers/gcc/5/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 443f3a7cf0b..8c1170213f8 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -62,10 +62,6 @@ let version = "5.5.0";
       ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       ++ optional langFortran ../gfortran-driving.patch
-
-      # This could be applied unconditionally but I don't want to cause a full
-      # Linux rebuild.
-      ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch
       ++ optional stdenv.hostPlatform.isMusl (fetchpatch {
         url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff;
         sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm";
-- 
GitLab


From 865abfa6091515da3c776283500e45d489ed488f Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 00:52:41 +0300
Subject: [PATCH 0933/1085] wireguard: Enable tools on other platforms

Wireguard is now split into two pretty much independent packages:
`wireguard` (Linux-specific kernel module) and `wireguard-tools`,
which is cross-platform.
---
 .../modules/services/networking/wireguard.nix |  4 +-
 pkgs/os-specific/linux/wireguard/default.nix  | 76 +++++--------------
 .../networking/wireguard-tools/default.nix    | 46 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 71 insertions(+), 57 deletions(-)
 create mode 100644 pkgs/tools/networking/wireguard-tools/default.nix

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 0591917c742..acb4778d848 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -193,7 +193,7 @@ let
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         environment.DEVICE = name;
-        path = with pkgs; [ kmod iproute wireguard ];
+        path = with pkgs; [ kmod iproute wireguard-tools ];
 
         serviceConfig = {
           Type = "oneshot";
@@ -279,7 +279,7 @@ in
   config = mkIf (cfg.interfaces != {}) {
 
     boot.extraModulePackages = [ kernel.wireguard ];
-    environment.systemPackages = [ pkgs.wireguard ];
+    environment.systemPackages = [ pkgs.wireguard-tools ];
 
     systemd.services = mapAttrs' generateUnit cfg.interfaces;
 
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index c5daaabd5be..c82831782e9 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchurl, libmnl, kernel ? null }:
+{ stdenv, fetchurl, kernel }:
 
 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
-assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
+assert stdenv.lib.versionAtLeast kernel.version "3.10";
 
-let
+stdenv.mkDerivation rec {
   name = "wireguard-${version}";
-
   version = "0.0.20180514";
 
   src = fetchurl {
@@ -13,61 +12,28 @@ let
     sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
   };
 
-  meta = with stdenv.lib; {
-    homepage     = https://www.wireguard.com/;
-    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 zx2c4 ];
-    license      = licenses.gpl2;
-    platforms    = platforms.linux;
-  };
-
-  module = stdenv.mkDerivation {
-    inherit src meta name;
-
-    preConfigure = ''
-      cd src
-      sed -i '/depmod/,+1d' Makefile
-    '';
-
-    hardeningDisable = [ "pic" ];
-
-    KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-    INSTALL_MOD_PATH = "\${out}";
-
-    NIX_CFLAGS = ["-Wno-error=cpp"];
-
-    nativeBuildInputs = kernel.moduleBuildDependencies;
-
-    buildPhase = "make module";
-  };
-
-  tools = stdenv.mkDerivation {
-    inherit src meta name;
+  preConfigure = ''
+    cd src
+    sed -i '/depmod/,+1d' Makefile
+  '';
 
-    preConfigure = "cd src";
+  hardeningDisable = [ "pic" ];
 
-    buildInputs = [ libmnl ];
+  KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+  INSTALL_MOD_PATH = "\${out}";
 
-    enableParallelBuilding = true;
+  NIX_CFLAGS = ["-Wno-error=cpp"];
 
-    makeFlags = [
-      "WITH_BASHCOMPLETION=yes"
-      "WITH_WGQUICK=yes"
-      "WITH_SYSTEMDUNITS=yes"
-      "DESTDIR=$(out)"
-      "PREFIX=/"
-      "-C" "tools"
-    ];
+  nativeBuildInputs = kernel.moduleBuildDependencies;
 
-    buildPhase = "make tools";
+  buildPhase = "make module";
 
-    postInstall = ''
-      substituteInPlace $out/lib/systemd/system/wg-quick@.service \
-        --replace /usr/bin $out/bin
-    '';
+  meta = with stdenv.lib; {
+    homepage     = https://www.wireguard.com/;
+    downloadPage = https://git.zx2c4.com/WireGuard/refs/;
+    description  = " Tools for the WireGuard secure network tunnel";
+    maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
+    license      = licenses.gpl2;
+    platforms    = platforms.linux;
   };
-
-in if kernel == null
-   then tools
-   else module
+}
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
new file mode 100644
index 00000000000..8f983082a80
--- /dev/null
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, lib, fetchurl, libmnl, useSystemd ? stdenv.isLinux }:
+
+let
+  inherit (lib) optional optionalString;
+in
+
+stdenv.mkDerivation rec {
+  name = "wireguard-tools-${version}";
+  version = "0.0.20180514";
+
+  src = fetchurl {
+    url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
+    sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
+  };
+
+  preConfigure = "cd src";
+
+  buildInputs = optional stdenv.isLinux libmnl;
+
+  enableParallelBuilding = true;
+
+  makeFlags = [
+    "WITH_BASHCOMPLETION=yes"
+    "WITH_WGQUICK=yes"
+    "WITH_SYSTEMDUNITS=${if useSystemd then "yes" else "no"}"
+    "DESTDIR=$(out)"
+    "PREFIX=/"
+    "-C" "tools"
+  ];
+
+  buildPhase = "make tools";
+
+  postInstall = optionalString useSystemd ''
+    substituteInPlace $out/lib/systemd/system/wg-quick@.service \
+      --replace /usr/bin $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage     = https://www.wireguard.com/;
+    downloadPage = https://git.zx2c4.com/WireGuard/refs/;
+    description  = " Tools for the WireGuard secure network tunnel";
+    maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
+    license      = licenses.gpl2;
+    platforms    = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7290f39927d..3faf3c346e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5500,6 +5500,8 @@ with pkgs;
 
   whois = callPackage ../tools/networking/whois { };
 
+  wireguard-tools = callPackage ../tools/networking/wireguard-tools { };
+
   woff2 = callPackage ../development/web/woff2 { };
 
   woof = callPackage ../tools/misc/woof { };
-- 
GitLab


From 13d55dd65afcd4c30b59ef7f07cf79c7db8734cf Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Fri, 18 May 2018 23:41:42 +0100
Subject: [PATCH 0934/1085] houdini: Fix libGL (#40736)

(cherry picked from commit f07c44bb7c8e71123cab80134eace62bc7ecc6dc)
PR was incorrectly based on staging instead of master.
---
 pkgs/applications/misc/houdini/runtime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 7477e5c0af2..b92012a29dd 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -1,11 +1,11 @@
-{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }:
+{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc }:
 
 let
   ld_library_path = builtins.concatStringsSep ":" [
     "${stdenv.cc.cc.lib}/lib64"
-    "/run/opengl-driver/lib"
     (stdenv.lib.makeLibraryPath [
       libGLU
+      libGL
       xorg.libXmu
       xorg.libXi
       xorg.libXext
-- 
GitLab


From 0544c38ba4ac479d56abbb9dc9842c8fa093087f Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 19 May 2018 09:12:15 +0900
Subject: [PATCH 0935/1085] thunderbird-bin: 52.7.0 -> 52.8.0

---
 .../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 24b16744ff6..56b9e5cfb04 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.7.0";
+  version = "52.8.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ar/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ar/thunderbird-52.8.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "af887818b7859b8bfc87e0ac7ff26c1fbb98a50968d18d174bce37c2132a5957a8c5153f0364aa3ec0f636831313dd3bac6512dd6e7f932ed5cc99ed2016e9b5";
+      sha512 = "7ba3e6d4a64ce91b16d79607c3530deba2d68b09c81f7509991c62a11736ee51278b3cd60ca8063ce94748bf0b483cd9d9ea3be4ba84b24bef56194053502550";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ast/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ast/thunderbird-52.8.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "dcf8ab98558b7d2b8e5d2a97406eb13cc93900fcd60502ea4d8469179d08c55d91e66c7b99a024fbc6705e339750b41d9537d4d81f53f8d1f83461b986a6487a";
+      sha512 = "192442636ec56f7751d752572122c8b435fb28d6801a398dc6d02896d1f99d51feebbdb906f3911da08bb9da2851d3ea29eb064949d53436a6764292a6aeee7e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/be/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/be/thunderbird-52.8.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "021f531995db9a0993e830fa8f1da6089d0703424dd8993c23e59939091f58c4baae5ecb6cf51770ff73743c227129ac3215ec46d7181d88cd52a39b2e0e41ee";
+      sha512 = "facdfa7f6ec8eacc6a9294958c879a32cd5dadd31364d64894f8ad1a38ff883a9f2471d49d1358fa79b2b585a33ba7d710b195ec6101760289b8429d073004a9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bg/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/bg/thunderbird-52.8.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "a60f13e7b2760e19592e99eef1bc52593cabcf1b70b7803dd4262b2743e3c755cb4381ccaf1e75f41d4360897dcac3edd7e79648a6f4e81da4a1e83d67bb3ffe";
+      sha512 = "5dae827d4111bf6f07f1f794ab71cfabd4763d9f344b9666143a0c559c93479da532056d43f25b8d130284b9affeddd4d08c8e7042c86b681a1566a7b8822c87";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bn-BD/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/bn-BD/thunderbird-52.8.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "a73074fa5dfaf121b8f12e86dfc29189e9700a71a868f68a70ccd17c47df3a8512700893f981e065c5c20f9432ca764f3c59d4726a2c6abf3fd25530eca0d9a5";
+      sha512 = "fc5816d829c836b8c0995405c9e33ead778ffdff7d1ec11c57113b87954ca1be6e58281244fe5985f7eb84572e56202a700d7bf382c0abe0e4f11598929cccea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/br/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/br/thunderbird-52.8.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "28f4bff69059dbd1077641e888b234b0db95feb11bcb1db1ed047f3ab12282b9f95138835cca5f7eeb87a15ec1057b60587cadcb5fd658fbbe4c556d7eeed47a";
+      sha512 = "4b2ad9013cfe07708ec6cbab5fa79556d20d0146e5d853951c11c2d7629d795a7a9a16a6d7faf3c2dac535f5d368d98d98ca631c367c8b9cc6e3cd13763f6146";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ca/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ca/thunderbird-52.8.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "a9e45eda2b36bb12321140854e685fe4e203c7f56c1c8184a776c38d984f8381c6553cb5f601677f8e0e74ad497a040a18f5f392b99bdbe9535e19aa9afdcb7c";
+      sha512 = "2ef0f547dfea3d1ab97fba96673ff10d6bc0bdb24ea20c457b4baaf6cb987166219eb8d7c4e9c7a8f89b5933f65654f3cf8da8be7145c1378f1d5f51b8751825";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cs/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/cs/thunderbird-52.8.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "2c0f60ccc5c9a9fd66526af3aedbe2749f35a5fa7509c93b7b60d9babb1b4968eac6bff48d042ac8112793fe2825467de4d0efc42afda19547e8c6803b723119";
+      sha512 = "57f55ea5c102274b42154433a9df9663f8594d62a5b25aa18fcdaedeeb52d6556cdbce8542f2f301f5c7ea08354d90ed769c9e6b95664d6aecdd3f58e7e7aaeb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cy/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/cy/thunderbird-52.8.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "611ffc3d156ce4cedec0679bd9af3e8376dca5b20af2457a75d83dac7c71640a23a6cd544c190551480d6b37bcb9a9ec91342c2bca95cf10acb642d067056a04";
+      sha512 = "241729c3a385ca1fba281b5985513486a3fc9b768a41c4d8d1c0249bd9d3b4de032a76c6b2df383041840ec2913eadc854f2f8b85bc7de782a4f09001f0f5ab8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/da/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/da/thunderbird-52.8.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "0b858b5be09e038983a21715f58a215ea70fd811f7c8acd4ddb89611dd5590599339ab26913865b2ba75f4538cc95bd3e38e28646c281c041b0b08002aef033a";
+      sha512 = "4368a9301d40becf9675379c217040023faac8862482c5521a47f06e6c2a7466ec0b251475db111ed7f37c72cab0742e20b58463d2519a1fd6f77bc8e360330a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/de/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/de/thunderbird-52.8.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "cfcdbaec0a026ab246d45e00232f5d5f3f240f4957bbe41d70cfb421be438cbf8986920784d4d0350a274284b39ec42c20d33883f3f7fabf3b51df3a062fac15";
+      sha512 = "08c2fa848f3dc5fdccc498c935a03ac4e12d3bc3707beaafa5b9bff1c2aa51d6eb2a6e8373a0185f123a1ba77bb720e40ec9f8b364ef5b7a2f7810260ca9c372";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/dsb/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/dsb/thunderbird-52.8.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "52ef4b0dda8fe163675d46e7233b935b38a5899763012b0b9befb1ddd015f0a8d265de2adb4924856a4bc7753b3eaac2dc7861c5b75d8b231e667d29a583d673";
+      sha512 = "83ccb82aad5d63952674707c2c2317b4296f4b8ac56cd3ff9e294023036c1354f8f373d3b977f5f1cc5f9a9fb4876cb68b8dca786d5e2a07e28443e85e531e63";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/el/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/el/thunderbird-52.8.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "ab92343651598eea5f8010829bde589eb88a795ad0a3d0dbd1a5889d162b966e0e9bdf7bd32f49c59eb49b29261a075da1f4e75de49f87aa3fbf95796281062a";
+      sha512 = "4e6f9982e661d6935bbf6b4490a0f66ab2c082ecaf3e6bfc67e32a878b3cb60c7e98d2b5ae07439e43aa4f0f5f7b64616dd22fe1e3db9a5e28e42285a2c1ac6f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-GB/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/en-GB/thunderbird-52.8.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "1b0e11a1f8daba6a57ac619d764a60e9af6874cf7468c9487e55cc4be7c981d9dd375931b8956ee307754eb846900d4831c313fbdd3eba4658eaf77940e4436e";
+      sha512 = "3ffb11f6ad966980eefa882933b2ac791d73eb338907b8c3915905420318f0e52e16037fb6e04c2add9641e4d89424a48d769cc472234c4b25ddcaa51913d1c5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-US/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/en-US/thunderbird-52.8.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "a8f4cb2238c3bf0ea6e4f8b444991bf0d6a4fe42cf7c0e38ae3738167900ac52debc0daf8bf4d7fb1e63326626072fc498db6b227337eab82ea48f2fcd561334";
+      sha512 = "d5c2ab406d1820745bf425ba7bf6b947166747d0037f1519c0e4a76a6036be9eed1e00e563c7f663f7472ef77a6a85b646f9ed706f26666dc1d4dd39dba3f917";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-AR/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/es-AR/thunderbird-52.8.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "adddbaee6899434a0eb1fb955cd99c33786dc9c7376f1e84bb8036ed41d5731c48917ddd5d677a9dcefe3e7f382bcbbd51921afe1e6e119a4d32fe2cf9ae23cf";
+      sha512 = "c5971b74a717f24047cf43c4a20ee5c3d0c952a1f3c28ca2692887426746afaa1e8fdf4abbb601193cdf594912013b20ecabdcf8dcd301db221a8a632056e0ff";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-ES/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/es-ES/thunderbird-52.8.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "aaafff39c8f5566056f5339310c8f633e48f78c57d2b4730a13377aa5c09e9698295e59e7b137def2706a3dbff9b48710e25a0db24e60dec75c06f9d0713cead";
+      sha512 = "7b58ae76bd7026088c5d3a6e00b64e8445c29a898aaba8363524d436dba650ae1438feabe28e599e116ea7d995c864ff84688a09606476109bdd6aad48304973";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/et/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/et/thunderbird-52.8.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "8eab1f67c3f56a39e21734cfefd11e84fea60fdbd3e470c1e777b607535923c451d7318c2bd7958435ae137928e14f97559781458d8bd6cb2e1e88d47dabfc2d";
+      sha512 = "a71f40dadab629369f8ece09613c8d7ad78314da38489705a880b436afb7649523f50c189501279c1c0269953c7561b81d1de29ff9c1fe1bd22fab734772e8bb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/eu/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/eu/thunderbird-52.8.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "be2dd281a0a219e031cc485c21341d259aeeb56d34f79a9db82033d1e17647cf8c8617a2fcbc6a46b2025842a46f1117e43ca769a449a64577df691bdfa18801";
+      sha512 = "2e9e6f58505c4873e5f3f263b75ea56bf50fd82320b78b2bb5ea0876773fe87ce5b76cd4e48c0781565690a28e86cc611ff17e7223db4134e2978e0729e2630a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fi/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fi/thunderbird-52.8.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "21535608a1197744f9385b3eca5c7dbef8f3a05f9639b5011f8abf0bbc0143db17954ca4ce1bfc9ba1f5c4659a4a0a74351e30e5f57c1d416d7bf11273211f61";
+      sha512 = "5b22836043bddda0abefd5a9613f17ee147988de819d221f184482161d1667c4a9555763376e5d0e28b3f0fe0ec4482994368ca26745ccabd1826db0bd847af9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fr/thunderbird-52.8.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "ddda6457d4bd737778105d0bc7086e64ba58d9fb23a083977b456873fafd3170df495a2d81fa19c6b12a06d32e448a2cd224263f4773c0d165226c6f56cfbcec";
+      sha512 = "c465c33cf95bced2fddd7d4e3c624c3f98ffe02c2aeb21ab8946c1b1c37a31211bf79fb80a5fe767872dbe9cb1cfeabcbebea7bfc8e8dee1404b8c75c9aa6a4e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fy-NL/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fy-NL/thunderbird-52.8.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "aa3844d3d17a8fdc201e55352f52fa7805328e9f0b105b729cc8cbcde117885a6a6671d343469e7fad61fd9a5ebd8d87faec8f4a214744771ec4d2b43015c975";
+      sha512 = "51d262f87d2766e1c44370ba8f9d22df7e2b0876059bcfdef4b9b7809056468fab1cc6ee7abb892ce293d392548ebbaeccc55bf58c251aa774a8d936a7a50ef3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ga-IE/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ga-IE/thunderbird-52.8.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "30e88160a0c19fa58d6d86f916a86d95362bb8b8d073b1ac0e17608c0c5bd9ac040402dc950579602f5124e40a814e582ad98cf0853ecd8c7b11a7418bf0441d";
+      sha512 = "f9354bb331f6ef82cccde57eaaaf73887d904b76ed2157ab4ffcf37109928160127714cf51586032049a78e7215c43211719f2be1c860828585a344742c1ec91";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gd/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/gd/thunderbird-52.8.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "7458c820056c89b15988424325785ef4e525c2fb970b6c7c04d8c3e8b09cf7a3592e16b5c15862c84bcf95e2b399e37874f2c099c61bbc76293e4d5d8ed5980d";
+      sha512 = "926060b60e5fef2020c27e64a93c246ea9f477d82d8138c1a1e6439098e8e1809aa74747d45ee9b069dd32ac07624b24b022d318efaa3c1b5b02e8c8d599a54f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/gl/thunderbird-52.8.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "6be48b4ac248cff0842a5b78023dcb9787588c74ce1db89bb03a9a99ac0a2ac24a6949ae125219e99caf93260574d1c84355ca8f0f9c76ed15731d8a4950c98c";
+      sha512 = "d07e61440f1e938b0af4b5db38187a7cf7c6ca8584eec093c292b5f6b7096b529fc20db06766b11001f8d13e1c7dae7a5d3c798e82f3eac9dadcf8a8a50107bf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/he/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/he/thunderbird-52.8.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "3dca324d7b3b00a2cc98f8949165d178be7bd68b118ae66383a0d3705925e3f6bda14aa25475886c1f9810cd15a48a79e81924b8ebccfb528ad4bd21e36ebf8e";
+      sha512 = "7661135b35207b781bdc9a402128eaaace6f67c8558e6cdff271d946c88cf023de8307ca1a7c0ece4e0424e37d38b2b5e2f24fa966f7e13078dd56dc6a1972d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hr/thunderbird-52.8.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "23d5b2b0cb48fd274856a60dd9f916d294c8ec133771ff624e88cbdec214182c443ed5fd2d424475ed748113f84b74c732092f51061571104b1a62c301affabe";
+      sha512 = "d5db8e96bdf2061d8f24b9b332b9ca4e7fe64316385e32f01023520f80605bba50b2de8263d7aa67fbd5b3a9b39fd20a050bef4742804da4ae03b4d866ed8012";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hsb/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hsb/thunderbird-52.8.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "7360e964d5322e433014eb10f369f27a6e4ff688ed441671ddaaa3526b70d212509c16624ca854e988ca581d0f60ccf31db1bb49b5c93521a5d07e697be84a4c";
+      sha512 = "9cff35b2b5a4dab919e38180cfa88d7c3c249c9e119f6de850bd6e72018e6a62b1078ddafaef6c73c210b8c1dea3caa7987d88c75513f76033186bb7926f5e81";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hu/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hu/thunderbird-52.8.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "5aaaf22f17015026a32c3648323fbca16b3845c0f52ebfd3414c11e1d7cd1a0e72a8319e924b9eea67bd9c1448b87585709d3b99a8783ed580e11020a762eb31";
+      sha512 = "56057845898226d58981107d1ab14c3ca02547c0767e768f45c48f30097e14a7745c43b3b2b0bbdae81bc6ecdcd323194d30006ad20ab2b0de2cb3b29c15dba0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hy-AM/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hy-AM/thunderbird-52.8.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "7159dcfddf5981e1ddec5ac11613a7b30c513e0319249f08196ec88fe3e2256b52f3e1e418e46e276c1f35195f15d778b83d27e3186b2b8571e0b374844f6248";
+      sha512 = "6595e53a1b790cc2ee47f071d395dce94b44aafee80d2efc1613ee44d3698736db972f45806848dd9b35de699dec53b8b5e64e596b0b49b1e829326e57880904";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/id/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/id/thunderbird-52.8.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "9cf647ea244bcd046f73cfcca97c5b5f2dc3f5b0991d6edb100b4c4263ab75d8b5d07a418b906b66b50d9c4f29360637ff4ce605dbed7bd85c9b624d33331ae6";
+      sha512 = "878b475a2073c97e6af40bac24c2cfb88a73c8bdcba58b5d8cb2958f5114093fabaa6309f32096347c4ebb4baa828bbdf0077995284f1d2ae32eb234a7ca1d78";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/is/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/is/thunderbird-52.8.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "d567dd894926e7a5288da3f7a2837ded333772c799acf6f27489327b3e50236561dd0a9d04e3623d23a6d00e7b35c7b8572c611bf1e767b4f43f7d5164ea3787";
+      sha512 = "a8ed951689420281cbfd660bf23a4e5e3764da4894b31eb723b18c2923ca7f5f1b13d6a279f93d3cdf524f0a9387bb706c3d187ee4b84c74490fdba7867ffe25";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/it/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/it/thunderbird-52.8.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "e3511d7fed2617cb6cd59b1b56189a5f70db7f98cf889ce0be31d6931d0500a61b7d6a7f9907009bdaf37ad968b50aebae0930467cd5b0b70a6d2caaf89bc5ea";
+      sha512 = "24942a2fb5dc9a41641232f728077c8bfe5e99c5766ef4327a11e7e60858520a267ef12e0bebed7d9ff2664ba45d672fa1aa24c9ebdba9048bba10f6e73f6d85";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ja/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ja/thunderbird-52.8.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "0a4cac4b246542a42534e2b028a84cfef470c884143a08c489b56906a1d167ef66de82d326874e49d22a64c259aeac21b76f4cc2b20acf2885040db35decbc41";
+      sha512 = "291e715308f4bfb605fe987ce774d3f5cac211f920f62ea5e8abf12b51458f2da19c36329eca8fbbf185ec2eac9793dccc3d7483b320c0341ecc17bb477af263";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/kab/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/kab/thunderbird-52.8.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "9b6939d454dd5f0635d6fa3cd78d57d4c3461df67108a9c20a85cded552bffb68ca9f8e9af037150a0cb31588fcc663a0f1a8b91183fd257eec5e144516b5ca6";
+      sha512 = "de78483cd0b0a35687e091c52bd57d9de400a97ddeafd3b7708565501ff20da7ca1025940198aba6d410646d72be39bfca780d36df6b323ceef63cb085b214ec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ko/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ko/thunderbird-52.8.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "c965abf90339a3b8dbaffacd61b33729a0312052ced29cd8300cd5dbb577b7b663a314a5d27528f9e03ca55753ee96b392ae745558e59eeebec80857dcf34b3c";
+      sha512 = "b87fcc1baee680496b5bc13b1c87a3440c50f46be6e22b175cc8aff51bfc18bdeaad662d3cc10ebb255cfdf6d35ff2e59e9082f9d36dc5ddb079c49cda4d9d70";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/lt/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/lt/thunderbird-52.8.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "f8724c9f29d2965e23a90156586ea85721b5c5693c56fbc5932ee367c87a4531fdd318968cb38046f748dd60f4ef0ebb4636a2034f061e3e5926826aaccff410";
+      sha512 = "093519e8b927f2d716f76925fe40dc0b63835e51c446bf6759992419396f922a38f24d6f8e3fa2c0c252f391a2ff812084d26d36d414d77ba5d961a091b12756";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nb-NO/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nb-NO/thunderbird-52.8.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "87bd58ae4dcd766c0b3403e578c41ddc46b5801bd743747a23802770099ce37f55daed7beca134835f0f16939784d7d082b8d6903fdcc993cec56846b1d55c5c";
+      sha512 = "970a4d41c779e224504524ab8aa2b3bf83c71facc5f666c887b2eff27a8ee39e15404c0812376280dffa0c0642216e6e966004b577572ddb8d9e7cfae0544059";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nl/thunderbird-52.8.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "3f332437788bd314e8a19fe3263631c2000cdaf30505129b37693fbf499fac3d15736b51d2838e49daad8e9225094a92bf3638fee6a6e33f2cfff6357f1a1597";
+      sha512 = "7248b9d9a51f5f0b5b628b744e935c1d9c21a0a41cb5d77ab66b2e470bf6788774f1b769435f4526afb8d7c28d8fb240a3b3a918b6f20db617b599285e11b5fc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nn-NO/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nn-NO/thunderbird-52.8.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "4bd2918e59a87ad0afcba3e82640a0c729fdf672c1d977cce62f3bb7d92e14e008c83fc362a5c162090a3d4c0a5608262f5859ced2327274231ff534b6768694";
+      sha512 = "6f8e73df3122bc6985f7c37b5eed90c64914e83a800caabeb27a5b155085b5def8685c6af237e8f0cd605db28681a5df0cf4cfed32fa97b6d594666041bbca16";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pa-IN/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pa-IN/thunderbird-52.8.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "f0c448cf25471b1aa4387208a8d0bd7e41531fca86dc7118f4467d2db101835af3be9ba79713bcbd8d8556895efe4a2af68606df18fbd506734359950e00ebe9";
+      sha512 = "56f1e10c22acb54a5e6dea22be888525f24e9afc7ec2dfbe8cefee45196737bc68f0a39e7b25e0ab1376b3d7301f753958a11e66f60392f340a3f3f5896c9d5e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pl/thunderbird-52.8.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "5f9bbd0a1be4d0ac5c50c281ae75025f4b12d8781a73463876f26861c9289c51165cb68ab4438401ded5ea484477c1fe862f5d57430624bc11871f0b36e2c50c";
+      sha512 = "3dc5ae6f3e6451fa942fada6e2b7d7643975782cd9c43f0df9473f40117a5b8f91784462c444683aa180ff6decb677bbb1765bdbbd5ba69080fac806b4c7b97a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-BR/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pt-BR/thunderbird-52.8.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "afb4ed9a2739e0d590ace16f4dc8c4b1d19d05537fcdbd1f23e404218387d2c016715a074b630885a903588b8bd4a8329190d6ddb9231805a8538b4199513a6d";
+      sha512 = "ea4e6eae43d379e92adb54cf8a0e7cc1baf23bfb427e752f41d95bf9411dbf092ac94794aefbf2983dd7031db0961585c7bef31be63633035f907afb5a8f1a9d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-PT/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pt-PT/thunderbird-52.8.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "d907bee397dcfac8763c7dfd18d5bdb5bd99afbef554a98f625c36aedde922fa03c5f79e46acca4ecb07f9adf6eb59c869b1694c68e88ed759e04abab13a210d";
+      sha512 = "0de5ad70739e456fdbceef8ba89445f37ca4be23a9b213ad5b52b92656b702dc7ab39d6b27f2d9012ee27c46a4749444a210070ced586963577ee386726ee72a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/rm/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/rm/thunderbird-52.8.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "61c70149b717b193e541e49614027a5cc5c4f5a0a4642bb5445843b2c53165ae29088773498245de3e8d3324c26d6d96cd225d9e3e2e491f06d0b60586f23d2e";
+      sha512 = "dd947ad65fa23c42f2a1d118343b54deb2e7c9ef374118e2bfcbbec0d5ccfe5217ad0d636e9b4eee56f1e373beca52d8ff9f12593ce77b9f5aa94a1f62f2dcc6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ro/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ro/thunderbird-52.8.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "d9d604216c4805fbaa0444c5f61c7e1f8dc5609adde7bd8fc301e4ff0577b73a255cc95aa07f13543ce82b5487212b9b0e4284be47b2eb897a5c1880ed9fcaa5";
+      sha512 = "41b74b034f00a7ec26aabe5b5cca0b4a332b161be06f15a41e0c850ef53760ce1b284bcc8b71e1657a20b46c436c4ab6ef0bedb8f4a00c46b59bff825c5d5583";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ru/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ru/thunderbird-52.8.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "e385a46635372660a304d4cceb86be56d2a07b767a4eb17b131d67eb33494c878ed4e4cf3da3a1a198a9f3cab7c541161e325cbd9d5957c8af56d2a62118ffec";
+      sha512 = "4bc1aee9cb629f59aba733a08d4c2f5951006e30ad38584688fce6772d19e2a01dc6ddb43b6c0d7375638c8e0714703e6e4cf47fc639c449a1ba02dabe7dc44f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/si/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/si/thunderbird-52.8.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "952e89769e201e9320929f0562f27ca2de25a7bf4f0098964df6974831ef342f228de0278dd2de55a0d11c36804d04f42b9c9714f2c1ad44f5d68da1ae184d54";
+      sha512 = "663ab05d2e5f90f1be7fa9b2b61734f2c5c7d314ab86196629447c05d220f8de0a405d7ecb67e333d0c31006c0f0c384fa891fa087335f585a757b397d29769b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sk/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sk/thunderbird-52.8.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "827243b12ae2eafbb0da9673f914e26755dd3a54931e41a85ce89ab236b56bdf4ac4c256769865928509be4b998dac4a4924895ba583192d95b7271788185822";
+      sha512 = "4e925c2ec5d218b82722d6141b4e7b9f3216ba35b5e8260cf15c58f647b60e93161e9bdc8501865567e693ccbe3b40458b69e85e7b7a0884a522a68cce2df123";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sl/thunderbird-52.8.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "d4063aa855abd1701feb078471e628728e3bb61e8799ac186c75b325b4db14a81734befe4782d75cd07170cceaa37b83de90d1d1ba73f950f7f76e24265cf49f";
+      sha512 = "9c0e33622d3cc6e735978b35643ae6c4028456964255b04aeee28486177e1711354cf1de02db84c6af928ba176578abf5b6a2a12a248389790fc6ade6fa96e2c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sq/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sq/thunderbird-52.8.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "a90f3446a0a759fd9cdac2ea0251c676539f5dea56099d0e515fdcac72e881f54a95506f257da91b87d4be547b4377cfe8a7345e5087ff63d24e8bd2fc6742bb";
+      sha512 = "a6642a2c55db02058ce8bb9111afa3a9433372494e1e613fd8f1d575c64ce95e0c0e61a8b9cd60c662266f3347cabfebfbc606bfa333a121396caf3c0f89737d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sr/thunderbird-52.8.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "f313d71b58efbe34f96ecdccb0ed14977899b6038d2a5d0d7c3138881a7668e8282e4c927f106fdfd1d74774404734e57d97d0004086997ace4ca53921321adb";
+      sha512 = "e472a07bf64547b912b80a32212fa9a0c25023044aff165cf92cad8af1796fbda9d36ef32f6c11bf9b87b75babb4c6fc6d9d5463b7b88f31649298adc6947b50";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sv-SE/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sv-SE/thunderbird-52.8.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "0889f3c2917b01211dbb5d28262726a3dd077dfd5327fe1f3dd4742cd45aab9ab8d7bfeb141a5a2c120239c522182e46a263ad0d6cb8c2d71d4c9c004d734a68";
+      sha512 = "18cc4af474e717dbec7ff88fffc6635b7fec7d8936f0c7d903c42a1b9482186d5d0a2ca661491f76b477c57de45e03c995c562e295e5fca574534d81d6e6d30b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ta-LK/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ta-LK/thunderbird-52.8.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "49bd7127f1412a48aa7e66bbd2957cbdb4f02d4f43cf856b8b796562e945a1016852d695773351b30b65ee0d2d4b65c9aff4c347e9a5c2b64bc3818cce65ae54";
+      sha512 = "22f8d3345de9de5eae1cb05bbeaead160779b9f8c1187ace426d7ff026ec0ee0762a56b909f22c2bcdc186088b333d6fcf52a0ebf87ff56959b31b1f6dd7777a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/tr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/tr/thunderbird-52.8.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "6b50781107d219c7a86bce30b51c5e791627fd6305d1573d4fda98321e8476c3978a3b8d388005bb6d05ceb0ed0c6c119f9baf1d057b1f6d533d0e42baa90a51";
+      sha512 = "fc9365d3c869c1c3c1c9435f00b5f8eeee6fb231230a5fb0ff48cc59a8184f57bc558ab7f7386ebaee74b9c61c34bf5f7c6e882cd0e431749247b4a58d068c50";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/uk/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/uk/thunderbird-52.8.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "58e7e921d7d2ad46237ff66bf0f2cb0de448f68668968b56779ee874d0a9eb29ffc46876b6aab4a0c30e4aba597039c73939e6d454c8feb56cbb6b4215791016";
+      sha512 = "60ed7415eb87d9f1eedc2c92078823dc49db80652f6ad26de0ceeef34b7c499ec940ac3bf083a7731bac9c144b6bc04546209aabd1ddc0b399ac174fb88be6e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/vi/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/vi/thunderbird-52.8.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "5a2bee3035e76deb55d24d5043967e51dbb9d79dbc7cdb5dd9f59cfa2311391fc25017f08c709e7d33a5fa7ca0d8ae375ba074ae382a67f46b04e36eed504f53";
+      sha512 = "ea5892eb57fbdc0169f5dc39b2edb5eff2d06cddeae506e979d7556164fe55a65a402c7d791c873e6d0a3b48b97722d8dc90aae1b7389aaef3db836e803b9825";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-CN/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/zh-CN/thunderbird-52.8.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "73983afdd0e07a394029f64f1fba5f24ae0bce80ef7f9fa3f5374af3b5e6a094bb41d7428a252396b433ca59a092e5d19b20eeefc5867d68bef00a1894437159";
+      sha512 = "22ab8baa3a41beda58f02612bcd5e0a9848c3cb93bc68037ea504cdd0b2a0b5ea5bf78e5bf735dcbad4079ebcb3c5434c34d6a5e2a9f09a513f91018084ce960";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-TW/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/zh-TW/thunderbird-52.8.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "71ba36ffb59a94191ffd6bd24a00d3e35422601310b70a6f411b8ad0175d7f67efe9ccb8d0a2a7c1d47263d5d1cbd0a4f790ef54cd174875d0c0bafa86481457";
+      sha512 = "6c089225c57a0e010b0d413046004b53570afbf2d3b673dbca9a6e8cc102b6edf0e3a4f4858add4f5c1a4bb1fadc2641bd1c1dbc8659f970c84f61869b3634ea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ar/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ar/thunderbird-52.8.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "fc69ea6bc9393f55e247a78eb747c4ae6ae0c30efad8188d50eb52f4bc3f2e47e328788cf329966e8184b468a58bb923fdfdc736ff7b7b37cbbfa31bc619e065";
+      sha512 = "d48822233fa44e48b762e6aa2da302dafb38c32827b112197563952b35ee453a361a45eee35c6ee88317d6cc5215d0276e74862b167b01adf62f9c275f89a38b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ast/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ast/thunderbird-52.8.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "74a6ed4829522c0ac7a4411ab4d269f557391c53d1313eb1b70bb6e3fbba30217343945e60d46bb7c5fcfb20a40b2e6bc0c40cb66bb72259be4f9ad78796bedd";
+      sha512 = "3894ea6a01b335b92fa0d9f175aacefdf4fdcbfaeab3f3f5faa37f0bea090ebc7bfc130fb42ffff2293ecc95e3bdc8bf6142a5896dd4165fc3fa9f8e09fc3b5a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/be/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/be/thunderbird-52.8.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "ba645d2eaf0eaf90a0c1f2f24aa87c6783405fab00b2608aa1e3f88f1f81877c4927e93e2090509b9e06c8e2655a4aa731bed47ecf8992bf12b9c5dcb189c0eb";
+      sha512 = "ad93e61d4d1437681bdd772ad815efcb30716e716a08a442b9df2351b27118a590426d0ac054c6f41c29f4abd14f6e8fe7a54206eed810bddf1a70d6afa6776e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bg/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/bg/thunderbird-52.8.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "62dabdc80e0e3d46b42c69462d18964e584b54fee80bd632c0a3be19fceabf6bbcb80ee6b200472e52998f90252a7e62355cfa9d7d8ba3b3bd0f7bf247557c59";
+      sha512 = "de09ff65e4c24aad1faded64897f9cf7bbdcc21d4ed609fa1bb0d9ad5d5a9d1d4e780fc2d8a386890e6cf59641697fd1542701689ba82e22c844ac29012633b8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bn-BD/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/bn-BD/thunderbird-52.8.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "11acf4d6546aa3b3b1ee3159fb54e0769617664155d1dde4ec7d5af28335e90b428559b80e570d2b1829153f2edf8472e37e8e2cbf1d72567258e0c76aab4704";
+      sha512 = "a5f3737e2cdfa540adb3682542163a5f9c34605e975fd66bbb579c1508f485ff891f997a8c90d576fbc09d5c4cd183f123f020df7a3cd1f23401e7d92e930724";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/br/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/br/thunderbird-52.8.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "1056f78922c277ba64e3dad8e41ebed516495d41c07be4026271a2ca97d314218ce5a46c8b29be38645507a9f2070663cc6bb5deb194ee2d57df01809cb2d3ac";
+      sha512 = "37222d22ed65271e08fbfd32d5e6fa7cfe65d5d002116bdfbde8fec9c3877bafff6b6ef38680cd4373a1c86ed92402aa5afd5bf04f369029669af5451c9d884c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ca/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ca/thunderbird-52.8.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "f50bdc6d1bdfbe4bbfd8aa8ce3938e2ca6963d0fbc0fd47d23505158bccfe328195e45c0215dfcd354847e5e3a0897941790a7cc1f1db31ec29cbfaa1cae7a33";
+      sha512 = "87adf55bc6b50881b8d7ce30170f6e2f346db2c7f9801abbe37a17ef274417a3fb7dccab8d2eecb25d6c61a888ffede95c2ed40b6fe097fff2cf49a0e9490a00";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cs/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/cs/thunderbird-52.8.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "7d8c6d9be08bff6fcea06a994c637ea83576377975476edc01dbb152c8cc8768b00bab4295d5f13ca01451344aa64af6ad227e359f3d11bcc0228b31fd13c1f8";
+      sha512 = "055df8c29546975bfca186dfccfc9fde5ba418f3f2be1e15c77ac00c3b759527609427aa6590e3bb06e417211be6642bc37db4d19be6c3b866358d65c3aa3bbc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cy/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/cy/thunderbird-52.8.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "8bc583a05e872f36df9512ffd5c06cafcee81c632358b5bb13d8a920689b030e8ed4996bfc265c074d5d7959a1e75c7180900b51adb30ff3181de496cd34a4eb";
+      sha512 = "c60e61146c3fc195c482106d40a2eac47d0b621a13bcaeee5fd95a40ffaa5ae810f58a5ba85b2676a4277ad3fc6d7caa3907b1d4962fd42887e762236e7e9366";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/da/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/da/thunderbird-52.8.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "ccef5bffe4a807d55924ebc8b36f0065891f03520fbb015547da1264997e95cb9e919aa5af838686af070715ffb314ddf6abda0e99e1e06657a2ea6fbc956441";
+      sha512 = "1f8634f680512bf4ed0a44b41f3be55c118a114dcc262ee41010e58abc29f8bc3032a4c5264b948b9e4e13684d42761d97bf612050b891b4f52c78e91aa5a0c0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/de/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/de/thunderbird-52.8.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "02061b7572ad3b784a28926da15abea9fd9c93b4df9c40a5435190e6d872d356b6001cf0666e4cef0696da32c76e64cadfbeca28f6f894b1b230033d451fe105";
+      sha512 = "9422296b970e77217581c0a10efb928923e55272baa485ccd1a7446d6e9a84da23e6f2b93623922ac85db84861ab4813282e328315bedf9e3b8cf344d869108e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/dsb/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/dsb/thunderbird-52.8.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "458785317a61ff0fba04524b13cd72e22d4cdeee69bb99c849f4b12385a19f3236b586ab6a12cf9c8042a444553d1a3f82bef1f51fa9cd11639ec3911eff0013";
+      sha512 = "281736767a8d59830b1452eff5e5058c4090661030068bdc33d2ceb960f10c38284c32ff94345685fa7a7781da502f67c34fc83314728161d75c5fb3fd0ad0b5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/el/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/el/thunderbird-52.8.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "5b8fdd6a65b4057eff462c5ae8cee366ced8ee482892c0457a6fbc52303b8dad96437230f18f560a3bef3f392eec43194b89715071b559623ada47fd031680a5";
+      sha512 = "baa144336339a3a271f5a852b3130d20054baab3633d453015a5862e630dd73f3a99f50b979da7910810e84e99120a2afa96f8dca8c8ce0017824851deb9d702";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-GB/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/en-GB/thunderbird-52.8.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "0c32a412f9c7ad9195e113ab994ed8e0d80a14bcfdd70b3fc51399eca7e34241a265a7d81d5cdeb8a7217a0c694ebceed45c3b038de0656ee3a03bfde1887b3b";
+      sha512 = "b9573d177ff237ad833e8064ac72f7560940c5accbb7b7f663f53f6942e0326ed451e2290b09003ef6b320b860cd388020b00cb340d39af34b38678556704390";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-US/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/en-US/thunderbird-52.8.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "f7f8bf3f74052310987b546bba0f986abcfd65e53125c2cbde4bc4744e27de054f21eba8080313c28c9c3b44de1d773e4471facc9b71f520b6085c32cfe721c2";
+      sha512 = "5f0d43831c256e00eb3cbe5953cae5b6e84f54bbbde8b71c83f841c38b3704620e1163bcc5cc903a0b716685371912401f90bd00f5500fd42cc6debe97b28470";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-AR/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/es-AR/thunderbird-52.8.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "0187b3cb9b91d43d6faf217dca8566429103f2bb3c04bfb59e842da9c464cfba3f542be3789bf0fd46e6ca4c355d632f50b16b01667671e41231b8ca8d5b75d4";
+      sha512 = "ad640b2048f064d3e0914a0e79311e66c169258dd259a6873983147c37778616eecdc6e22aa64db272b534813a11fd1a0e5c555ca158d565513f3f201197a9a0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-ES/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/es-ES/thunderbird-52.8.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "876de2da5068acdb546d5091c64bf3edc4269a3e6dde2c2d928cd05439570773db4272819fcf8e12c63f94cdc41f0721412e108f078d1cd11501dc31966ee3d2";
+      sha512 = "12c3f601473909f38f737a353dbda2bea515cec0e6934c389daeeb470a489104d8aa7f920b0d81f6da930f886ea74b0c82dc6a49a2142c1e843c458f597c1a5f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/et/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/et/thunderbird-52.8.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "2ff7a791390e955cb2489c685504b5a118396d99d225e616e9bbc09b4f7be70d7a2f1a925d5cdc38b944e2476904604356d9e3e0dbc497258a133ec80ab499cb";
+      sha512 = "840cee14b983e20a0aa6847e15aba2babdbba947b6df38c14d3d5f3b50dcdf6cddafec13191c75718634a15ec757ebeb664172d09f841fa2ee55db02bdc67cee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/eu/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/eu/thunderbird-52.8.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "bef88a12c122f2d275e1fa24a92f5cc6fbc11534414ebd151e7d53d95d1c5ab06045270221ceb46629160eafd60bc1fd8a8928c13915493c83db231785507c21";
+      sha512 = "d6b4c9edcc54f22f39991c206e7316ea172e4450fca39202a81cb522040abea08eb9b48e296baaa19aca12d34de0b8af8379c1faf30a1111648a1c0cee84ac70";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fi/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fi/thunderbird-52.8.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "d2c1be7209706fa96dc20af9c30be61557e0bf82da575c7b95fa8b5d2fc7ac6b7b2101bdf0db169694fde66cd1da60edcd4b505b849b1949ee72f12d7dbef200";
+      sha512 = "23b25a0ab4879ddada9026991fb9955df9d32d635c4d0f746d329dcdfbce4593cbf7a3217845b8ef5f5a1b8e39a8a6bb1447557a5098f19acb82027e5993d549";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fr/thunderbird-52.8.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "194711b687ec4ededcb9140c7c1c3e1a0ccb47759cd00ba56819a3a7d9be66f9a7a29e2a91db0b1d573d584953871a37781877f43e734a8e39599dc6e8027622";
+      sha512 = "4033f784c31e8e13cfe408782e8b4e528f4d099abd02480090a28c6d0079a5bdd29ee0cd0953d5b94434c60d11c6b9867b355a8d8b6296ffee51d78337df3931";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fy-NL/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fy-NL/thunderbird-52.8.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "7b9ef6651166e66c6abb88b79628a0c51f576f2ccf2dc5eaefd1c01100a492ca9fe1657aa2d6745079e0f422e0f2692d24389577b47248ec6713817e51543c6e";
+      sha512 = "64959a9a0d45564ff2ff344e1494c7f3d80792ecd8fd7df8f2ce3f35676533b033183f24ce44416f3cbd281dde20a7c7f2c3c488e8476d606d0416bdc341c02a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ga-IE/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ga-IE/thunderbird-52.8.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "801af21d297c95505afb3bb6cc79edf72057ffbb9ee9da56c1f283043e6df921239a4ac8eb3d7442286b27265d3462569f79e29adc88b7674f7e9d8396ff3109";
+      sha512 = "255215853d3eccc809b71b653d6e830d1cc3e5857409f8d8f91b9f7a2d6e4cfb1033ba927e79a407f482ef8b56c1175d2b0162eb04a153cda8c2e156b0da8c16";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gd/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/gd/thunderbird-52.8.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "f778ff74408d3d9c7ba9c62cfa2c9447932b15446801df1c5363cf7c2059e1aa89539c1270fadbfc482c42b5c1845376e2fe037741fc267461d0b22f8edaf859";
+      sha512 = "483550a103337dd7807b85ff87ce0fead21851ebba75a470be88796017bf412979be6020eb3daacb7bbc15044236093277b6b2dac1ac66fa2c3b2fc2e403911f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/gl/thunderbird-52.8.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "ce541ef081ee8f8946f71b07a820ec31c4241730e565a8bf781a844a79fbfb0258d2f0d371ae3f4690067b6c520a103f4df996e8085d2a8afb997a4f1fefd288";
+      sha512 = "bbd79bf49e94720ffed29c07555488164de1188212fe4ae0e6076ede587997b3def662f880176e267d11c4ba1b1d4cdc6ed6721ee771a7cd9acabc3a231f76e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/he/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/he/thunderbird-52.8.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "ec3cef4bd411f6604e1ec3486272208aaa41b1154dad1473c6fbb483ec2d3960aaadc11cb592777f49571bba35a0812f4f0a14c0edf9eb8a7b1fc70d56fcd4a1";
+      sha512 = "99b135b3f4aed9909daf8c2711ac10ad9ee85beecbc127e112fd61fb51a7d3d8f8575722cef0e7da6d4f79aa38de72ea4807c9503af5974c1ba9787180ec014f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hr/thunderbird-52.8.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "f27bd94723f65c4972ee41cf6a9397098cfbf9097e3eeb06b7b41d50b4f0143711fcd0ad59a04f23ab9acb42d3f9515900c067f9532366ae3333ecae2a54f965";
+      sha512 = "a11ff16f2993d07d748630e94ec7bd6cd7634506535f3b7e7cfa5d16439fb6d2118ec195752cdedb87bfbee20feb629b72d6ce2f84b72a1da87b876e8e9786dd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hsb/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hsb/thunderbird-52.8.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "7caad57604b9d83e64e8e30e03e89c4661e8d81d2ce833a6908e2d662d4d6c7ffbbb8b071e8657fabb0ebc0c0f84b07617ac878c9bbcfb400b711654e36f66d7";
+      sha512 = "9090e5766ca42f0a633a2e639a520cf6f89a0a08f9d81d7e35fdec64b9effaab8759fb7241ab77c4b31b217e5fd72d52fc953544dd55c3b141a9a6d2e631ca5c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hu/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hu/thunderbird-52.8.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "382d79b8513ad28f06233af3473c2fef995d72c9913f64adce5a86528ae0ead883e94f91b4d394cf30541e690da5aad77dc48b8c2a4a84ea6c5fef86c22a4159";
+      sha512 = "f5158c0d4ba87f2472fb07f850a709e174577293e431b482f0d67e3ecb16d818544a02e221d3b68dcbd1d8e750795d51254ad87eac98350f4919979651261e5f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hy-AM/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hy-AM/thunderbird-52.8.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "3a4e5878e4fcc9c493cf1de1393da8efe85ff86d96702f57f085da42cac990290b054a3998e96cce69dca17ada849301a6724fd6ae245bf4aa396db5ce76aac4";
+      sha512 = "c902f41fa9353e57c666876715da6175ee9bad96ed45e0e858b436fb5c10164038a56bea670fb73a8b0eb2a60ceed33a7c08e790718efe2e22e6883768b21529";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/id/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/id/thunderbird-52.8.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "dca16b2c0b5034e1be2831a1992ca47f6a7c614382e781e86095df11f34193f13868bdd7f972f54e72d7f844cb24172057155d5457fc6ec98ee476ed01d8899c";
+      sha512 = "2366a3c32145012e073c84527f7e0f8cb1b311728b414084ee7b99727df5ea2ba6b6323def0c7fff2df20066f65ee530ed635a981e42bd1b7fe21874b893a680";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/is/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/is/thunderbird-52.8.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "181868826a0da43deeb2ef68a307ba195fa7a470651d4a08e904bde994320e832a04c44fa355cdaa94bd4c8258471e6849cf06dae8284d43f43defc7a3976816";
+      sha512 = "ae858675cac66dec80de439a2d9a1290ef2d6644a896b183692a10924eb55184b18866227787bae30cc01482453e65040618158a05c2f8d6d9dc2b7b60dca09b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/it/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/it/thunderbird-52.8.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "88c906753878c7b8b0a3d60de21813017ae6ba63b6be9c5d24b6072f1a4aa3a1cc01e56433f960c02f33317cb113266200fbeedc397cd3a5587aa592fdaaacfb";
+      sha512 = "ace77d1b7385f9aa825d5f67f640a77187891d5a257a00a4a9c565f46f742d931093a26f1d234f65f5e372d9598cb26c98766913e5b10a1c593fc6faab32edf3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ja/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ja/thunderbird-52.8.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "0e53d3f877793afa9c3ecb48f73640ff3974633bd28ce036b96c7ed29f3b9a4af47e1fca89da9d594c879f534e7c4dc27ca05ece8ec33909fe2dfd57800b3a11";
+      sha512 = "cb61fdcf68f4d02340a25c5b01b7037a7d102423bbd7068a9e7766f823a88ce461d52d6aca4211c1d871d31b8503477bd606c1f814c725f65240c260284e63f1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/kab/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/kab/thunderbird-52.8.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "feeef278ab269f6e33b479b38f32004a5ece2a37ed2aad97c87e68dd0a8195ffe3428ac9dce0a3e72349d3c136b6b5bfdc25916bc57f4fa043eecffc64bafc3c";
+      sha512 = "a52705049e4baef0e8f884f97fd3dc15097c855987e540adcca6b9d27d9d1a38538e326bf1f6bb2893055f72f3fdefe0563b6e048c02031af4e7e4bb77140698";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ko/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ko/thunderbird-52.8.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "c138dcbb692780cc1598906a630e90c8102d6a562f922ee28bc88e25624eb88aea20bf3d6fa6b87719f2a9fda0962bc413ce7e6d07147efb47dee7fd670a5c76";
+      sha512 = "a4bbe35e6a5fbf4db08982b0538390e3ec5e54d4e8b627a0e9267ae9137822710add418e5042ace3be8da3d5d56ea41ee4d5bbc5bfb95afe1587a5f81d5b32d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/lt/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/lt/thunderbird-52.8.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "96e5cbd33b57fe02134aac190347f0ac37fdb9f847ad74a44f59004cb739579b9309442605e3c9c2693bbc484372505aeff9378bb7bccfe8e1432da7a5508ff4";
+      sha512 = "0ef3fdb51246274198221cdbe07ebe6083c36759edd73243ed3568650b2d6570e90fc25b414d61d6a4bc0755b44eea21818cac09900c6eeef9dfcf24b403d3a1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nb-NO/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nb-NO/thunderbird-52.8.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "913a731cf2c063be645cca94ea4beab6601e2536baad9369f9804af663e7b1a024024ff2b5befda1ac8169db0e8cf9ce5c9ca5d0ce650fe629e606c221776e8a";
+      sha512 = "4a08c425fc32dccd29901e7211b2e35dc151d954c1a6ec607ece3ffeedff1a913bef8910b46e4285edb785111643d6b1eeb19284af953e8446d92c055c62621a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nl/thunderbird-52.8.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "79ceea0143319e4b883d2c59949fe3ddc62af70e9fe6653b745fedd2e683aaaf4c6f10d55688b83085abcd36672242f21ea0c592930cdcc7cfef7e32dcc72230";
+      sha512 = "8f54f5b2131bdd6579dcf7dce3afea57ac069206258ba52649d4f587aeed6e9aac9a08c4dc3920fd9be37074c2e619071bf502490b43d40a164d3f8d283de5f7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nn-NO/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nn-NO/thunderbird-52.8.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "c524517c417b977e9e8c3b0d3b9a8f1b256c68360f70e61ba4d1b2f887fe550222843de1f9c42081db935e27b3ec63ed8b1a1b5658f48f9534eb787d4fc28d54";
+      sha512 = "2d93dc0829669babf3ae3c3d6f16a7c9d2c9491c6127b1d7adc9b071cc6343e6383f0eed78bde342ce52d9570cc56b74595970e48430f08215143ed9642ad6cd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pa-IN/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pa-IN/thunderbird-52.8.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "10e8c6a1faf395371421387ec1cc6891d8e0bc9f69f37f2e4fc414dd9a5e4c10246f279e15804280a550ab7acc265b8a3691ef1d089459cb58cbf06896f88806";
+      sha512 = "98a844a40538224f750934132deac0270fa401afac00cc19352798ba813249408f976809b261419d0b8613a4ebbaf7e8ed2b8669f0d3ffed63916b9e71f1b28d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pl/thunderbird-52.8.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "13afd039d50bc7c6ead72e9d69f5dd6dafa0fc2b5d1f18a207a15192cda4473ca8706386eba98b522667cd036ded38bfcb67fb3dd8c2e50629c3db9a1243c3e6";
+      sha512 = "8c7465446cd1cae4d1bbaae69541516765d9388c79e73bb64996fa0154802f5a20f86cd6c1d0f835f7f7b631455d0b5d1ccc1d0d6119705bc5a9f6f06ecce8de";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-BR/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pt-BR/thunderbird-52.8.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "9c024bfa1733d144ff4fa58e7ce8a2127528d7fe05e64142a3b1d8a0fdaeda1b1c02998089fd219804571cae4072db984a74a40c4a22bcc18dfb68c849aa37cc";
+      sha512 = "718b4af9ae8b205f1cdf666b68b851b7c0fd5f0152237f8933dc1ccc843265fe8a869c2656d044ce7b5ef857981c827fc6dee85ff1008921108313bbfe1266a9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-PT/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pt-PT/thunderbird-52.8.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ed4d7117bc87cb2ec6df65667f554a83f2fcddbf4eafd6a587082ad42cab69fab5c1d9fc36e132660911840fe85dcc18ab4b23e83b9b57317b900db820483b40";
+      sha512 = "3bf4ae15abfc39505f7f846e468baaa70b01e370a05258f31150e778ff67517098e27a9be135ead2f8f53ef96291d8d04a201d6aeb7d56a9e45e211f44246b21";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/rm/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/rm/thunderbird-52.8.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "d1e1e48c47866b89e05c975cc6d4d70120173066457a4c05de1ab9222dee87b0d562959c63afbe024681b0a3f9f8cb3c836f2f0a0e910507e5211a430b1f9bab";
+      sha512 = "9214ecc41dd65de573cb21bb9ad56bc53baf8b86261ab41fdddca57173d157cb055f46aa2a087151c0a9b0dca4960914e7afc1095d118754f847dbc952a4a998";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ro/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ro/thunderbird-52.8.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "c1929be134d8127433eb4b26468379a631456681a6dc3d98bf9ec313576a4c951d5fa7f08ae2d3bc5e8563eecda0a71c412c62a970a0cec618e06d5cdcbc46fa";
+      sha512 = "aa46ef621604b95cb97b0e9cd4400a5f57aac58f82b3a5225a7828a757a24fa3e03d80839e1c6c03f914632fa6652386fc1787b8879343b06b6a59f9fe08b87c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ru/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ru/thunderbird-52.8.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "aa7893b8ea0f44f625afca61adc5942dfaf2eadc6cc7ead569a3536ad827a9b4f88f225dd01a9c5e375eb24a9940de6f65413ab6d93ec2bd736f0bca711739a3";
+      sha512 = "f07d8fe2b6f81ebd151804d1c0f0a39851bf3ee1e468092a2b0eee5f69438a94872b467840da11aaa7fa5f5604dd86f28ee61c85fe62ae283f844f8aac4ced7d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/si/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/si/thunderbird-52.8.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "ed425325419e0598e3cc5abd0d2b2898ef781c4be847aa8d9c93596f6dca0b718cb7035479d4013d3213b97a440dea2560549619c3ca330df9bda7b287cea673";
+      sha512 = "8f1b53473fb3e995c499e1583156114557548c1dc8a283a2e8f8c32a90cf2f765b3827455b1abb11272eae3dcd02d39e10b4eb4c2d6cd138f1905cf47bb8c696";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sk/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sk/thunderbird-52.8.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "bd576b29abe39634c864a27f5ab8d59ada34bfd069a7eb9fbe6af1cd79f2e0fdd61ab4fe06cc3944a92b06634bde9faa68ad6d56399085999df5e7827dd121bd";
+      sha512 = "9d40559c28a79375bd70b382b959227be036b00115b8c331d1383eadcc4599099247d76a67880e284e8cf9137bed0271c8edc2b61059ae4d91a540de5f50bec8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sl/thunderbird-52.8.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "98abc990d644a991abd9f513e205556974905c82c93e0fe8171608ec4d1aac7883ecdab5bf86ed287f43e6c5e45661b79ad012a4dda7b1e5cf6c3411dce7ea2c";
+      sha512 = "9426449a10bcc6ed3f24123fd5452cfcc87bead7014877a05be59d54db77af0833c15614c8c6e42f57005c9b773b1ebb2e59bcd9afd17177160b4010c0d5423a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sq/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sq/thunderbird-52.8.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "d45920069f8c0808b4965118be5ba6e4cf36b99bac9add6d1ac2e20051e95ebf09eaaa9ac559515803b655a61608bb4afab0d69d720ca74f57ec5a643b151f24";
+      sha512 = "a6d914e1df0b240afba8aa5467f5c1e62b48a263e86d32ab5b8e2cf07b8ad747ceeb733e9431f018779f4e1e9f6a9291f29f3e05681727a9b4981ad09a8cba45";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sr/thunderbird-52.8.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "7d77124de3cdd684f13fb824a0bcf7a9440ec7c626ba34deeb04478950bfc908494bc97de5f2d8d8dc0b0abfaa3f7c88b3948a10b7fd31de092702c755cacf25";
+      sha512 = "f333626201a1445aebeef71926fe3d57f08fb0fbbeb2adf50b30fa75d3c28c4828489675e74a76fe07b0684e2ab949bc13b87ead003b54119efd11b1c7c11cc8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sv-SE/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sv-SE/thunderbird-52.8.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "e16fdb819ca8ae5c8392eae50115d6b6853678c002de3a18fff25ae0e7e7fa2af06dab17a6a2dff31440608373a5268197efedeaf36f0012c2763080f4b51cc5";
+      sha512 = "5fcc5b4210320f5d571938fddd312493615e829bd6415aeaca2c37ec63db46a1e2d8942e9ce58164c4b8d1d40e88eff0de43861f0e20d796129d9088e624a4ec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ta-LK/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ta-LK/thunderbird-52.8.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "3c8429d8a31771452e108c0a7b16070138ea1e82aa16536bad4d7570117f0790045e9a34fb9f7546eb3d749e0d94b2a1a7a65b93198909189cbd2f1bf872af94";
+      sha512 = "6f48b7b74a11e42fab58436112f8216942dc288e57594e4bd99d951efd8a4f4e2fee668425342635ce1fece60f0fb21027932b4e678a119f38ac45a6f7a89365";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/tr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/tr/thunderbird-52.8.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "effe30bec8c4b0fc1428681888ea1e0a79eefa1f60fc3964e08142d00c6db065ff9a2acf989765497520f27504b4ea3c8104a084f63abe4358d165c5bfecc680";
+      sha512 = "c6a5c01c21e9b07fe1555c9f9148f888c793d4290d9b582cfd2741b895166a6b2407f0ff94de098f136758a816d59a1e6064f38c927574bc175afff168be72a6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/uk/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/uk/thunderbird-52.8.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "92cca4a0b9ac66bd4c0e14d0c04a162dbe2a3aac3a9fa95e26e6eef8ef1716fc21832967323ca5b46df19b28843de6e4781ea323120bac37a9821745f7ca9af7";
+      sha512 = "6492260323d1e50a2bc129ba22008d3681283b2931bd6df0d5e5d9087a45294cffc74e711a40994d86d98c1d430f4349ffc4b97d0a1b539c35653c6ed6ea877b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/vi/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/vi/thunderbird-52.8.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b470364cac631fe944e7c06a27299e8ddf65605aaa1550d0736ab6088e38cf008d224b920111a17f6d87aceda3b95ad0ebb01351ed2339680530629a70fca1b9";
+      sha512 = "d43c675312a30a3e6c02f70e9af921025a6798bb5143864ef7d1bc44e11ad654be66a79590698faa44fd404a4090d6dde37088a26339f3c244e0f1cc4d9042f2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-CN/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/zh-CN/thunderbird-52.8.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "1840d47835805c0ab854dde0a08fed90c785377d14b8f53b303fbd65bc5dc8e967146ae5d26ef4a0693df89679cff27ccbad0cabde27356dff97701fd3c91579";
+      sha512 = "fe81ec132fbfd17a15f76299853c45306be9f801d2c03a10fa9e4b25ac48e6e14efe4bc4ff2e5f01a94e46b0c1752add48e5277b11dee7d52325bebf5126616f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-TW/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/zh-TW/thunderbird-52.8.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "aaaef2821bb128218a6c9bbf07b1f017574f39a20664e0e82a396ddebeb4b2ac754fa1ece956ab70b1f55ef5e2a750d612cd6ebbd2a747d28f9c24a5b994c730";
+      sha512 = "96b53b5287e3625b4045588118427fe696827aa25b790665aeacb9096ca9ee8bca8a67bd28f733d128d08541069a1e684819f4ce8a1fd29cf683bce546a04fd5";
     }
     ];
 }
-- 
GitLab


From 6099ad33161e63a6fd30ec7e076719497273fa4e Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 19 May 2018 09:12:19 +0900
Subject: [PATCH 0936/1085] thunderbird: 52.7.0 -> 52.8.0

---
 .../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 1bf37edf1af..15d2c58e816 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.7.0";
+  version = "52.8.0";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21";
+    sha512 = "ce44f32f44244560499c44dbe963a8296cf58cf33e3f26d07be455746ed7f77791084e41bc66b2c90fe46e97fa15ae2041b1f5fcfa94d15b45c4f90172230d03";
   };
 
   # New sed no longer tolerates this mistake.
-- 
GitLab


From c2ed843f38a95ec2ca8fd4f0a71de9e4503676d2 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 19 May 2018 00:29:50 -0400
Subject: [PATCH 0937/1085] vim: 8.0.1655 -> 8.1.0001

---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 5b4f631987f..a93054a9aeb 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.0.1655";
+  version = "8.1.0001";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "1c6raqjaxgsjazn4l7wqg2cscd5i4bz9m2g2xhn9ba1injs7mps1";
+    sha256 = "056h9cyysyh6hqsr1s9xg94la554f56lwnpk87g013xmqf37bna6";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 301072dc271edc84f722e1bac508f4ed0d4700d3 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 19 May 2018 08:42:15 +0200
Subject: [PATCH 0938/1085] nixos/tests/hardened: fix test (#40745)

failed because `pgrep -u` segfaults when accesss to proc info
is denied on a hardened system.
---
 nixos/tests/hardened.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index cb33b69e719..0a0639d6279 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -25,16 +25,18 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   testScript =
     ''
+      $machine->waitForUnit("multi-user.target");
+
       # Test hidepid
       subtest "hidepid", sub {
           $machine->succeed("grep -Fq hidepid=2 /proc/mounts");
-          $machine->succeed("[ `su - sybil -c 'pgrep -c -u root'` = 0 ]");
-          $machine->succeed("[ `su - alice -c 'pgrep -c -u root'` != 0 ]");
+          # cannot use pgrep -u here, it segfaults when access to process info is denied
+          $machine->succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]");
+          $machine->succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]");
       };
 
       # Test kernel module hardening
       subtest "lock-modules", sub {
-          $machine->waitForUnit("multi-user.target");
           # note: this better a be module we normally wouldn't load ...
           $machine->fail("modprobe dccp");
       };
-- 
GitLab


From b739397ae4f69118386e470adb77527fbc450efc Mon Sep 17 00:00:00 2001
From: Travis Whitaker <pi.boy.travis@gmail.com>
Date: Fri, 18 May 2018 23:53:23 -0700
Subject: [PATCH 0939/1085] alacritty: Fix darwin.

---
 pkgs/applications/misc/alacritty/default.nix | 45 ++++++++++++++++++--
 pkgs/top-level/all-packages.nix              |  1 +
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 4a10d68ee4d..e3215e61a85 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -1,4 +1,5 @@
 { stdenv,
+  lib,
   fetchgit,
   rustPlatform,
   cmake,
@@ -14,7 +15,15 @@
   libXi,
   libXrandr,
   libGL,
-  xclip }:
+  xclip,
+  # Darwin Frameworks
+  AppKit,
+  CoreFoundation,
+  CoreGraphics,
+  CoreServices,
+  CoreText,
+  Foundation,
+  OpenGL }:
 
 with rustPlatform;
 
@@ -30,6 +39,15 @@ let
     libGL
     libXi
   ];
+  darwinFrameworks = [
+    AppKit
+    CoreFoundation
+    CoreGraphics
+    CoreServices
+    CoreText
+    Foundation
+    OpenGL
+  ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
   version = "2018-04-16";
@@ -51,21 +69,41 @@ in buildRustPackage rec {
     pkgconfig
   ];
 
-  buildInputs = rpathLibs;
+  buildInputs = rpathLibs
+             ++ lib.optionals stdenv.isDarwin darwinFrameworks;
 
   postPatch = ''
     substituteInPlace copypasta/src/x11.rs \
       --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\)
   '';
 
+  postBuild = if stdenv.isDarwin
+    then ''
+      make app
+    ''
+    else "";
+
+  patchRPathLibs = if stdenv.isDarwin then "" else ''
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
+  '';
+
+  copyDarwinApp = if stdenv.isDarwin
+    then ''
+      mkdir $out/Applications
+      cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
+    ''
+    else "";
+
   installPhase = ''
     runHook preInstall
 
     install -D target/release/alacritty $out/bin/alacritty
-    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
+    ${patchRPathLibs}
 
     install -D Alacritty.desktop $out/share/applications/alacritty.desktop
 
+    ${copyDarwinApp}
+
     runHook postInstall
   '';
 
@@ -76,6 +114,5 @@ in buildRustPackage rec {
     homepage = https://github.com/jwilm/alacritty;
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ mic92 ];
-    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1129a984d27..3edf567bfd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -484,6 +484,7 @@ with pkgs;
 
   alacritty = callPackage ../applications/misc/alacritty {
     inherit (xorg) libXcursor libXxf86vm libXi;
+    inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL;
   };
 
   amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
-- 
GitLab


From effb02131cd9f028c77f8c96ffccfbbaa05e020b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Sat, 19 May 2018 10:14:45 +0200
Subject: [PATCH 0940/1085] Revert "zsh: move setEnvironment stuff to zprofile"

This reverts commit 77a6cbb1c1feeb6b6424d35319ac6226c780b34a.
---
 nixos/modules/programs/zsh/zsh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index b88f54678ee..f689250dc61 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -108,6 +108,8 @@ in
         if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
         export __ETC_ZSHENV_SOURCED=1
 
+        ${config.system.build.setEnvironment.text}
+
         ${cfge.shellInit}
 
         ${cfg.shellInit}
@@ -127,8 +129,6 @@ in
         if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
         __ETC_ZPROFILE_SOURCED=1
 
-        ${config.system.build.setEnvironment.text}
-
         ${cfge.loginShellInit}
 
         ${cfg.loginShellInit}
-- 
GitLab


From b599f672e44270d2c6154b7855ddec11e4d43a93 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 11:15:26 +0300
Subject: [PATCH 0941/1085] wireguard-go: init at 0.0.20180514

---
 .../tools/networking/wireguard-go/default.nix | 27 +++++++++++++++++
 pkgs/tools/networking/wireguard-go/deps.nix   | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 59 insertions(+)
 create mode 100644 pkgs/tools/networking/wireguard-go/default.nix
 create mode 100644 pkgs/tools/networking/wireguard-go/deps.nix

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
new file mode 100644
index 00000000000..28acdefd7b5
--- /dev/null
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchurl }:
+
+buildGoPackage rec {
+  name = "wireguard-go-${version}";
+  version = "0.0.20180514";
+
+  goPackagePath = "wireguard-go";
+
+  src = fetchurl {
+    url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
+    sha256 = "1bn49a67m2ab0l9lq3zh2mfbbppmyg34klqi3069sjn6lg2hlajs";
+  };
+
+  goDeps = ./deps.nix;
+
+  patchPhase = ''
+    # Replace local imports so that go tools do not trip on them
+    find . -name '*.go' -exec sed -i '/import (/,/)/s@"./@"${goPackagePath}/@' {} \;
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Userspace Go implementation of WireGuard";
+    homepage = https://git.zx2c4.com/wireguard-go/about/;
+    license = licenses.gpl2;
+    platforms = with platforms; linux ++ darwin ++ windows;
+  };
+}
diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix
new file mode 100644
index 00000000000..e480896f664
--- /dev/null
+++ b/pkgs/tools/networking/wireguard-go/deps.nix
@@ -0,0 +1,30 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
+      sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "2491c5de3490fced2f6cff376127c667efeed857";
+      sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63e9be24226..2129477e4b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5718,6 +5718,8 @@ with pkgs;
 
   wipe = callPackage ../tools/security/wipe { };
 
+  wireguard-go = callPackage ../tools/networking/wireguard-go { };
+
   wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf {
     overrideDerivation = lib.overrideDerivation;
   };
-- 
GitLab


From 6f20bc3ef6a15778fa7bbd429be6aa9e69229986 Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin+git@pm.me>
Date: Sat, 19 May 2018 10:33:33 +0200
Subject: [PATCH 0942/1085] openshift: add {bash,zsh}-completion

---
 pkgs/applications/networking/cluster/openshift/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 07c9e9ba678..c4a2e93e139 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -69,6 +69,12 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p "$out/bin"
     cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/"
+    mkdir -p "$out/etc/bash_completion.d"
+    cp -a contrib/completions/bash/oc "$out/etc/bash_completion.d"
+    cp -a contrib/completions/bash/openshift "$out/etc/bash_completion.d"
+    mkdir -p "$out/share/zsh/site-functions"
+    cp -a contrib/completions/zsh/oc "$out/share/zsh/site-functions"
+    cp -a contrib/completions/zsh/openshift "$out/share/zsh/site-functions"
   '';
 
   preFixup = ''
-- 
GitLab


From bd6a3b2160e9d7a0b1f2764df04b44db8e97922b Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 19 May 2018 10:39:32 +0200
Subject: [PATCH 0943/1085] Revert "iasl: 20180313 -> 20180508 (#40613)"

Broke xen and virtualbox.
This reverts commit 5e49920d410b27e9430bfa97f94d40ba67d26666.
---
 pkgs/development/compilers/iasl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 6cf4c85fb20..22f80ae559f 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "iasl-${version}";
-  version = "20180508";
+  version = "20180313";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "1n7lqmv77kg28drahvxzybwl9v4hzwi8i7xkpgliclfcp5ff909b";
+    sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";
-- 
GitLab


From a0feedca8f042a7886a706cd9b58df06fa7272d8 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 19 May 2018 11:09:07 +0200
Subject: [PATCH 0944/1085] nixos/tests/nexus: fix for i686 (#40743)

test failed because qemu-system-i386 can only simulate 2047M RAM
(not 2048)
---
 nixos/tests/nexus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix
index d12d06c2c00..be886201877 100644
--- a/nixos/tests/nexus.nix
+++ b/nixos/tests/nexus.nix
@@ -13,7 +13,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
     server =
       { config, pkgs, ... }:
-      { virtualisation.memorySize = 2048;
+      { virtualisation.memorySize = 2047; # qemu-system-i386 has a 2047M limit
         virtualisation.diskSize = 2048;
 
         services.nexus.enable = true;
-- 
GitLab


From a9defaefabd20cf92ee6844972b9068e18f002ac Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 19 May 2018 12:27:21 +0300
Subject: [PATCH 0945/1085] top-level: remove wireguard attr

---
 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 3faf3c346e7..17bed306166 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18544,8 +18544,6 @@ with pkgs;
     erlang = erlangR18;
   };
 
-  wireguard = callPackage ../os-specific/linux/wireguard { };
-
   alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };
 
   wllvm = callPackage  ../development/tools/wllvm { };
-- 
GitLab


From 60d96d7786b852b3406a51bec8da4546e704a157 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 19 May 2018 12:28:38 +0300
Subject: [PATCH 0946/1085] top-level/aliases: add wireguard -> wireguard-tools
 alias

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

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 34906533a0a..101f4989b31 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -228,6 +228,7 @@ mapAliases (rec {
   vorbisTools = vorbis-tools; # added 2016-01-26
   wineStaging = wine-staging; # added 2018-01-08
   winusb = woeusb; # added 2017-12-22
+  wireguard = wireguard-tools; # added 2018-05-19
   x11 = xlibsWrapper; # added 2015-09
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
   xlibs = xorg; # added 2015-09
-- 
GitLab


From 3b44015e1a32cca88a3feca1a282733c2d4e79ff Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 12:42:13 +0300
Subject: [PATCH 0947/1085] wireguard-go: use postPatch instead of patchPhase

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

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index 28acdefd7b5..ac6e95f3f0a 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -13,7 +13,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  patchPhase = ''
+  postPatch = ''
     # Replace local imports so that go tools do not trip on them
     find . -name '*.go' -exec sed -i '/import (/,/)/s@"./@"${goPackagePath}/@' {} \;
   '';
-- 
GitLab


From 5f3480e04da97ad368b47b41c7a9bae10cd437c5 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 12:59:10 +0300
Subject: [PATCH 0948/1085] wireguard-go: use deps2nix for dependencies

---
 pkgs/tools/networking/wireguard-go/deps.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix
index e480896f664..88381d5f207 100644
--- a/pkgs/tools/networking/wireguard-go/deps.nix
+++ b/pkgs/tools/networking/wireguard-go/deps.nix
@@ -1,30 +1,30 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
 [
   {
-    goPackagePath = "golang.org/x/crypto";
+    goPackagePath  = "golang.org/x/crypto";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
+      rev =  "1a580b3eff7814fc9b40602fd35256c63b50f491";
       sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
     };
   }
   {
-    goPackagePath = "golang.org/x/net";
+    goPackagePath  = "golang.org/x/net";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "2491c5de3490fced2f6cff376127c667efeed857";
+      rev =  "2491c5de3490fced2f6cff376127c667efeed857";
       sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
     };
   }
   {
-    goPackagePath = "golang.org/x/sys";
+    goPackagePath  = "golang.org/x/sys";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      rev =  "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
       sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
     };
   }
-]
+]
\ No newline at end of file
-- 
GitLab


From ab1dd9c5857af7b25fb2e0c9c896c8f448195a59 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 13:01:59 +0300
Subject: [PATCH 0949/1085] wireguard-go: use fetchzip instead of fetchurl

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

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index ac6e95f3f0a..61ca16b0f64 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchurl }:
+{ stdenv, buildGoPackage, fetchzip }:
 
 buildGoPackage rec {
   name = "wireguard-go-${version}";
@@ -6,9 +6,9 @@ buildGoPackage rec {
 
   goPackagePath = "wireguard-go";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
-    sha256 = "1bn49a67m2ab0l9lq3zh2mfbbppmyg34klqi3069sjn6lg2hlajs";
+    sha256 = "1i1w4vj8w353b92nfhs92k0f7fifrwi067qfmgckdk0kk76nv2id";
   };
 
   goDeps = ./deps.nix;
-- 
GitLab


From 95cf07fc95d869c433ad96aaaca5a09f1065c97e Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 13:08:04 +0300
Subject: [PATCH 0950/1085] wireguard: use fetchzip instead of fetchurl

Because cgit snapshots are not deterministic.
---
 pkgs/os-specific/linux/wireguard/default.nix      | 6 +++---
 pkgs/tools/networking/wireguard-tools/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index c82831782e9..a62fce5cd61 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchzip, kernel }:
 
 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
 assert stdenv.lib.versionAtLeast kernel.version "3.10";
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
   name = "wireguard-${version}";
   version = "0.0.20180514";
 
-  src = fetchurl {
+  src = fetchzip {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
+    sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj";
   };
 
   preConfigure = ''
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 8f983082a80..f34119893c4 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, libmnl, useSystemd ? stdenv.isLinux }:
+{ stdenv, lib, fetchzip, libmnl, useSystemd ? stdenv.isLinux }:
 
 let
   inherit (lib) optional optionalString;
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
   version = "0.0.20180514";
 
-  src = fetchurl {
+  src = fetchzip {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
+    sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj";
   };
 
   preConfigure = "cd src";
-- 
GitLab


From 2db356feb5f9fb1705cb123cc97d2e7b78b388d1 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Sat, 19 May 2018 10:43:54 +0200
Subject: [PATCH 0951/1085] pythonPackages.geojson: init at 2.3.0

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

diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix
new file mode 100644
index 00000000000..902d1b26653
--- /dev/null
+++ b/pkgs/development/python-modules/geojson/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, glibcLocales }:
+
+buildPythonPackage rec {
+  pname = "geojson";
+  version = "2.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06ihcb8839zzgk5jcv18kc6nqld4hhj3nk4f3drzcr8n8893v1y8";
+  };
+
+  LC_ALL = "en_US.UTF-8";
+  checkInputs = [ glibcLocales ];
+
+  meta = {
+    homepage = https://github.com/frewsxcv/python-geojson;
+    description = "Python bindings and utilities for GeoJSON";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ geistesk ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 998aac285c4..3be39ded656 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5981,6 +5981,8 @@ in {
 
   geopandas = callPackage ../development/python-modules/geopandas { };
 
+  geojson = callPackage ../development/python-modules/geojson { };
+
   gevent-websocket = buildPythonPackage rec {
     name = "gevent-websocket-0.9.3";
 
-- 
GitLab


From fccf7f1181cefef80d3c1a62a25511cce36e4ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 19 May 2018 11:47:39 +0100
Subject: [PATCH 0952/1085] openshift: simplify shell completion installation

---
 .../applications/networking/cluster/openshift/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index c4a2e93e139..79eb8bb233c 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -69,12 +69,8 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p "$out/bin"
     cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/"
-    mkdir -p "$out/etc/bash_completion.d"
-    cp -a contrib/completions/bash/oc "$out/etc/bash_completion.d"
-    cp -a contrib/completions/bash/openshift "$out/etc/bash_completion.d"
-    mkdir -p "$out/share/zsh/site-functions"
-    cp -a contrib/completions/zsh/oc "$out/share/zsh/site-functions"
-    cp -a contrib/completions/zsh/openshift "$out/share/zsh/site-functions"
+    install -D -t "$out/etc/bash_completion.d" contrib/completions/bash/*
+    install -D -t "$out/share/zsh/site-functions" contrib/completions/zsh/*
   '';
 
   preFixup = ''
-- 
GitLab


From a5b47bb3867380537bdbcb69b076679f457d6bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 19 May 2018 12:23:47 +0100
Subject: [PATCH 0953/1085] alacritty: 2018-04-16 -> 2018-05-09

---
 pkgs/applications/misc/alacritty/default.nix | 32 ++++++--------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index e3215e61a85..e565b51cf50 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -50,18 +50,18 @@ let
   ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
-  version = "2018-04-16";
+  version = "2018-05-09";
 
   # At the moment we cannot handle git dependencies in buildRustPackage.
   # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
   src = fetchgit {
     url = https://github.com/Mic92/alacritty.git;
     rev = "rev-${version}";
-    sha256 = "14qsfaij631pk0gxrhmp594f72v0z7kzymf4hnqv4k5w9xlxciwx";
+    sha256 = "0mgi4niy40zz80k2ammbzdw9d8flvfkwlxkjnbpwrrldd0sj8dlz";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "0gg28fbx0kisv7hqxgzqhv4z4ikk074djfjlj90nmmi4nddp017p";
+  cargoSha256 = "0d6bqfnwqfxqllrf00p1djlxdvnhrahgnyqv842qjn94j3wf0fym";
 
   nativeBuildInputs = [
     cmake
@@ -77,32 +77,20 @@ in buildRustPackage rec {
       --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\)
   '';
 
-  postBuild = if stdenv.isDarwin
-    then ''
-      make app
-    ''
-    else "";
-
-  patchRPathLibs = if stdenv.isDarwin then "" else ''
-    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
-  '';
-
-  copyDarwinApp = if stdenv.isDarwin
-    then ''
-      mkdir $out/Applications
-      cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
-    ''
-    else "";
+  postBuild = lib.optionalString stdenv.isDarwin "make app";
 
   installPhase = ''
     runHook preInstall
 
     install -D target/release/alacritty $out/bin/alacritty
-    ${patchRPathLibs}
 
+  '' + (if stdenv.isDarwin then ''
+    mkdir $out/Applications
+    cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
+  '' else ''
     install -D Alacritty.desktop $out/share/applications/alacritty.desktop
-
-    ${copyDarwinApp}
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
+  '') + ''
 
     runHook postInstall
   '';
-- 
GitLab


From 388b21436a5617a0932a2edf5b2bd3f19165e051 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 14:25:57 +0300
Subject: [PATCH 0954/1085] wireguard-go: add myself as a maintainer

---
 maintainers/maintainer-list.nix                | 5 +++++
 pkgs/tools/networking/wireguard-go/default.nix | 1 +
 2 files changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9fa89838d16..6fd5c335ad1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1997,6 +1997,11 @@
     github = "kini";
     name = "Keshav Kini";
   };
+  kirelagin = {
+    email = "kirelagin@gmail.com";
+    github = "kirelagin";
+    name = "Kirill Elagin";
+  };
   kkallio = {
     email = "tierpluspluslists@gmail.com";
     name = "Karn Kallio";
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index 61ca16b0f64..e27b241e755 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -22,6 +22,7 @@ buildGoPackage rec {
     description = "Userspace Go implementation of WireGuard";
     homepage = https://git.zx2c4.com/wireguard-go/about/;
     license = licenses.gpl2;
+    maintainers = with maintainers; [ kirelagin ];
     platforms = with platforms; linux ++ darwin ++ windows;
   };
 }
-- 
GitLab


From 70c60a2fdca8b8acfe77e7ceffe56fe98c9370a4 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 19 May 2018 14:28:39 +0200
Subject: [PATCH 0955/1085] tdesktopPackages.preview: 1.2.20 -> 1.2.21

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 5d476f54304..2799f50e584 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,7 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.2.20";
-    sha256Hash = "00ncpb1qs88jrrmmx7f7l8wy37wbwnrb958x3xls14p1h1xg63l6";
+    version = "1.2.21";
+    sha256Hash = "0s7dywyz8p626741m32l4a90l1x01564xg2g10gvdb25s2phdfdl";
   });
 }
-- 
GitLab


From ce87e7083be2874a91e284c22f1a6d714a4f6af3 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Sat, 19 May 2018 21:16:32 +0900
Subject: [PATCH 0956/1085] slib: 3b2 -> 3b5

---
 pkgs/development/libraries/slib/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix
index 5ab681b21b2..233ba91d299 100644
--- a/pkgs/development/libraries/slib/default.nix
+++ b/pkgs/development/libraries/slib/default.nix
@@ -1,28 +1,18 @@
 { fetchurl, stdenv, unzip, scheme, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "slib-3b2";
+  name = "slib-3b5";
 
   src = fetchurl {
     url = "http://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip";
-    sha256 = "1s6a7f3ha2bhwj4nkg34n0j511ww1nlgrn5xis8k53l8ghdrrjxi";
+    sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq";
   };
 
   patches = [ ./catalog-in-library-vicinity.patch ];
 
   buildInputs = [ unzip scheme texinfo ];
 
-  configurePhase = ''
-    mkdir -p "$out"
-    sed -i "Makefile" \
-        -e "s|^[[:blank:]]*prefix[[:blank:]]*=.*$|prefix = $out/|g"
-  '';
-
-  buildPhase = "make infoz";
-
-  installPhase = ''
-    make install
-
+  postInstall = ''
     ln -s mklibcat{.scm,}
     SCHEME_LIBRARY_PATH="$out/lib/slib" make catalogs
 
-- 
GitLab


From ae89ef24aac04cfe533ceec65aa7220ca94a6102 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Fri, 18 May 2018 18:45:46 +0900
Subject: [PATCH 0957/1085] gauche: init at 0.9.5

---
 .../interpreters/gauche/default.nix           | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/interpreters/gauche/default.nix

diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix
new file mode 100644
index 00000000000..c13a26204e2
--- /dev/null
+++ b/pkgs/development/interpreters/gauche/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, texinfo, libiconv, gdbm, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "gauche-${version}";
+  version = "0.9.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gauche/Gauche-${version}.tgz";
+    sha256 = "0g77nik15whm5frxb7l0pwzd95qlq949dym5pn5p04p17lhm72jc";
+  };
+
+  nativeBuildInputs = [ pkgconfig texinfo ];
+
+  buildInputs = [ libiconv gdbm openssl zlib ];
+
+  configureFlags = [
+    "--enable-multibyte=utf-8"
+    "--with-iconv=${libiconv}"
+    "--with-dbm=gdbm"
+    "--with-zlib=${zlib}"
+    # TODO: Enable slib
+    #       Current slib in nixpkgs is specialized to Guile
+    # "--with-slib=${slibGuile}/lib/slib"
+  ];
+
+  enableParallelBuilding = true;
+
+  # TODO: Fix tests that fail in sandbox build
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "R7RS Scheme scripting engine";
+    homepage = https://practical-scheme.net/gauche/;
+    maintainers = with maintainers; [ mnacamura ];
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2129477e4b6..6d4876da291 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15748,6 +15748,8 @@ with pkgs;
 
   ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { };
 
+  gauche = callPackage ../development/interpreters/gauche { };
+
   gcal = callPackage ../applications/misc/gcal { };
 
   geany = callPackage ../applications/editors/geany { };
-- 
GitLab


From 52ad7f739095b18fc2da051c09fd1cb0b7d344a5 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 19 May 2018 10:38:03 +0000
Subject: [PATCH 0958/1085] linuxPackages.dpdk: 17.05.1 -> 17.11.2

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

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index 4bd50fdae40..fd45e83c26b 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, lib, kernel, fetchurl, pkgconfig, libvirt }:
-
-assert lib.versionAtLeast kernel.version "3.18";
+{ stdenv, kernel, fetchurl, pkgconfig, numactl }:
 
 stdenv.mkDerivation rec {
   name = "dpdk-${version}-${kernel.version}";
-  version = "17.05.1";
+  version = "17.11.2";
 
   src = fetchurl {
     url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
-    sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld";
+    sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2";
   };
 
   nativeBuildInputs = [ pkgconfig ] ++ kernel.moduleBuildDependencies;
-  buildInputs = [ libvirt ];
+  buildInputs = [ numactl ];
 
   RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
 
   # we need sse3 instructions to build
-  NIX_CFLAGS_COMPILE = [ "-march=core2" ];
+  NIX_CFLAGS_COMPILE = [ "-msse3" ];
 
   enableParallelBuilding = true;
   outputs = [ "out" "kmod" ];
-- 
GitLab


From d3071137085a3440970a1659e15cc8fc9a675f4c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 19 May 2018 12:36:22 +0000
Subject: [PATCH 0959/1085] linuxPackages.pktgen: 3.4.0 -> 3.5.0

---
 pkgs/os-specific/linux/pktgen/Makefile.patch | 34 -----------------
 pkgs/os-specific/linux/pktgen/default.nix    | 40 ++++++++++++++------
 2 files changed, 28 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/pktgen/Makefile.patch

diff --git a/pkgs/os-specific/linux/pktgen/Makefile.patch b/pkgs/os-specific/linux/pktgen/Makefile.patch
deleted file mode 100644
index da948bcc5a0..00000000000
--- a/pkgs/os-specific/linux/pktgen/Makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/app/Makefile b/app/Makefile
-index 5078b9a..99b208a 100644
---- a/app/Makefile
-+++ b/app/Makefile
-@@ -46,29 +46,10 @@ APP = pktgen
- CFLAGS += -O3 -g $(WERROR_FLAGS) -fno-stack-protector
- CFLAGS += -I$(RTE_SRCDIR) -I$(RTE_SRCDIR)/../lib/common
- 
--dpdk_ver := $(RTE_SDK)/xusertools/dpdk-version.sh
--pktgen_ver := $(RTE_SRCDIR)/../tools/dpdk-version.sh
--ver_cmd := $(if $(wildcard $(dpdk_ver)),$(dpdk_ver),$(pktgen_ver))
--# $(info ver_cmd=$(ver_cmd))
--
--yy := $(shell $(ver_cmd) -yy)
--# mm := $(shell $(ver_cmd) -mm)
--
--# $(info yy=$(yy))
--
--ifeq ($(yy),17)
- COMMON_PRE := $(RTE_SRCDIR)/../lib/common
- LUA_PRE := $(RTE_SRCDIR)/../lib/lua/src
- CLI_PRE := $(RTE_SRCDIR)/../lib/cli
- GUI_PRE := $(RTE_SRCDIR)/../gui/gui
--else
--ifeq ($(yy),16)
--COMMON_PRE := $(RTE_SRCDIR)/../lib/common/lib/common
--LUA_PRE := $(RTE_SRCDIR)/../lib/lua/src/lib/lua/src
--CLI_PRE := $(RTE_SRCDIR)/../lib/cli/lib/cli
--GUI_PRE := $(RTE_SRCDIR)/../gui
--endif
--endif
- 
- COMMON_LIB := $(COMMON_PRE)/$(RTE_TARGET)
- LUA_LIB    := $(LUA_PRE)/$(RTE_TARGET)
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index 9bc8967453b..c443da7df3b 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -1,34 +1,48 @@
-{ stdenv, fetchurl, dpdk, libpcap, utillinux
-, pkgconfig
+{ stdenv, lib, fetchurl, pkgconfig
+, dpdk, libpcap, numactl, utillinux
 , gtk2, withGtk ? false
 }:
 
-stdenv.mkDerivation rec {
+let
+
+  # pktgen needs a specific version of lua to apply its patch (see lib/lua/Makefile).
+  lua = rec {
+    name = "lua-5.3.4";
+    basename = name + ".tar.gz";
+    src = fetchurl {
+      url = "https://www.lua.org/ftp/${basename}";
+      sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn";
+    };
+  };
+
+in stdenv.mkDerivation rec {
   name = "pktgen-${version}";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchurl {
-    url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.gz";
-    sha256 = "0fcyb56d4mkvchi5i8s3m210f5c3xa8zbjb08ranpa1a2k1kzfg5";
+    url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.xz";
+    sha256 = "1gy99jr9dbwzi9pd3w5k673h3pfnbkz6rbzmrkwcyis72pnphy5z";
   };
 
   nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ];
 
   buildInputs =
-    [ dpdk libpcap ]
+    [ dpdk libpcap numactl ]
     ++ stdenv.lib.optionals withGtk [gtk2];
 
   RTE_SDK = "${dpdk}";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
   GUI = stdenv.lib.optionalString withGtk "true";
 
-  NIX_CFLAGS_COMPILE = [ "-march=core2" ];
+  NIX_CFLAGS_COMPILE = [ "-msse3" ];
 
-  patches = [ ./Makefile.patch ];
-
-  postPatch = ''
-    substituteInPlace lib/lua/src/luaconf.h --replace /usr/local $out
+  postPatch = let dpdkMajor = lib.versions.major dpdk.version; in ''
+    substituteInPlace app/Makefile --replace 'yy :=' 'yy := ${dpdkMajor} #'
     substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu
+
+    ln -s ${lua.src} lib/lua/${lua.basename}
+    make -C lib/lua get_tarball # unpack and patch
+    substituteInPlace lib/lua/${lua.name}/src/luaconf.h --replace /usr/local $out
   '';
 
   installPhase = ''
@@ -38,6 +52,8 @@ stdenv.mkDerivation rec {
     install -m 0644 Pktgen.lua $out/lib/lua/5.3
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Traffic generator powered by DPDK";
     homepage = http://dpdk.org/;
-- 
GitLab


From 142b65f088e32fc11fcd0f0a13dacdd0d89dcb5d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 19 May 2018 16:10:32 +0200
Subject: [PATCH 0960/1085] html-proofer: init at 3.8.0 (#40772)

---
 pkgs/tools/misc/html-proofer/Gemfile      |   2 +
 pkgs/tools/misc/html-proofer/Gemfile.lock |  48 +++++++
 pkgs/tools/misc/html-proofer/default.nix  |  18 +++
 pkgs/tools/misc/html-proofer/gemset.nix   | 154 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |   2 +
 5 files changed, 224 insertions(+)
 create mode 100644 pkgs/tools/misc/html-proofer/Gemfile
 create mode 100644 pkgs/tools/misc/html-proofer/Gemfile.lock
 create mode 100644 pkgs/tools/misc/html-proofer/default.nix
 create mode 100644 pkgs/tools/misc/html-proofer/gemset.nix

diff --git a/pkgs/tools/misc/html-proofer/Gemfile b/pkgs/tools/misc/html-proofer/Gemfile
new file mode 100644
index 00000000000..a7c369cc680
--- /dev/null
+++ b/pkgs/tools/misc/html-proofer/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'html-proofer'
diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock
new file mode 100644
index 00000000000..c7ae194e426
--- /dev/null
+++ b/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -0,0 +1,48 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    colorize (0.8.1)
+    concurrent-ruby (1.0.5)
+    ethon (0.11.0)
+      ffi (>= 1.3.0)
+    ffi (1.9.23)
+    html-proofer (3.8.0)
+      activesupport (>= 4.2, < 6.0)
+      addressable (~> 2.3)
+      colorize (~> 0.8)
+      mercenary (~> 0.3.2)
+      nokogiri (~> 1.8.1)
+      parallel (~> 1.3)
+      typhoeus (~> 1.3)
+      yell (~> 2.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    mercenary (0.3.6)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    parallel (1.12.1)
+    public_suffix (3.0.2)
+    thread_safe (0.3.6)
+    typhoeus (1.3.0)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    yell (2.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  html-proofer
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/tools/misc/html-proofer/default.nix b/pkgs/tools/misc/html-proofer/default.nix
new file mode 100644
index 00000000000..49881f1b0b4
--- /dev/null
+++ b/pkgs/tools/misc/html-proofer/default.nix
@@ -0,0 +1,18 @@
+{ bundlerEnv, ruby, lib }:
+
+bundlerEnv rec {
+  name = "${pname}-${version}";
+  pname = "html-proofer";
+  version = (import ./gemset.nix).html-proofer.version;
+
+  inherit ruby;
+  gemdir = ./.;
+
+  meta = with lib; {
+    description = "A tool to validate HTML files";
+    homepage    = https://github.com/gjtorikian/html-proofer;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ primeos ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix
new file mode 100644
index 00000000000..7043c9e355b
--- /dev/null
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -0,0 +1,154 @@
+{
+  activesupport = {
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nkzg31x501l8d1hbygyh1lr4c3vnw88a3c1rxz5ifvvzb10i6zm";
+      type = "gem";
+    };
+    version = "5.2.0";
+  };
+  addressable = {
+    dependencies = ["public_suffix"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+      type = "gem";
+    };
+    version = "2.5.2";
+  };
+  colorize = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  concurrent-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
+  ethon = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y70szwm2p0b9qfvpqrzjrgm3jz0ig65vlbfr6ppc3z0m1h7kv48";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
+      type = "gem";
+    };
+    version = "1.9.23";
+  };
+  html-proofer = {
+    dependencies = ["activesupport" "addressable" "colorize" "mercenary" "nokogiri" "parallel" "typhoeus" "yell"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06ggsx2fhsis1iw0sw12a709h99ksbs9kbmv0j05kvbak7b9m51a";
+      type = "gem";
+    };
+    version = "3.8.0";
+  };
+  i18n = {
+    dependencies = ["concurrent-ruby"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1milplpsdpxlvn23q6pvir4jgxsphq2ps2jgdb3i29kzpc55gm7y";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  mercenary = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  mini_portile2 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  minitest = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+      type = "gem";
+    };
+    version = "5.11.3";
+  };
+  nokogiri = {
+    dependencies = ["mini_portile2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
+      type = "gem";
+    };
+    version = "1.8.2";
+  };
+  parallel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
+      type = "gem";
+    };
+    version = "1.12.1";
+  };
+  public_suffix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+      type = "gem";
+    };
+    version = "3.0.2";
+  };
+  thread_safe = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  typhoeus = {
+    dependencies = ["ethon"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01pd16n6bvknyip42r1r7js0j8x8ly37gmr72z3695zcczh1blyq";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+      type = "gem";
+    };
+    version = "1.2.5";
+  };
+  yell = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m3q1l33sznrl86myjhd2l7chma1wdcdrdmnf2fi7aydapwd4vib";
+      type = "gem";
+    };
+    version = "2.0.7";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01a0d005921..71a7c18144d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2974,6 +2974,8 @@ with pkgs;
 
   hping = callPackage ../tools/networking/hping { };
 
+  html-proofer = callPackage ../tools/misc/html-proofer { };
+
   htpdate = callPackage ../tools/networking/htpdate { };
 
   http-prompt = callPackage ../tools/networking/http-prompt { };
-- 
GitLab


From f8ed43e600228ab415866d4938703fa5eaa7b121 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 19 May 2018 17:20:33 +0300
Subject: [PATCH 0961/1085] wireguard: use src from wireguard-tools

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

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index a62fce5cd61..ae31edcaaed 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, kernel }:
+{ stdenv, fetchzip, kernel, wireguard-tools }:
 
 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
 assert stdenv.lib.versionAtLeast kernel.version "3.10";
@@ -7,10 +7,7 @@ stdenv.mkDerivation rec {
   name = "wireguard-${version}";
   version = "0.0.20180514";
 
-  src = fetchzip {
-    url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj";
-  };
+  inherit (wireguard-tools) src;
 
   preConfigure = ''
     cd src
-- 
GitLab


From 6ff3291aa43a60e5f0412077b7af41a59cd02277 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 19 May 2018 10:38:16 -0400
Subject: [PATCH 0962/1085] minikube: 0.26.0 -> 0.27.0

---
 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 53b24552d37..2ba7bebc0c6 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -23,7 +23,7 @@ let
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.26.0";
+  version = "0.27.0";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -31,7 +31,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "1wc2gvmgb59yh0ldm2plvh6s8mvxvysrxp6w75z16ii86jmi3wr6";
+    sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws";
   };
 
   patches = [
-- 
GitLab


From fc10e188e2f51fa59504ad6441c750cbd03e03aa Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 19 May 2018 13:44:15 +0000
Subject: [PATCH 0963/1085] linuxPackages.odp-dpdk: 1.15.0.0 ->
 1.19.0.0_DPDK_17.11

---
 .../linux/odp-dpdk/configure.patch            | 32 -------------------
 pkgs/os-specific/linux/odp-dpdk/default.nix   | 26 +++++++--------
 .../linux/odp-dpdk/odp_crypto.patch           | 18 -----------
 3 files changed, 11 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/odp-dpdk/configure.patch
 delete mode 100644 pkgs/os-specific/linux/odp-dpdk/odp_crypto.patch

diff --git a/pkgs/os-specific/linux/odp-dpdk/configure.patch b/pkgs/os-specific/linux/odp-dpdk/configure.patch
deleted file mode 100644
index 3dadc98e834..00000000000
--- a/pkgs/os-specific/linux/odp-dpdk/configure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 001ebfc2893b..7d19ebcd213f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -215,7 +215,7 @@ AC_SUBST([testdir])
- ##########################################################################
- AM_CONDITIONAL([netmap_support], [test x$netmap_support = xyes ])
- AM_CONDITIONAL([PKTIO_DPDK], [test x$pktio_dpdk_support = xyes ])
--AM_CONDITIONAL([HAVE_PCAP], [test $have_pcap = yes])
-+AM_CONDITIONAL([HAVE_PCAP], [test x$have_pcap = xyes])
- AM_CONDITIONAL([DPDK_DEFAULT_DIR], [test "x${DPDK_DEFAULT_DIR}" = "x1"])
- AM_CONDITIONAL([test_installdir], [test "$testdir" != ""])
- AM_CONDITIONAL([cunit_support], [test x$cunit_support = xyes ])
-@@ -320,18 +320,6 @@ ODP_CFLAGS="$ODP_CFLAGS -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonli
- ODP_CFLAGS="$ODP_CFLAGS -Wformat-security -Wundef -Wwrite-strings"
- ODP_CFLAGS="$ODP_CFLAGS -std=gnu99"
- 
--dnl Use -Werror in the checks below since Clang emits a warning instead of
--dnl an error when it encounters an unknown warning option.
--AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough=0],
--                      [ODP_CFLAGS="$ODP_CFLAGS -Wimplicit-fallthrough=0"],
--                      [], [-Werror])
--AX_CHECK_COMPILE_FLAG([-Wformat-truncation=0],
--                      [ODP_CFLAGS="$ODP_CFLAGS -Wformat-truncation=0"],
--                      [], [-Werror])
--AX_CHECK_COMPILE_FLAG([-Wformat-overflow=0],
--                      [ODP_CFLAGS="$ODP_CFLAGS -Wformat-overflow=0"],
--                      [], [-Werror])
--
- # Extra flags for example to suppress certain warning types
- ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA"
- 
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix
index a444243e802..cf4f9df2677 100644
--- a/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -1,31 +1,27 @@
-{ stdenv, fetchgit, autoreconfHook, openssl, libpcap, dpdk }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig
+, dpdk, libconfig, libpcap, numactl, openssl
+}:
 
 stdenv.mkDerivation rec {
   name = "odp-dpdk-${version}";
-  version = "1.15.0.0";
+  version = "1.19.0.0_DPDK_17.11";
 
-  src = fetchgit {
-    url = "https://git.linaro.org/lng/odp-dpdk.git";
-    rev = "d8533b4e575d62c9f6f2caedd38d98a1a56fb8d3";
-    sha256 = "1p09rw7dxxqcxxrdb8wbwp2imapyjvdbvap7s9km2i9hbd8ipdif";
+  src = fetchurl {
+    url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${name}.tar.gz";
+    sha256 = "05bwjaxl9hqc6fbkp95nniq11g3kvzmlxw0bq55i7p2v35nv38px";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ openssl dpdk libpcap ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ dpdk libconfig libpcap numactl openssl ];
 
-  RTE_SDK = "${dpdk}";
+  RTE_SDK = dpdk;
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
 
   dontDisableStatic = true;
 
   configureFlags = [
     "--disable-shared"
-    "--with-sdk-install-path=${dpdk}/${RTE_TARGET}"
-  ];
-
-  patches = [
-    ./configure.patch
-    ./odp_crypto.patch
+    "--with-dpdk-path=${dpdk}"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/odp-dpdk/odp_crypto.patch b/pkgs/os-specific/linux/odp-dpdk/odp_crypto.patch
deleted file mode 100644
index 44ef155d69f..00000000000
--- a/pkgs/os-specific/linux/odp-dpdk/odp_crypto.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/platform/linux-dpdk/odp_crypto.c b/platform/linux-dpdk/odp_crypto.c
-index d95b157805dc..d13ad5bbde95 100644
---- a/platform/linux-dpdk/odp_crypto.c
-+++ b/platform/linux-dpdk/odp_crypto.c
-@@ -900,11 +900,12 @@ int odp_crypto_session_create(odp_crypto_session_param_t *param,
- 	/* Setup session */
- 	session = rte_cryptodev_sym_session_create(cdev_id, first_xform);
- 
--	if (session == NULL)
-+	if (session == NULL) {
- 		/* remove the crypto_session_entry_t */
- 		memset(entry, 0, sizeof(*entry));
- 		free_session(entry);
- 		return -1;
-+	}
- 
- 	entry->rte_session  = (intptr_t)session;
- 	entry->cipher_xform = cipher_xform;
-- 
GitLab


From 2af45d94dd5303a4cd672481124b171d55181134 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 19 May 2018 07:59:54 -0700
Subject: [PATCH 0964/1085] pgroonga: 2.0.5 -> 2.0.6 (#40646)

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 2.0.6 with grep in /nix/store/nh4mqn37kx82q7l5fm6anycaw8iz7b8n-pgroonga-2.0.6
- directory tree listing: https://gist.github.com/14e8971d0a27517ef320553ce1e8d33c
- du listing: https://gist.github.com/c1f25e2851a59216d5fa9f88b6477927
---
 pkgs/servers/sql/postgresql/pgroonga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix
index eb6f5f94810..6dcd19d8d68 100644
--- a/pkgs/servers/sql/postgresql/pgroonga/default.nix
+++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pgroonga-${version}";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchurl {
     url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz";
-    sha256 = "1c4m1rg3122y8rndgz7sj9a49l3v9nm0qbpa04pls20pxzx21g5a";
+    sha256 = "1hfmz3d0xwhsa4vw8i08s15i7pfd0h0smi2rv663x3cjjjn40i68";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 3d7ab2f5235374450582d495def09ed15199e098 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 19 May 2018 08:02:09 -0700
Subject: [PATCH 0965/1085] obs-studio: 21.1.1 -> 21.1.2 (#40660)

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

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

These checks were done:

- built on NixOS
- /nix/store/7ajk0j59wzn7pcynqchqkvlrdwnrgkdq-obs-studio-21.1.2/bin/obs passed the binary check.
- /nix/store/7ajk0j59wzn7pcynqchqkvlrdwnrgkdq-obs-studio-21.1.2/bin/.obs-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 21.1.2 with grep in /nix/store/7ajk0j59wzn7pcynqchqkvlrdwnrgkdq-obs-studio-21.1.2
- directory tree listing: https://gist.github.com/f501ac763d6c76528c24a40ab59ae620
- du listing: https://gist.github.com/ed4e17e15dd316ad1aafa8e7e89394a6
---
 pkgs/applications/video/obs-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index f3e2072d6da..a07a15177d0 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -29,13 +29,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "21.1.1";
+  version = "21.1.2";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "11gr4szjypihp0562r23pvkmaln6vjz1z4y4ls34bmc8n9ixrdcv";
+    sha256 = "1gl6qibvckczk3yl44h3yshml6sn3izwn58qpxils5837rpkwlc5";
   };
 
   patches = [ ./find-xcb.patch ];
-- 
GitLab


From 9534f999a4707c22a663cf1184bb83f6e05d1c03 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 19 May 2018 08:03:21 -0700
Subject: [PATCH 0966/1085] librelp: 1.2.15 -> 1.2.16 (#40664)

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.2.16 with grep in /nix/store/a6787dmhj4xpxwmqk8876gkyg00gr48h-librelp-1.2.16
- directory tree listing: https://gist.github.com/1f742ba05336ce792bdc905f5cd9dd4d
- du listing: https://gist.github.com/3677c4e01ab864cae128476ab579a776
---
 pkgs/development/libraries/librelp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index 55bb22e660b..083ea88301a 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "librelp-1.2.15";
+  name = "librelp-1.2.16";
 
   src = fetchurl {
     url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
-    sha256 = "16d9km99isa4mwk6psf8brny1sfl45dijlkdwzp0yrjnj0nq6cd9";
+    sha256 = "0lzxc2ydjbbs50dalqp2s107ckp63arpk223cigasq0hl395s8qc";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 8743e575be75f46c02b22389897846754c40b34f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 19 May 2018 08:07:11 -0700
Subject: [PATCH 0967/1085] git-ftp: 1.4.0 -> 1.5.1 (#40673)

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

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

These checks were done:

- built on NixOS
- /nix/store/99qm5jxal3n5kpyk7jb6byf68zir13hq-git-ftp-1.5.1/bin/git-ftp passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.5.1 with grep in /nix/store/99qm5jxal3n5kpyk7jb6byf68zir13hq-git-ftp-1.5.1
- directory tree listing: https://gist.github.com/db2f3eebbf94391961fe177450df28d8
- du listing: https://gist.github.com/8e1f6afd03639aaba4c09de2d38fbf54
---
 pkgs/development/tools/git-ftp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix
index b4bc680a19a..3d4d542d2f9 100644
--- a/pkgs/development/tools/git-ftp/default.nix
+++ b/pkgs/development/tools/git-ftp/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchFromGitHub, pandoc, man }:
 stdenv.mkDerivation rec {
   name = "git-ftp-${version}";
-  version = "1.4.0";
+  version = "1.5.1";
   src = fetchFromGitHub {
     owner = "git-ftp";
     repo = "git-ftp";
     rev = version;
-    sha256 = "0n8q1azamf10qql8f8c4ppbd3iisy460gwxx09v5d9hji5md27s3";
+    sha256 = "0nh2f58rwwfzmglm75fmmm10470a80q0vsihc2msa8xswngihg22";
   };
 
   dontBuild = true;
-- 
GitLab


From 28c1c0ab26b2b18f838b5275146210938b0b1643 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 19 May 2018 08:17:18 -0700
Subject: [PATCH 0968/1085] mlt: 6.6.0 -> 6.8.0 (#40653)

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

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

These checks were done:

- built on NixOS
- /nix/store/xsmh09whsj39h5hc7g0ljj344i5i70zk-mlt-6.8.0/bin/melt passed the binary check.
- /nix/store/xsmh09whsj39h5hc7g0ljj344i5i70zk-mlt-6.8.0/bin/.melt-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 6.8.0 with grep in /nix/store/xsmh09whsj39h5hc7g0ljj344i5i70zk-mlt-6.8.0
- directory tree listing: https://gist.github.com/3a7f7c995e0d2d7232ab28093ddd4613
- du listing: https://gist.github.com/c8e940fb79b09b1aeee2243a1fff57ca
---
 pkgs/development/libraries/mlt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 59700669ba7..57b810c0b44 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "mlt-${version}";
-  version = "6.6.0";
+  version = "6.8.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     rev = "v${version}";
-    sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q";
+    sha256 = "0hmxlz3i9yasw5jdkrczak8shzlnpi1acaahn50lvgg9b14kg7b8";
   };
 
   buildInputs = [
-- 
GitLab


From 17f50018c0ca87e196882c0ba4aee68703e3fcf0 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 19 May 2018 11:30:04 -0400
Subject: [PATCH 0969/1085] lua5.1: fix broken source fetch (#40748)

The upstream src URL for the patch appears to no longer exist. Per discussion in
https://github.com/NixOS/nixpkgs/issues/39927, the upstream URL is not stable,
so this commit inlines the patch in the nixpkgs src tree.
---
 ...x-stack-overflow-in-vararg-functions.patch | 21 +++++++++++++++++++
 pkgs/development/interpreters/lua-5/5.1.nix   |  7 +------
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch

diff --git a/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch b/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch
new file mode 100644
index 00000000000..31d3b8bdee7
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch
@@ -0,0 +1,21 @@
+From: Enrico Tassi <gareuselesinge@debian.org>
+Date: Tue, 26 Aug 2014 16:20:55 +0200
+Subject: Fix stack overflow in vararg functions
+
+---
+ src/ldo.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ldo.c b/src/ldo.c
+index d1bf786..30333bf 100644
+--- a/src/ldo.c
++++ b/src/ldo.c
+@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
+     CallInfo *ci;
+     StkId st, base;
+     Proto *p = cl->p;
+-    luaD_checkstack(L, p->maxstacksize);
++    luaD_checkstack(L, p->maxstacksize + p->numparams);
+     func = restorestack(L, funcr);
+     if (!p->is_vararg) {  /* no varargs? */
+       base = func + 1;
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 1c4fcd2811d..15077578f27 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -20,12 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline ];
 
   patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ])
-    ++ [(fetchpatch {
-      name = "CVE-2014-5461.patch";
-      url = "http://anonscm.debian.org/cgit/pkg-lua/lua5.1.git/plain/debian/patches/"
-        + "0004-Fix-stack-overflow-in-vararg-functions.patch?id=b75a2014db2ad65683521f7bb295bfa37b48b389";
-      sha256 = "05i5vh53d9i6dy11ibg9i9qpwz5hdm0s8bkx1d9cfcvy80cm4c7f";
-    })];
+    ++ [ ./5.1.0004-Fix-stack-overflow-in-vararg-functions.patch ];
 
   configurePhase =
     if stdenv.isDarwin
-- 
GitLab


From 9daf6379267fddc58f44107d8ed445b4ceb12630 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 18 May 2018 00:52:33 +0200
Subject: [PATCH 0970/1085] =?UTF-8?q?gnome-desktop-testing:=202016.1=20?=
 =?UTF-8?q?=E2=86=92=202018.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/tools/gnome-desktop-testing/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix
index ff03897edb2..788310d5fe9 100644
--- a/pkgs/development/tools/gnome-desktop-testing/default.nix
+++ b/pkgs/development/tools/gnome-desktop-testing/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, glib, autoreconfHook, pkgconfig, libgsystem, fetchgit }:
+{ stdenv, glib, autoreconfHook, pkgconfig, systemd, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2016.1";
+  version = "2018.1";
   name = "gnome-desktop-testing-${version}";
 
   src = fetchgit {
     url = https://git.gnome.org/browse/gnome-desktop-testing;
     rev = "v${version}";
-    sha256 = "18qhmsab6jc01qrfzjx8m4799gbs72c4jg830mp0p865rcbl68dc";
+    sha256 = "1bcd8v101ynsv2p5swh30hnajjf6z8dxzd89h9racp847hgjgyxc";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  buildInputs = [ glib libgsystem ];
+  buildInputs = [ glib systemd ];
 
   enableParallelBuilding = true;
 
-- 
GitLab


From 2ffff13c8d78601adf0ecaf58eb3efc63a8f6fb0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 14:33:02 +0200
Subject: [PATCH 0971/1085] =?UTF-8?q?gegl=5F0=5F4:=200.4.0=20=E2=86=92=200?=
 =?UTF-8?q?.4.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index a8e50945c3f..e9230b218be 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -3,13 +3,13 @@
 , libwebp, gnome3, libintl }:
 
 let
-  version = "0.4.0";
+  version = "0.4.2";
 in stdenv.mkDerivation rec {
   name = "gegl-${version}";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
-    sha256 = "1ighk4z8nlqrzyj8w97s140hzj59564l3xv6fpzbr97m1zx2nkfh";
+    sha256 = "13bzl0k5l12pk8bkcq4ar7wscbnw7jswhp34mwfsrf10kp0qndba";
   };
 
   # needs fonts otherwise, don't know how to pass them
-- 
GitLab


From 683d397dd88effa480c263e7d2f70b817a2ed2fa Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:53:59 +0200
Subject: [PATCH 0972/1085] =?UTF-8?q?gnome3.gnome-boxes:=203.28.3=20?=
 =?UTF-8?q?=E2=86=92=203.28.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 0ba4199630a..1978c906bab 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -9,13 +9,13 @@
 # TODO: ovirt (optional)
 
 let
-  version = "3.28.3";
+  version = "3.28.4";
 in stdenv.mkDerivation rec {
   name = "gnome-boxes-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "05x9c7w60cafcd3bdkr68ra8pbh7m8pciw67871hckaqafw76q1d";
+    sha256 = "1378zzqdwv0hnirg8k91s5vgkcl1brfild3hgach5jhg78nxdb4j";
   };
 
   doCheck = true;
-- 
GitLab


From 3929be8495fc83ba3021bfff3f33df052f07f6e2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:54:18 +0200
Subject: [PATCH 0973/1085] =?UTF-8?q?gnome3.gnome-getting-started-docs:=20?=
 =?UTF-8?q?3.28.1=20=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/apps/gnome-getting-started-docs/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index b3ede702890..c8a8f8e7e32 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-getting-started-docs-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0x60aava6ba4xliy4p4i6jm5d2nq8hx9aqgnaw4d34fvmcpcy5w0";
+    sha256 = "0vg0b4nr7azj6p5cpd7h7ya5hw6q89gnzig8hvp6swwrwg2p5nif";
   };
 
   passthru = {
-- 
GitLab


From 8d9496cb73ecad293a398ab0c7b1151f93183630 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:54:34 +0200
Subject: [PATCH 0974/1085] =?UTF-8?q?gnome3.gnome-music:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.28.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 9aa8eee0bca..560d8446f08 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "3.28.2";
+  version = "3.28.2.1";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
-    sha256 = "0xkbw9cp002vwwq6vlsbkahz9xbwpkyydd9cvh7az379sdlz4rid";
+    sha256 = "09lvpiqhijiq0kddnfi9rmmw806qh9a03czfhssqczd9fxmmbx5v";
   };
 
   nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];
-- 
GitLab


From eda0044379e33ffafdf4b8a34eaf4270e608b33d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:54:45 +0200
Subject: [PATCH 0975/1085] =?UTF-8?q?gnome3.gnome-desktop:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index ed1e59da62c..13f4b1ef638 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-desktop-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "16nbgrp0hihvrsa6kmqk0z8y7ajravyagmkmq1nnwn27psi9g8vq";
+    sha256 = "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30";
   };
 
   passthru = {
-- 
GitLab


From 347c1c82bb94b85e13310b04cfcfe4b3a316cff8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:54:58 +0200
Subject: [PATCH 0976/1085] =?UTF-8?q?gnome3.gnome-disk-utility:=203.28.1?=
 =?UTF-8?q?=20=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 4f9e2dda540..38f105bfcb0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-disk-utility-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "09dmknfas8iifv6k5jb4a9ag57s8awrn0f26fd1qlg0mbfjlnfd6";
+    sha256 = "1j3l4b1prbnixzy6srvcsjfg1dx5nqys2lmygm31ygfdq7svp3m6";
   };
 
   passthru = {
-- 
GitLab


From 0cc8b413daa0914da59bd8472fbd0db8e517ad22 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:55:06 +0200
Subject: [PATCH 0977/1085] =?UTF-8?q?gnome3.gnome-software:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-software/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 2d5080841a4..81d401f8da2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-software-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0j27zygb3g08q9i8ygwpxqf6g0lrivq2vhj7p7g9x0zh9r0vzlbs";
+    sha256 = "1s19p50nrkvxg4sb7bkn9ccajgaj251y9iz20bkn31ysq19ih03w";
   };
 
   patches = [
-- 
GitLab


From e7923b9e26650b190540ba6169afa452df0a5156 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:57:43 +0200
Subject: [PATCH 0978/1085] =?UTF-8?q?gnome3.gnome-system-monitor:=203.28.1?=
 =?UTF-8?q?=20=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 46a91dda70e..c402a2edd8f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-system-monitor-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0wdpd5mfrm0gwmwjvcj556c3mpxf3pcfnvh7x698i8if53ci0gw7";
+    sha256 = "164in885dyfvna5yjzgdyrbrsskvh5wzxdmkjgb4mbh54lzqd1zb";
   };
 
   doCheck = true;
-- 
GitLab


From e96ec37c008aeb6dfe593cc51ed7acba7d79c4a4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:57:56 +0200
Subject: [PATCH 0979/1085] =?UTF-8?q?gnome3.gnome-user-docs:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index a8efa238447..6cb827bc504 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-user-docs-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "189j78d23c6jr5x5j9nxkbdqxg31xvmwvyblz7f9xi9ncy0qdvfh";
+    sha256 = "0gg1rgg15lbgjdwpwlqazfjv8sm524ys024qsd4n09jlgx21jscd";
   };
 
   passthru = {
-- 
GitLab


From c44e5653156fe301c5d8fc868aa6e5dfba5222de Mon Sep 17 00:00:00 2001
From: Eli Flanagan <efx@users.noreply.github.com>
Date: Sat, 19 May 2018 12:21:46 -0400
Subject: [PATCH 0980/1085] lastpass-cli: 1.3.0 -> 1.3.1 (#40734)

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

diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix
index e9dffa5dbfa..4db350684be 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/pkgs/tools/security/lastpass-cli/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "lastpass-cli-${version}";
 
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "lastpass";
     repo = "lastpass-cli";
     rev = "v${version}";
-    sha256 = "0k3vnlibv05wnn6qn3qjlcyj2s07di7zkmdnijd6cp1hfk76z2r5";
+    sha256 = "11drzmfdvb8ydw1dxaz9zz8rk0jjqmfv076vydz05qqvgx59s38h";
   };
 
   nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ];
-- 
GitLab


From 3a6fd647e55affd8ba02699455fe56da99606802 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Sat, 19 May 2018 19:49:18 +0300
Subject: [PATCH 0981/1085] connman: 1.35 -> 1.36 (#40775)

---
 pkgs/tools/networking/connman/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 45fabeee139..f6e0608ca7f 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "connman-${version}";
-  version = "1.35";
+  version = "1.36";
   src = fetchurl {
     url = "mirror://kernel/linux/network/connman/${name}.tar.xz";
-    sha256 = "1apj5j25kj7v1bsfv3nh54aiq873nfrsjfbj85p5qm3ihfwxxmv6";
+    sha256 = "0x00dq5c2frz06md3g5y0jh5kbcj2hrfl5qjcqga8gs4ri0xp2f7";
   };
 
   buildInputs = [ openconnect polkit
@@ -16,14 +16,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig file gawk ];
 
-  patches = [
-    (fetchpatch {
-      name = "header-include.patch";
-      url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=bdfb3526466f8fb8f13d9259037d8f42c782ce24";
-      sha256 = "0q6ysy2xvvcmkcbw1y29x90g7g7kih7v95k1xbxdcxkras5yl8nf";
-    })
-  ];
-
   preConfigure = ''
     export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant
     export PPPD=${ppp}/sbin/pppd
@@ -61,7 +53,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A daemon for managing internet connections";
-    homepage = https://connman.net/;
+    homepage = https://01.org/connman;
     maintainers = [ maintainers.matejc ];
     platforms = platforms.linux;
     license = licenses.gpl2;
-- 
GitLab


From fac358731d6b9d46dd4ff4f3ddfcaeb5f2c7d1ad Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@web.de>
Date: Sat, 19 May 2018 18:59:04 +0200
Subject: [PATCH 0982/1085] Unbreak gv (fixes #34841) (#40658)

It appears that without pkgconfig, the build process misdetects some features, resulting in gv to segfault immediately on startup.

The fix was adopted from https://github.com/Homebrew/legacy-homebrew/issues/18555#issuecomment-15074618.
---
 pkgs/applications/misc/gv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix
index b13e7ae5232..036cb104b48 100644
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
     Xaw3d
     ghostscriptX
     perl
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
     pkgconfig
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
     libiconv
   ];
 
-- 
GitLab


From 2c7c9cbbac3670f2a118b777012559ce4550d17a Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sat, 19 May 2018 12:06:16 -0500
Subject: [PATCH 0983/1085] gcc5: delete unused patch

---
 .../compilers/gcc/5/libcxx38-and-above.patch  | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/5/libcxx38-and-above.patch

diff --git a/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch b/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch
deleted file mode 100644
index ee48901a6d0..00000000000
--- a/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-This is a slightly modified version of https://svnweb.freebsd.org/ports/head/lang/gcc5/files/patch-libc%2B%2B?revision=432958&view=co&pathrev=432958,
-which doesn't apply cleanly due to them using a slightly different format of patch from us. I just replaced the .orig file references with a/b paths.
-
---- a/gcc/auto-profile.c 2015-01-18 02:25:42 UTC
-+++ b/gcc/auto-profile.c
-@@ -19,11 +19,9 @@ along with GCC; see the file COPYING3.  
- <http://www.gnu.org/licenses/>.  */
- 
- #include "config.h"
--#include "system.h"
--
--#include <string.h>
- #include <map>
- #include <set>
-+#include "system.h"
- 
- #include "coretypes.h"
- #include "hash-set.h"
---- a/gcc/graphite-isl-ast-to-gimple.c 2017-01-19 21:02:12 UTC
-+++ b/gcc/graphite-isl-ast-to-gimple.c
-@@ -38,6 +38,7 @@ extern "C" {
- #endif
- #endif
- 
-+#include <map>
- #include "system.h"
- #include "coretypes.h"
- #include "hash-set.h"
-@@ -75,7 +76,6 @@ extern "C" {
- #include "tree-scalar-evolution.h"
- #include "gimple-ssa.h"
- #include "tree-into-ssa.h"
--#include <map>
- 
- #ifdef HAVE_isl
- #include "graphite-poly.h"
---- a/gcc/system.h 2015-01-05 12:33:28 UTC
-+++ b/gcc/system.h
-@@ -217,6 +217,7 @@ extern int errno;
- #ifdef __cplusplus
- # include <algorithm>
- # include <cstring>
-+# include <new>
- # include <utility>
- #endif
- 
-- 
GitLab


From f434c71def988861308ce1aeb922d0d773e76d11 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 18 May 2018 16:59:36 -0400
Subject: [PATCH 0984/1085] antibody: init at 3.4.6

---
 pkgs/shells/zsh/antibody/default.nix | 25 +++++++++
 pkgs/shells/zsh/antibody/deps.nix    | 83 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 +
 3 files changed, 110 insertions(+)
 create mode 100644 pkgs/shells/zsh/antibody/default.nix
 create mode 100644 pkgs/shells/zsh/antibody/deps.nix

diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
new file mode 100644
index 00000000000..b95ba35045d
--- /dev/null
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "antibody-${version}";
+  version = "3.4.6";
+  rev = "v${version}";
+  
+  goPackagePath = "github.com/getantibody/antibody";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "getantibody";
+    repo   = "antibody";
+    sha256 = "0pvsngvlxv5iw7yj18snslag8c61ji4w3j3rw543ckl6k3f9zq6c";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "The fastest shell plugin manager";
+    homepage    = https://github.com/getantibody/antibody;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ worldofpeace ];
+  };
+}
diff --git a/pkgs/shells/zsh/antibody/deps.nix b/pkgs/shells/zsh/antibody/deps.nix
new file mode 100644
index 00000000000..6e97ff31902
--- /dev/null
+++ b/pkgs/shells/zsh/antibody/deps.nix
@@ -0,0 +1,83 @@
+[
+  {
+    goPackagePath = "github.com/alecthomas/kingpin";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/kingpin";
+      rev = "a39589180ebd6bbf43076e514b55f20a95d43086";
+      sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    goPackagePath = "github.com/caarlos0/gohome";
+    fetch = {
+      type = "git";
+      url = "https://github.com/caarlos0/gohome";
+      rev = "c08fdebe2a8b9b92637a423c66ac5d4a8f4e91e8";
+      sha256 = "1wpg7dpi44kic4y20bk6fjwpanm65h1hj4762dsp41kbdfzc8322";
+    };
+  }
+  {
+    goPackagePath = "github.com/getantibody/folder";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getantibody/folder";
+      rev = "e65aa38ebeb03e6d6e91b90a637f3b7c17e1b6d6";
+      sha256 = "0h8al3sl4gxg1p33s8jrz91i7vrqahk12p0b3srlhnz1sn4ahn8n";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
+      sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "2491c5de3490fced2f6cff376127c667efeed857";
+      sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e269cbb956a..f84ac2b5c6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1453,6 +1453,8 @@ with pkgs;
     utillinux = utillinuxMinimal;
   };
 
+  antibody = callPackage ../shells/zsh/antibody { };
+  
   antigen = callPackage ../shells/zsh/antigen { };
 
   apparix = callPackage ../tools/misc/apparix { };
-- 
GitLab


From 84919cd3ef14363d15958227f860b3a31401490a Mon Sep 17 00:00:00 2001
From: Eric Bailey <e.bailey@sportradar.com>
Date: Fri, 18 May 2018 09:04:41 -0500
Subject: [PATCH 0985/1085] m-cli: init at 0.2.5

---
 pkgs/os-specific/darwin/m-cli/default.nix | 45 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 +-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/m-cli/default.nix

diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix
new file mode 100644
index 00000000000..75f1113e9f0
--- /dev/null
+++ b/pkgs/os-specific/darwin/m-cli/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "m-cli-${version}";
+  version = "0.2.5";
+
+  src = fetchFromGitHub {
+    owner = "rgcr";
+    repo = "m-cli";
+    rev = "v${version}";
+    sha512 = "0mkcx7jq91pbfs8327qc8434gj73fvjgdfdsrza0lyd9wns6jhsqsf0585klzl68aqscvksgzi2asdnim4va35cdkp2fdzl0g3sm4kd";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    local MPATH="$out/share/m"
+
+    gawk -i inplace '{
+      gsub(/^\[ -L.*|^\s+\|\| pushd.*|^popd.*/, "");
+      gsub(/MPATH=.*/, "MPATH='$MPATH'");
+      gsub(/(update|uninstall)_mcli \&\&.*/, "echo NOOP \\&\\& exit 0");
+      print
+    }' m
+
+    install -Dt "$MPATH/plugins" -m755 plugins/*
+
+    install -Dm755 m $out/bin/m
+
+    install -Dt "$out/share/bash-completion/completions/" -m444 completion/bash/m
+    install -Dt "$out/share/fish/vendor_completions.d/" -m444 completion/fish/m.fish
+    install -Dt "$out/share/zsh/site-functions/" -m444 completion/zsh/_m
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Swiss Army Knife for macOS";
+    inherit (src.meta) homepage;
+    repositories.git = git://github.com/rgcr/m-cli.git;
+
+    license = licenses.mit;
+
+    platforms = platforms.darwin;
+    maintainers = with maintainers; [ yurrriq ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64cdad2282b..e8e92684096 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -683,6 +683,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };
 
+  m-cli = callPackage ../os-specific/darwin/m-cli { };
+
   reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};
 
   skhd = callPackage ../os-specific/darwin/skhd {
@@ -3163,7 +3165,7 @@ with pkgs;
   jing-trang = callPackage ../tools/text/xml/jing-trang { };
 
   jira-cli = callPackage ../development/tools/jira_cli { };
- 
+
   jl = haskellPackages.callPackage ../development/tools/jl { };
 
   jmespath = callPackage ../development/tools/jmespath { };
-- 
GitLab


From 05e93475f39bca01d186811f9dd11785710fc25c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 19 May 2018 21:45:40 +0200
Subject: [PATCH 0986/1085] jekyll: 3.8.1 -> 3.8.2

---
 .../misc/jekyll/basic/Gemfile.lock            |  6 ++---
 .../applications/misc/jekyll/basic/gemset.nix | 12 +++++-----
 .../misc/jekyll/full/Gemfile.lock             | 12 +++++-----
 pkgs/applications/misc/jekyll/full/gemset.nix | 24 +++++++++----------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index a0b1916fb18..3cead5d24ad 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -13,17 +13,17 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.6)
+    eventmachine (1.2.7)
     ffi (1.9.23)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    html-pipeline (2.7.2)
+    html-pipeline (2.8.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.1)
+    jekyll (3.8.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index c93f93f457d..e96438eefe3 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -45,10 +45,10 @@
   eventmachine = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0";
+      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
       type = "gem";
     };
-    version = "1.2.6";
+    version = "1.2.7";
   };
   ffi = {
     source = {
@@ -78,10 +78,10 @@
     dependencies = ["activesupport" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp";
+      sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
       type = "gem";
     };
-    version = "2.7.2";
+    version = "2.8.0";
   };
   "http_parser.rb" = {
     source = {
@@ -104,10 +104,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6";
+      sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8";
       type = "gem";
     };
-    version = "3.8.1";
+    version = "3.8.2";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index bbcdad669da..323a0c2f360 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -20,21 +20,21 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.6)
+    eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.15.0)
+    faraday (0.15.1)
       multipart-post (>= 1.2, < 3)
     fast-stemmer (1.0.2)
     ffi (1.9.23)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    html-pipeline (2.7.2)
+    html-pipeline (2.8.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.1)
+    jekyll (3.8.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -92,7 +92,7 @@ GEM
     multipart-post (2.0.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
-    octokit (4.8.0)
+    octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)
@@ -103,7 +103,7 @@ GEM
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rdiscount (2.2.0.1)
-    rdoc (6.0.3)
+    rdoc (6.0.4)
     redcarpet (3.4.0)
     rouge (3.1.1)
     ruby_dep (1.5.0)
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index 8473cee0be5..7fc93589236 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -79,10 +79,10 @@
   eventmachine = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0";
+      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
       type = "gem";
     };
-    version = "1.2.6";
+    version = "1.2.7";
   };
   execjs = {
     source = {
@@ -96,10 +96,10 @@
     dependencies = ["multipart-post"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dv1vcxxyw4vy0r2diiml0r8zqk1csrksfxv8nkrw61xlf2daaaa";
+      sha256 = "0q3z6mm6ym11jrzi1hqcwi0mkydb5m980g8is6ggkcxrinmx2nxx";
       type = "gem";
     };
-    version = "0.15.0";
+    version = "0.15.1";
   };
   fast-stemmer = {
     source = {
@@ -137,10 +137,10 @@
     dependencies = ["activesupport" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp";
+      sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
       type = "gem";
     };
-    version = "2.7.2";
+    version = "2.8.0";
   };
   "http_parser.rb" = {
     source = {
@@ -163,10 +163,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6";
+      sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8";
       type = "gem";
     };
-    version = "3.8.1";
+    version = "3.8.2";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
@@ -379,10 +379,10 @@
     dependencies = ["sawyer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg";
+      sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298";
       type = "gem";
     };
-    version = "4.8.0";
+    version = "4.9.0";
   };
   pathutil = {
     dependencies = ["forwardable-extended"];
@@ -438,10 +438,10 @@
   rdoc = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ia6gq4fnwkm29j34yncg74w0nq5iyyrcjjhmkwzmzw9dbs0zy8a";
+      sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.4";
   };
   redcarpet = {
     source = {
-- 
GitLab


From 2b7fe3bf5ae5de32318bf79839d4b57175e51c6e Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 19 May 2018 17:21:40 -0300
Subject: [PATCH 0987/1085] xorg: replace edits to generated script

- update versions in .list files to match
- move cf-files postInstall to overrides.nix
---
 pkgs/servers/x11/xorg/default.nix       | 3 ---
 pkgs/servers/x11/xorg/old.list          | 2 +-
 pkgs/servers/x11/xorg/overrides.nix     | 6 ++++++
 pkgs/servers/x11/xorg/tarballs-7.7.list | 8 ++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 07faa8d3cc7..f5d7f54eb5c 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2570,9 +2570,6 @@ let
       url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2;
       sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
     };
-    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
-      substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
-    '';
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index 801f6e0b797..fd6eae91639 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -3,7 +3,7 @@ mirror://xorg/individual/app/xclock-1.0.7.tar.bz2
 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
 mirror://xorg/individual/app/xfs-1.1.4.tar.bz2
-mirror://xorg/individual/app/xinit-1.3.4.tar.bz2
+mirror://xorg/individual/app/xinit-1.4.0.tar.bz2
 mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2
 mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2
 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0da75f941f0..01e990b5574 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -650,6 +650,12 @@ in
     ];
   };
 
+  xorgcffiles = attrs: attrs // {
+    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
+    '';
+  };
+
   xwd = attrs: attrs // {
     buildInputs = with xorg; attrs.buildInputs ++ [libXt libxkbfile];
   };
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index dd48748dceb..70f3a35505e 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2
 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
 mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2
 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
-mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2
+mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
 mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
@@ -101,7 +101,7 @@ mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2
 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
 mirror://xorg/individual/app/twm-1.0.9.tar.bz2
-mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2
+mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
 mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
@@ -131,7 +131,7 @@ mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2
 mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
@@ -164,7 +164,7 @@ mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2
+mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
-- 
GitLab


From 9cd1702502630eb3fc76d7b0e6a4548afdd37ede Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 15:28:43 +0200
Subject: [PATCH 0988/1085] LTS Haskell 11.9

---
 .../configuration-hackage2nix.yaml            | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b3f8efa3963..41831058181 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.8
+  # LTS Haskell 11.9
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -94,7 +94,7 @@ default-package-overrides:
   - amqp ==0.18.1
   - annotated-wl-pprint ==0.7.0
   - ansigraph ==0.3.0.5
-  - ansi-terminal ==0.8.0.3
+  - ansi-terminal ==0.8.0.4
   - ansi-wl-pprint ==0.6.8.2
   - ANum ==0.2.0.2
   - apecs ==0.2.4.7
@@ -291,7 +291,7 @@ default-package-overrides:
   - Chart-cairo ==1.8.3
   - chaselev-deque ==0.5.0.5
   - ChasingBottoms ==1.3.1.4
-  - chatwork ==0.1.3.2
+  - chatwork ==0.1.3.3
   - cheapskate ==0.1.1
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
@@ -526,7 +526,7 @@ default-package-overrides:
   - doctest-driver-gen ==0.2.0.2
   - do-list ==1.0.1
   - dom-parser ==3.0.0
-  - dotenv ==0.5.2.4
+  - dotenv ==0.5.2.5
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
   - download ==0.3.2.6
@@ -906,7 +906,7 @@ default-package-overrides:
   - hmpfr ==0.4.4
   - hocilib ==0.2.0
   - Hoed ==0.5.1
-  - hOpenPGP ==2.6.1
+  - hOpenPGP ==2.6.2
   - hopfli ==0.2.2.1
   - hosc ==0.16
   - hostname ==1.0
@@ -937,9 +937,9 @@ default-package-overrides:
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
   - hsinstall ==1.6
-  - HSlippyMap ==3.0
+  - HSlippyMap ==3.0.1
   - hslogger ==1.2.10
-  - hslua ==0.9.5.1
+  - hslua ==0.9.5.2
   - hslua-aeson ==0.3.0.1
   - hslua-module-text ==0.1.2.1
   - hsndfile ==0.8.0
@@ -1051,7 +1051,7 @@ default-package-overrides:
   - indentation-parsec ==0.0.0.1
   - indents ==0.4.0.1
   - indexed-list-literals ==0.1.0.1
-  - inflections ==0.4.0.1
+  - inflections ==0.4.0.3
   - influxdb ==1.3.0.1
   - ini ==0.3.6
   - inline-c ==0.6.0.6
@@ -1087,7 +1087,7 @@ default-package-overrides:
   - IPv6DB ==0.2.6
   - ipython-kernel ==0.9.0.2
   - irc ==0.6.1.0
-  - irc-client ==1.1.0.2
+  - irc-client ==1.1.0.3
   - irc-conduit ==0.3.0.1
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.1
@@ -1101,7 +1101,7 @@ default-package-overrides:
   - ix-shapable ==0.1.0
   - jack ==0.7.1.3
   - javascript-extras ==0.3.2.0
-  - jmacro ==0.6.14
+  - jmacro ==0.6.15
   - jmacro-rpc ==0.3.2
   - jmacro-rpc-happstack ==0.3.2
   - jmacro-rpc-snap ==0.3
@@ -1287,7 +1287,7 @@ default-package-overrides:
   - minimorph ==0.1.6.1
   - minio-hs ==1.0.0
   - miniutter ==0.4.7.0
-  - mintty ==0.1.1
+  - mintty ==0.1.2
   - misfortune ==0.1.1.2
   - miso ==0.14.0.0
   - missing-foreign ==0.1.1
@@ -1315,7 +1315,7 @@ default-package-overrides:
   - monadloc ==0.7.1
   - monad-logger ==0.3.28.5
   - monad-logger-json ==0.1.0.0
-  - monad-logger-prefix ==0.1.9
+  - monad-logger-prefix ==0.1.10
   - monad-logger-syslog ==0.1.4.0
   - monad-loops ==0.4.3
   - monad-memo ==0.4.1
@@ -1358,7 +1358,7 @@ default-package-overrides:
   - murmur-hash ==0.1.0.9
   - mustache ==2.3.0
   - mutable-containers ==0.3.4
-  - mwc-probability ==2.0.2
+  - mwc-probability ==2.0.3
   - mwc-random ==0.13.6.0
   - mwc-random-accelerate ==0.1.0.0
   - mysql ==0.1.5
@@ -1653,7 +1653,7 @@ default-package-overrides:
   - raaz ==0.2.0
   - rainbow ==0.28.0.4
   - rainbox ==0.18.0.10
-  - rakuten ==0.1.1.1
+  - rakuten ==0.1.1.2
   - ramus ==0.1.2
   - random ==1.1
   - random-fu ==0.2.7.0
@@ -1731,6 +1731,7 @@ default-package-overrides:
   - rfc5051 ==0.1.0.3
   - riak ==1.1.2.4
   - riak-protobuf ==0.23.0.0
+  - rio ==0.1.2.0
   - rng-utils ==0.3.0
   - roles ==0.2.0.0
   - rollbar-hs ==0.2.0.0
@@ -1754,13 +1755,13 @@ default-package-overrides:
   - say ==0.1.0.0
   - sbp ==2.3.16
   - sbv ==7.5
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
   - schematic ==0.4.2.0
-  - scientific ==0.3.6.0
+  - scientific ==0.3.6.2
   - scotty ==0.11.1
   - scrypt ==0.5.0
   - sdl2 ==2.4.0.1
@@ -1798,7 +1799,7 @@ default-package-overrides:
   - servant-github-webhook ==0.4.1.0
   - servant-js ==0.9.3.2
   - servant-JuicyPixels ==0.3.0.3
-  - servant-kotlin ==0.1.1.0
+  - servant-kotlin ==0.1.1.1
   - servant-lucid ==0.8
   - servant-mock ==0.8.4
   - servant-pandoc ==0.5.0.0
@@ -1951,7 +1952,7 @@ default-package-overrides:
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
   - superbuffer ==0.3.1.1
-  - svg-builder ==0.1.0.2
+  - svg-builder ==0.1.1
   - svg-tree ==0.6.2.2
   - swagger ==0.3.0
   - swagger2 ==2.2.1
@@ -2128,7 +2129,7 @@ default-package-overrides:
   - ua-parser ==0.7.4.1
   - uglymemo ==0.1.0.1
   - unbounded-delays ==0.1.1.0
-  - unbound-generics ==0.3.2
+  - unbound-generics ==0.3.3
   - unboxed-ref ==0.4.0.0
   - uncertain ==0.3.1.0
   - unexceptionalio ==0.3.0
@@ -2258,7 +2259,7 @@ default-package-overrides:
   - web-routes-th ==0.22.6.3
   - web-routes-wai ==0.24.3.1
   - webrtc-vad ==0.1.0.3
-  - websockets ==0.12.4.0
+  - websockets ==0.12.4.1
   - websockets-rpc ==0.6.0
   - websockets-simple ==0.0.6.3
   - websockets-snap ==0.10.2.5
@@ -2305,7 +2306,7 @@ default-package-overrides:
   - x509-validation ==1.6.10
   - Xauth ==0.1
   - xdg-basedir ==0.2.2
-  - xeno ==0.3.3
+  - xeno ==0.3.4
   - xenstore ==0.1.1
   - xhtml ==3000.2.2
   - xls ==0.1.1
@@ -2333,7 +2334,7 @@ default-package-overrides:
   - xturtle ==0.2.0.0
   - xxhash ==0.0.2
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.8.29
+  - yaml ==0.8.30
   - Yampa ==0.10.7
   - YampaSynth ==0.2
   - yeshql ==3.0.1.3
@@ -2343,7 +2344,7 @@ default-package-overrides:
   - yesod-auth-fb ==1.9.0
   - yesod-auth-hashdb ==1.7
   - yesod-bin ==1.6.0.2
-  - yesod-core ==1.6.4
+  - yesod-core ==1.6.5
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
-- 
GitLab


From 02834ba458e29e438a679fcb7a557b06a151aa1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 May 2018 02:31:15 +0200
Subject: [PATCH 0989/1085] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/a6208828bf7986612c16ac0de6bebd9a3dc32d2e.
---
 .../haskell-modules/hackage-packages.nix      | 4460 +++++++++++++----
 1 file changed, 3413 insertions(+), 1047 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index bad45c3a27e..b6f5c57c73c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4924,6 +4924,17 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "Enum" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "Enum";
+       version = "0.1.0.0";
+       sha256 = "1zl5w5w3rqbh4awp4b4rbamkqcvnrzn944rjc84sq3rqad3wlww2";
+       libraryHaskellDepends = [ base ];
+       description = "Non-crashing `Enum` operations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "EnumContainers" = callPackage
     ({ mkDerivation, base, containers, deepseq }:
      mkDerivation {
@@ -5554,12 +5565,12 @@ self: {
      }) {};
 
   "Fin" = callPackage
-    ({ mkDerivation, base, clist, natural-induction, peano }:
+    ({ mkDerivation, base, natural-induction, peano }:
      mkDerivation {
        pname = "Fin";
-       version = "0.2.0.0";
-       sha256 = "0w4gmfhpav73rkia3q7g6m4lncz1smhfa0rl2sr0602sc0694spr";
-       libraryHaskellDepends = [ base clist natural-induction peano ];
+       version = "0.2.3.0";
+       sha256 = "1cjsp6i1ak2icjmg0xrprn2xminz35mxb4dj1nsvjvs2qqgjvl1g";
+       libraryHaskellDepends = [ base natural-induction peano ];
        description = "Finite totally-ordered sets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6084,8 +6095,8 @@ self: {
     ({ mkDerivation, array, base, process }:
      mkDerivation {
        pname = "GHood";
-       version = "0.0.6";
-       sha256 = "0n9vp4y5d1fx45x6s5a84ylyvnjyaq44x9r46zyh0dkyrms3jsqi";
+       version = "0.0.7";
+       sha256 = "056kil71f488xf87xlyx9p5jpah2azhbnb2r7hwdyxbz7izns2ks";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process ];
        homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood";
@@ -8652,8 +8663,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "HSlippyMap";
-       version = "3.0";
-       sha256 = "1kqyahisqzilndargvyh0gqln3471ll1jkpnayirfi9am1by4f93";
+       version = "3.0.1";
+       sha256 = "03gb5dd59mirwb11b98vbg60w2zwfsbr8akk7qbq01z7n7rkgsr7";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/apeyroux/HSlippyMap";
        description = "OpenStreetMap Slippy Map";
@@ -9161,6 +9172,8 @@ self: {
        pname = "HaXml";
        version = "1.25.4";
        sha256 = "1d8xq37h627im5harybhsn08qjdaf6vskldm03cqbfjmr2w6fx6p";
+       revision = "1";
+       editedCabalFile = "1vnil3xdyhr48f0nxcaljbl1k5ibg5g5gghvrhykg447b0jvp922";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -9568,17 +9581,17 @@ self: {
 
   "Hastodon" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
-     , exceptions, http-client, http-conduit, http-types, mime-types
-     , MissingH, resourcet, text, transformers
+     , containers, exceptions, http-client, http-conduit, http-types
+     , mime-types, MissingH, resourcet, text, transformers
      }:
      mkDerivation {
        pname = "Hastodon";
-       version = "0.4.1";
-       sha256 = "08skn3qvqfzll1hhzayqm46kwdl45kbckgwvzjm4bqa5w5jvh708";
+       version = "0.5.0";
+       sha256 = "1yr72vkj4ir7q6w1fnffra9lr0jvz2pfskd2g1zwg3a778cbyx9h";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit exceptions http-client
-         http-conduit http-types mime-types MissingH resourcet text
-         transformers
+         aeson attoparsec base bytestring conduit containers exceptions
+         http-client http-conduit http-types mime-types MissingH resourcet
+         text transformers
        ];
        homepage = "https://github.com/syucream/hastodon";
        description = "mastodon client module for Haskell";
@@ -12268,6 +12281,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Map" = callPackage
+    ({ mkDerivation, base, containers, either-both, filtrable, map
+     , smallcheck, tasty, tasty-smallcheck, util
+     }:
+     mkDerivation {
+       pname = "Map";
+       version = "0.0.0.0";
+       sha256 = "1w79zzlzh3ivrqznvcrg5kgaizzs838y7hd52nvxn5v7lax5y3wz";
+       libraryHaskellDepends = [
+         base containers either-both filtrable util
+       ];
+       testHaskellDepends = [
+         base map smallcheck tasty tasty-smallcheck
+       ];
+       description = "Class of key-value maps";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {map = null;};
+
   "Mapping" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -13914,6 +13947,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "OneTuple_0_2_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "OneTuple";
+       version = "0.2.2";
+       sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq";
+       libraryHaskellDepends = [ base ];
+       description = "Singleton Tuple";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Only" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
@@ -14749,6 +14794,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Persistence" = callPackage
+    ({ mkDerivation, base, containers, maximal-cliques, parallel
+     , vector
+     }:
+     mkDerivation {
+       pname = "Persistence";
+       version = "1.0";
+       sha256 = "12n0d5r03cp88svw0mfhimsr4a585qsq90cpszmcr3l5gsai3h9d";
+       libraryHaskellDepends = [
+         base containers maximal-cliques parallel vector
+       ];
+       description = "Quickly detect clusters and holes in data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Phsu" = callPackage
     ({ mkDerivation, acid-state, aeson, base, blaze-html, blaze-markup
      , containers, curl, filepath, friendly-time, happstack-server
@@ -16667,8 +16727,8 @@ self: {
      }:
      mkDerivation {
        pname = "SciFlow";
-       version = "0.6.1";
-       sha256 = "0axwf7rdwhl3ppq6qlxrffzbzbwvb8q0ygpnlzc2yvksiqzp9h2g";
+       version = "0.6.2";
+       sha256 = "1d5qw79809v7q2dvyz7h857lhdbahcj8915pz0bz95nmknbjc50f";
        libraryHaskellDepends = [
          aeson base bytestring cereal cereal-text containers
          data-default-class directory exceptions executable-path fgl
@@ -21796,6 +21856,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "acquire" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "acquire";
+       version = "0.2.0.1";
+       sha256 = "0l6c3kdvg71z6pfjg71jgaffb403w8y8lixw4dhi7phhhb91phn2";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/metrix-ai/acquire";
+       description = "Abstraction over management of resources";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "action-permutations" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -21815,8 +21887,8 @@ self: {
        pname = "active";
        version = "0.2.0.13";
        sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx";
-       revision = "4";
-       editedCabalFile = "1p2gaazj7r98v45d57hshgv6nxam5l47dl6y9iq65z5zqylmz7q2";
+       revision = "5";
+       editedCabalFile = "0hwla9xz275qzgn9n07311ksl3j40izidki1nbhmrmmmfjin57cv";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -22246,20 +22318,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_1_3_1_0" = callPackage
+  "aeson_1_3_1_1" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, directory
      , dlist, filepath, generic-deriving, ghc-prim, hashable
      , hashable-time, HUnit, integer-logarithms, QuickCheck
-     , quickcheck-instances, scientific, tagged, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, th-abstraction, time, time-locale-compat
-     , unordered-containers, uuid-types, vector
+     , quickcheck-instances, scientific, tagged, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, th-abstraction, time
+     , time-locale-compat, unordered-containers, uuid-types, vector
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.3.1.0";
-       sha256 = "0ljndkgibz3qbddz2451v1r9w8i440kpslg3al3m7gc82mxz2xrr";
+       version = "1.3.1.1";
+       sha256 = "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text
@@ -22270,9 +22341,9 @@ self: {
          attoparsec base base-compat base-orphans base16-bytestring
          bytestring containers directory dlist filepath generic-deriving
          ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
-         quickcheck-instances scientific tagged template-haskell
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         time time-locale-compat unordered-containers uuid-types vector
+         quickcheck-instances scientific tagged tasty tasty-hunit
+         tasty-quickcheck template-haskell text time time-locale-compat
+         unordered-containers uuid-types vector
        ];
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
@@ -22398,6 +22469,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-decode" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, containers, data-default
+     , hedgehog, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-decode";
+       version = "0.1.0.0";
+       sha256 = "0x5gjp86554p09r8r73wpmv840d6dkc7vmqyq60nj6v6spq5v7bx";
+       libraryHaskellDepends = [
+         aeson base containers data-default text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson-qq base containers hedgehog text time
+       ];
+       homepage = "https://github.com/typeclasses/aeson-decode";
+       description = "Easy functions for converting from Aeson.Value";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "aeson-diff" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , edit-distance-vector, filepath, Glob, hashable, hlint, mtl
@@ -22427,6 +22517,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-diff_1_1_0_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, doctest
+     , edit-distance-vector, filepath, Glob, hashable, mtl
+     , optparse-applicative, QuickCheck, quickcheck-instances
+     , scientific, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-diff";
+       version = "1.1.0.5";
+       sha256 = "1kzvqzbl6pp5g49dp4qqc7cbisnkpqz0i18b6nmdb7f1nrhdvnb1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring edit-distance-vector hashable mtl scientific
+         text unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring optparse-applicative text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory doctest filepath Glob QuickCheck
+         quickcheck-instances text unordered-containers vector
+       ];
+       homepage = "https://github.com/thsutton/aeson-diff";
+       description = "Extract and apply patches to JSON documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-diff-generic" = callPackage
     ({ mkDerivation, aeson, aeson-diff, base, base-compat, bytestring
      , containers, dlist, hashable, lens, scientific, tagged
@@ -23048,6 +23167,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "affine" = callPackage
+    ({ mkDerivation, alg, base }:
+     mkDerivation {
+       pname = "affine";
+       version = "0.1.1.0";
+       sha256 = "094h5b5l755sm79mr47dm5brp2jvfd2g0mdz23mcw1pz57lm0c8i";
+       libraryHaskellDepends = [ alg base ];
+       description = "Affine spaces (generalized)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "affine-invariant-ensemble-mcmc" = callPackage
     ({ mkDerivation, base, containers, mwc-random, primitive, split
      , vector
@@ -23784,8 +23914,8 @@ self: {
     ({ mkDerivation, base, util }:
      mkDerivation {
        pname = "alg";
-       version = "0.2.4.1";
-       sha256 = "0fx3q5ivd942yly212k0qdrhwbjpx0y4sj1r2r9lbhxb2941rg4n";
+       version = "0.2.5.0";
+       sha256 = "014wrh4f58lq50n5ybdksr2k5lygs5qxsyxg48zpbzzz3p3494yx";
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
@@ -24486,20 +24616,20 @@ self: {
 
   "amazonka" = callPackage
     ({ mkDerivation, amazonka-core, base, bytestring, conduit
-     , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
-     , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
-     , time, transformers, transformers-base, transformers-compat
+     , conduit-extra, directory, exceptions, http-client, http-conduit
+     , http-types, ini, mmorph, monad-control, mtl, resourcet, retry
+     , tasty, tasty-hunit, text, time, transformers, transformers-base
+     , transformers-compat, void
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "1.5.0";
-       sha256 = "0g5fb1kwydhhi4pvp4skc0l26gy0kdpbrl3pixmnml5d2fxa86pw";
-       revision = "1";
-       editedCabalFile = "0v4wfwrm0zjzm1g2gw9qi521hlvzg26dm79x03zy8i2aqg8rqgri";
+       version = "1.6.0";
+       sha256 = "07647x7lq9kaq6bqh38rvdiajji4ks6s7nvxv2xi4v4lhwn8j89p";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
-         exceptions http-conduit ini mmorph monad-control mtl resourcet
-         retry text time transformers transformers-base transformers-compat
+         exceptions http-client http-conduit http-types ini mmorph
+         monad-control mtl resourcet retry text time transformers
+         transformers-base transformers-compat void
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/brendanhay/amazonka";
@@ -24508,14 +24638,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-alexa-business" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-alexa-business";
+       version = "1.6.0";
+       sha256 = "0r8qdcc4fxgpx7pgfkcah6pxq8dixaw167ph30a087rr74rfk0k1";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Alexa For Business SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-apigateway" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-apigateway";
-       version = "1.5.0";
-       sha256 = "1yamp1wlhji496sd0c6gkilx6n3m59wwvxpfh3vpy4wv93xh5494";
+       version = "1.6.0";
+       sha256 = "1s2snyx9s23435wsan8hbi1vnql3n3rgh23ffv9d0n43pp7kxrjn";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24533,8 +24681,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-application-autoscaling";
-       version = "1.5.0";
-       sha256 = "0iwrzk9wfnf46as45lv31qxghlbq823yphkw0dzh39vmqyc2zmfn";
+       version = "1.6.0";
+       sha256 = "1xqxlrw02r4w5h348ab04lrwp4cxk3sksx5xhmxr1macqb8sfdjm";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24552,8 +24700,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-appstream";
-       version = "1.5.0";
-       sha256 = "05g5xz68v3azvh8f5hcqijvif6g4jm0bmb3y9fgcn21f4lzl6ibc";
+       version = "1.6.0";
+       sha256 = "1ps76yri9bnfkr4ya1yc9myrzpf44a01nrkd03kw8qidjcmnk47b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24565,14 +24713,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-appsync" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-appsync";
+       version = "1.6.0";
+       sha256 = "0yvi3gjzpb1i7ria8asc054p9jnxqilkb4gzd4pj40mjls28bxj5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon AppSync SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-athena" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-athena";
-       version = "1.5.0";
-       sha256 = "0chg6wgp20qlpz9w5sryy9i2cxbnb9zdh2a6sg94vrivl3q19d5d";
+       version = "1.6.0";
+       sha256 = "1nvprlnbr6wp96cykgnkbchp2n6vz6ngw2sxsvapds2n2swfxm4r";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24590,8 +24756,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "1.5.0";
-       sha256 = "1jmpz15r5sdc3rmvbhs4jla3qnafyqaq1vyngn9276a6ks338ivk";
+       version = "1.6.0";
+       sha256 = "1lzqsn7bmq2yrdmn2hnic5cghmw7kxfmkvqcs8vrk2gg4cmi6lhv";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24603,14 +24769,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-autoscaling-plans" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-autoscaling-plans";
+       version = "1.6.0";
+       sha256 = "068c1z74gm94gb34y5lvnn03q4l5bm7w7j2a81zyfacijvzzpbgn";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Auto Scaling Plans SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-batch" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-batch";
-       version = "1.5.0";
-       sha256 = "0dchh04181kabhx1nl5cqw3kcsznggyrkzyrx028nfslww3as3mq";
+       version = "1.6.0";
+       sha256 = "0xh6fqaxgdsn4d7wb1j944npywn28p6srrsm3rpf7vbrc44gbc0y";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24628,8 +24812,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-budgets";
-       version = "1.5.0";
-       sha256 = "1kyi34iwg4l85a9ipkbjdac5wb2ij5rb1a49zww0izd09x3yx68a";
+       version = "1.6.0";
+       sha256 = "1dz4gi6qkkmfhz3yqj0pcjgsac4a2036bpiwayxdyzbzda2r5inc";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24647,8 +24831,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-certificatemanager";
-       version = "1.5.0";
-       sha256 = "0hnw9s9kzkrq9iv940g6zkaljw91xk9d6pya62g2y6dzp8ych5kq";
+       version = "1.6.0";
+       sha256 = "0sma4rbylmj7dl0irab5vh32na52l1qb34xpa6l4icx1hp397pqz";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24660,14 +24844,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-certificatemanager-pca" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-certificatemanager-pca";
+       version = "1.6.0";
+       sha256 = "1ixczihy7f9hyhw0dxqzs5m3bgnkakzn4w0h792625738bhwv0ag";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Certificate Manager Private Certificate Authority SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-cloud9" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloud9";
+       version = "1.6.0";
+       sha256 = "1i6npad6zszpx6bb47w1kppgds08z3mw5yx5jlbsl1a7y6ryv29v";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Cloud9 SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-clouddirectory" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-clouddirectory";
-       version = "1.5.0";
-       sha256 = "157myilbdk79nfyxvyljpajf3mlgqqhnypbp7psd41ypg87ndycd";
+       version = "1.6.0";
+       sha256 = "0vbmqpn6f4723cq9cqv5hdxyiw6s12yr1xk6wfjpg5j3rqa930kx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24685,8 +24905,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "1.5.0";
-       sha256 = "1s43xpwf26i9w2q6c2m3jcg8xr3wpza799krszr1cmhaivi1xmvi";
+       version = "1.6.0";
+       sha256 = "0dc3zb50vq3kkw65kkmrgz1vyjrzm1bmm3znj39i6slhfhjwiqhm";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24704,8 +24924,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "1.5.0";
-       sha256 = "05ai52ljar9j8jwlp5bp38zpfdjybsfdm6y3yp7if86md99sq9b0";
+       version = "1.6.0";
+       sha256 = "18ilsfm3918x3lzwr0v470n7pkc2r1iknlmz8bqbxfgkiyc60slm";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24723,8 +24943,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "1.5.0";
-       sha256 = "1644ldnp11wwn17xilkinm3bq8g9w4zfvyi6d95737xm1gr8gmx5";
+       version = "1.6.0";
+       sha256 = "0pqvliw77nk9c4ac3zhmbszlxcd13ibrg28rj31yi1lllcw708p4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24742,8 +24962,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsmv2";
-       version = "1.5.0";
-       sha256 = "0ix51kbs1ijwlzdy1drinmmyk6bcwrih2azrkqkd27fr6krnhs67";
+       version = "1.6.0";
+       sha256 = "0zpnzf062cmxaxvi36xfjk6q055xg6nh6ikralmnl6winnjjam6s";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24761,8 +24981,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "1.5.0";
-       sha256 = "1pyxz2k7r25wq3pmxgknasxjimszy0f1sf6rwlm7sp412rvfm09c";
+       version = "1.6.0";
+       sha256 = "1533ii94iyi7z0nsnldxmf0hgkpx01xz10mgsd7z9n5cfrak85yx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24780,8 +25000,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "1.5.0";
-       sha256 = "0kzl1pjzlijvc1m9yv8rf0zj6lwhk7qjgpmdvh8kbzdfpm8ynsrh";
+       version = "1.6.0";
+       sha256 = "19vwiyrcc591cpaflv0ji8fg7xjx1vba1f4kv0gh9mgfk9px7w14";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24799,8 +25019,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "1.5.0";
-       sha256 = "1m04h5n6hb2vg8hp2ikbdijv3a2mykzpafa1skg4gvy4qrbm5008";
+       version = "1.6.0";
+       sha256 = "090w96krmwd2h4l6s4hz04rfwwi4y6bifzfsw0hn7r62dbwrvnfr";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24818,8 +25038,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "1.5.0";
-       sha256 = "0n3v9li9fafhmwjfdydj8s495ni28qqf4xx13w7hflv10l6g2c25";
+       version = "1.6.0";
+       sha256 = "0lgfvca9gsqd38ly7f6dvvivi34qbpbqqng3hb89cbdjcjri5j15";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24837,8 +25057,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-events";
-       version = "1.5.0";
-       sha256 = "0q40yvj7bz5pkkr2w7g9nxspb2xbjdjr6nwnshpgkdjz61pcqb0p";
+       version = "1.6.0";
+       sha256 = "0kgcsbsxi6z84avfzmx9z1111h49yliyyiqww3b39if4dx1mxyqk";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24856,8 +25076,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "1.5.0";
-       sha256 = "05hh0lbxwj0cfwv38j4bnp5chjdvsgxgsh8whpza90k45v8kvjnr";
+       version = "1.6.0";
+       sha256 = "0zgfhz5646s6hkzw2n686rwhz5g9l1mrakagq3ngaagvy15fgr40";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24875,8 +25095,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codebuild";
-       version = "1.5.0";
-       sha256 = "1k85rrcfic92bpg2x20h4apad9f2pgqq6gggv7xs6dga8j596r21";
+       version = "1.6.0";
+       sha256 = "1ax0am75zy8xddzkn36sc9dpda1j5d28pbrdddhlr98airbl7gzx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24894,8 +25114,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codecommit";
-       version = "1.5.0";
-       sha256 = "0yr4h2ai1v0a2w26ms7v6vpzbn1k4wvchgfip6pqfsfbswq8vpy2";
+       version = "1.6.0";
+       sha256 = "0594d3frpxc2d9sw265dhph8q1gvzsx9n6l1vcgwglxbpwq2cbwa";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24913,8 +25133,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "1.5.0";
-       sha256 = "08q5jgxs3aff5b8bxv1y01rjwrm7j8s8z05kwj84gzpfjw98i8s8";
+       version = "1.6.0";
+       sha256 = "1py2sfnwgavqhb8z2ngxx6b3gh0f9r3l84r5w5dcn6l5p2dbj59k";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24932,8 +25152,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codepipeline";
-       version = "1.5.0";
-       sha256 = "0j99cgv1p5p7hxn0zc5s0d51l54bdkq4sd54q9p2a64fj6wa39ap";
+       version = "1.6.0";
+       sha256 = "0hy05s7wl410319z2svppg6aqc00zsix6m4l8gniqq1i34iflvn4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24951,8 +25171,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codestar";
-       version = "1.5.0";
-       sha256 = "085m8bwvhws3svalmrxjk737ml2f5rr4fajzg7c3n3f7n3jz4qjd";
+       version = "1.6.0";
+       sha256 = "1c0w48y9azn8im82lh8j98vh6zbkam7vkplf2wxw8azqc5a6746l";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24970,8 +25190,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "1.5.0";
-       sha256 = "08l3nzggjhjb2gr1ny0i3as5gb1rw6wkggr4i8hjvg2w68qydrm7";
+       version = "1.6.0";
+       sha256 = "1mdnr66nq86ndh80ymgvh12crdqyqv212qkb2r2hzz6k23i31b1s";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24989,8 +25209,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-idp";
-       version = "1.5.0";
-       sha256 = "18slhckyfq0mkwd2mv6g5dpas21q267sbqrlq2hn8cfglxcbjz3w";
+       version = "1.6.0";
+       sha256 = "1zqzx0l3g7kb22synk0hsy48zz320j906y7jnj7r7fqhrb48k2d9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25008,8 +25228,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "1.5.0";
-       sha256 = "0y3n8k9nfc7pnx5dbxnv9mcwcgmg7lf51sf2629zlbp4gf3pabga";
+       version = "1.6.0";
+       sha256 = "0dgldjisp3sxq3csnn7ffsh0bn1r2w32vlyz6dj6f7pkw7c11pjz";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25021,14 +25241,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-comprehend" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-comprehend";
+       version = "1.6.0";
+       sha256 = "0gr4mz6n0cq8xiaq07bk9k8bg6di9kv17fnbgfvlvcrdjvvipw1g";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Comprehend SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-config" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "1.5.0";
-       sha256 = "1lniwdf3fr33skld9916vqsm03q0lghcna8ywsv76rz68hnb6nb3";
+       version = "1.6.0";
+       sha256 = "1kf98bz7jikj3xh2k49lpf04i0p9y046x4mb93xwrywy0jy3xc2w";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25040,27 +25278,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-connect" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-connect";
+       version = "1.6.0";
+       sha256 = "0jkds33hh039mgqns9zssjk9fzg35fnmkdm32zf180088kxbkdi9";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Connect Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-core" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, cryptonite
-     , data-ordlist, deepseq, exceptions, hashable, http-conduit
-     , http-types, lens, memory, mtl, QuickCheck, quickcheck-unicode
-     , resourcet, scientific, semigroups, tagged, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, time, transformers
-     , transformers-compat, unordered-containers, xml-conduit, xml-types
+     , data-ordlist, deepseq, exceptions, hashable, http-client
+     , http-conduit, http-types, lens, memory, mtl, QuickCheck
+     , quickcheck-unicode, resourcet, scientific, semigroups, tagged
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+     , time, transformers, transformers-compat, unordered-containers
+     , xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "1.5.0";
-       sha256 = "173mdmk3p9jqnskjf5g9r1kr568plrmshb6p17cq11n1wnngkxnk";
-       revision = "2";
-       editedCabalFile = "1y1ian4wimsbng4c3ix8jd3pn3b0xhydzwv87blck4sgl41w83vl";
+       version = "1.6.0";
+       sha256 = "1j9x17zhyxrg4ds5pdxfjdb4z7hpzn42cydx34j25h5d9avwbqdg";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit conduit-extra cryptonite deepseq exceptions hashable
-         http-conduit http-types lens memory mtl resourcet scientific
-         semigroups tagged text time transformers transformers-compat
-         unordered-containers xml-conduit xml-types
+         http-client http-conduit http-types lens memory mtl resourcet
+         scientific semigroups tagged text time transformers
+         transformers-compat unordered-containers xml-conduit xml-types
        ];
        testHaskellDepends = [
          aeson base bytestring case-insensitive conduit data-ordlist
@@ -25073,14 +25328,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-cost-explorer" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cost-explorer";
+       version = "1.6.0";
+       sha256 = "0fvdz1x6wizad8xcssh3lyzyp9pk92k5hlajrwfp2gp2lb8a8p32";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Cost Explorer Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-cur" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cur";
-       version = "1.5.0";
-       sha256 = "1ndj6iyi6j9f1py791gcp5mi76h80vzvsclrwvyvz52nnfri6cmc";
+       version = "1.6.0";
+       sha256 = "0mzxyacabf6q237jdxlj5nwvbv9k7xn6kyk531p15839250j3m3y";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25098,8 +25371,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "1.5.0";
-       sha256 = "0fhnff3w8rsng0rzr6l7a3z98spfbn8zq348p23ci0m5v2qi6jk1";
+       version = "1.6.0";
+       sha256 = "1r9sbzc6z5md9z1yzb3sr41ih3kfjg5dx9z38p61rvv413bjs88v";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25117,8 +25390,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-devicefarm";
-       version = "1.5.0";
-       sha256 = "1c8vh1aalh48fl810ymk80k8g22dhzvcx9a2q360fm3m11wg1qqf";
+       version = "1.6.0";
+       sha256 = "0sf56mzd6kbyhq927wys8ayp9mvr0rpisjs6rs3s8m62n2w786yq";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25136,8 +25409,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "1.5.0";
-       sha256 = "14kbx10g3izyqaqyrd8gjr6hpljv7v6wafp0dsrgn54275mvjq10";
+       version = "1.6.0";
+       sha256 = "0ciqadw5kam6b51irx45kc3g03qh50pdp8d321v83b2yhv7bk1cd";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25155,8 +25428,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-discovery";
-       version = "1.5.0";
-       sha256 = "0m4kry9vx9jl62adaa9pgxcmaw9c2kxs48krdv5n5vx3ynqf4856";
+       version = "1.6.0";
+       sha256 = "04wj34lm7amxjcg9bm77nsfjgx76n9b4scj8pspc44qldgbpmikv";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25174,8 +25447,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dms";
-       version = "1.5.0";
-       sha256 = "1d9llyykrd4n6iqhs15f6jvzv8l61w8kalljx7skcxy8q98ydlh2";
+       version = "1.6.0";
+       sha256 = "1ww0l7xi9ia6danlm4mdh5d3y38jv56g4dd1jw588hkn5bf1jpx7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25193,8 +25466,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ds";
-       version = "1.5.0";
-       sha256 = "0mr9njmqwrlljwr78i3g4cdrjdyy3a516vvxj7754h5cmg0vbicj";
+       version = "1.6.0";
+       sha256 = "12fkcqhckmrkmh5prfrjdc6dq5cm0g3wsm9pz60jzrmf724k7yh6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25212,8 +25485,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "1.5.0";
-       sha256 = "1j11qc018z6pgcwm80v0jknfrasp4cx6l0f8kv804crasbf2y0n8";
+       version = "1.6.0";
+       sha256 = "0gwsgyjvqzyhzkfn73854s6hr55va6l6a3m074ajz5wqz3j4xx9k";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25231,8 +25504,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-dax";
-       version = "1.5.0";
-       sha256 = "036ipy0n16vxqy8agzvias7v4jq1gkcyqh0ppc5dcznsc4mklr0d";
+       version = "1.6.0";
+       sha256 = "0z9k6vvicmsjbd09sf5jym87zsc8dwbzpkiinwx4gz4zwfwqkrw3";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25250,8 +25523,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-streams";
-       version = "1.5.0";
-       sha256 = "0j80jm7xmfsjxnfa6zj0hfvzjv89clccdqalxn76mzc646qvgki1";
+       version = "1.6.0";
+       sha256 = "0zz590xdpjabic8m7if6a4pcfrdafqr66wcxnwn2758fyzfk5y5k";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25269,8 +25542,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "1.5.0";
-       sha256 = "0h8zw8jrdh6a4jf92pg5j9lcx242y88iz8spfs9djripv13hs3dh";
+       version = "1.6.0";
+       sha256 = "1k2mm5ypkwr07iwc76b15q823sv5rq5jxfz4r7qckal8w72c4892";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25288,8 +25561,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecr";
-       version = "1.5.0";
-       sha256 = "0n6a9zbc8a83l5dnma61gl57zk0sjn1276ds1378ymnj9l5pkgb8";
+       version = "1.6.0";
+       sha256 = "0l44xxify9k87imc09wvn56xnmvgf3n2ydvs4s3iph6lnka8l222";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25307,8 +25580,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "1.5.0";
-       sha256 = "08m2nds8d7pnvjk5s3f0kmrk0ml2ryzichyc4m0q69pc4yyakvj5";
+       version = "1.6.0";
+       sha256 = "0gyy9iglv8744p3h249j0mdd5n4f756ci2048frpb51mx2mkb59h";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25326,8 +25599,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-efs";
-       version = "1.5.0";
-       sha256 = "0b9ghl8i02gai4i0dhqv6ys8cblw6nr5338sg1zrkhlsdpkln1j5";
+       version = "1.6.0";
+       sha256 = "1fxg86zzjyv5lvlmn2f2iph5rwcfmwk740i2jjs3xmh68hlmd116";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25345,8 +25618,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "1.5.0";
-       sha256 = "05h1i0kbni000wwk4d80iajzqsa7s7qwxy4yybqn82r9gqgc9r75";
+       version = "1.6.0";
+       sha256 = "0s9rfrv128dsir497g9r6pp68xgfl34rshlcfgyk95fqw8n4m9z4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25364,8 +25637,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "1.5.0";
-       sha256 = "1cv0sf7x7a4b6fky28454kszzplcbmm1fk7c9b6pm4sxipv2qrbl";
+       version = "1.6.0";
+       sha256 = "0siqna1fcxwpbdvjicyv09l2wcfddda8c47nmdd70ns7cdbhdp61";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25383,8 +25656,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticsearch";
-       version = "1.5.0";
-       sha256 = "1mylfs06jx6ziajnm55z0851zwmfc7nzwcimp4c62wk95s9ydwhp";
+       version = "1.6.0";
+       sha256 = "10rhbwic050ncinjklllygg3jnv169smkwdcr2xmxv3g3jpgqa9l";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25402,8 +25675,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "1.5.0";
-       sha256 = "12zkvqmygab6c5j4sf52hzn2fkvmsasmbfw0wq6g7laxdhj6c151";
+       version = "1.6.0";
+       sha256 = "02n1yg4vks5sc8mqm5prz2clgf7pyn9yf98mx1h1mk89gv4sf4mb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25421,8 +25694,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "1.5.0";
-       sha256 = "1zjlvsijp4j7kvbbdwwshr92sh173b8z0k42jwh6zcdk086k8v0c";
+       version = "1.6.0";
+       sha256 = "0kbyz4czsfjfgfw49wqrkkk2ma4k333kd5xfcz9gf9ick8079jar";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25440,8 +25713,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elbv2";
-       version = "1.5.0";
-       sha256 = "0n6q0dzwmdbkhjn8ik2p156w4kj0lwr78xy3f9sh5g9c3v3wfqxh";
+       version = "1.6.0";
+       sha256 = "1j92qr8sfsidax606pyzv1zn08c2rcij0853c5raq4xn55gd6lra";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25459,8 +25732,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "1.5.0";
-       sha256 = "0q5vc4mk8709sfcqgrwilp0vp3n7awnwcanqk46wbml6a0jr4nsw";
+       version = "1.6.0";
+       sha256 = "0kvpv655dk619lq2ahkljxdhscj22lyci3z9ybpsvzk1xrc79879";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25472,14 +25745,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-fms" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-fms";
+       version = "1.6.0";
+       sha256 = "1cgp5vd1ifrh16pziyi1yv6bwipd5njy9d0mvfq0l53zwv0f4cs0";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Firewall Management Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-gamelift" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-gamelift";
-       version = "1.5.0";
-       sha256 = "1nklqnrgkkq7465c3gz0ljb1gyi75d634yb5s39a1nynhpdiqyxq";
+       version = "1.6.0";
+       sha256 = "1z2zfzpag9v8mb6wa479hfkhdqf84x5jyc6pl302vl688d5bvkgb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25497,8 +25788,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "1.5.0";
-       sha256 = "1yrhjyn0596r3k59a42pma2v2fhdgwibasw10zd6gpfrcp496iq2";
+       version = "1.6.0";
+       sha256 = "04zrw3rqly4qm5hkwddr0p73xyjx5vm5xsvcnmabmpxx3x6l61sk";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25516,8 +25807,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glue";
-       version = "1.5.0";
-       sha256 = "0hxs5rnri2f5l8vhkn65in2jmyjdd5ckxywdvzwkdbdh3byp9vyc";
+       version = "1.6.0";
+       sha256 = "1g01ql9kvlwy6qm2gblz7bdf8b76ifpwgk5c9r1xp5jcsi3dmwpj";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25535,8 +25826,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-greengrass";
-       version = "1.5.0";
-       sha256 = "1l6nc2cp2vszb1hd4s2fmz0lbrjln3kscqk2wpfjp774hcjvl2zx";
+       version = "1.6.0";
+       sha256 = "0kzd5s8mz3sfdf20g64nkl7mnpbzr019y61gxr5z2jwc1yh9nj5k";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25548,14 +25839,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-guardduty" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-guardduty";
+       version = "1.6.0";
+       sha256 = "058mxwk8gjgnl8yjvxwgy033qknfnw1ib8qkz0649167x8wfibzx";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon GuardDuty SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-health" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-health";
-       version = "1.5.0";
-       sha256 = "07qla81a60k0dgx6iyy617ri6afx0ip68b0b36n7ww3i81jl6qhk";
+       version = "1.6.0";
+       sha256 = "0yx6bdhkgf6fgrc8i6abbpwnxlzqdnmw6pqan02gz679jf7b25n2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25573,8 +25882,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "1.5.0";
-       sha256 = "1vmwh4k2bhhf5d7lrk095xhc65pclqig3sk8j7vgxl9nil26cpcs";
+       version = "1.6.0";
+       sha256 = "0pchhnrfvry7v6gwn1rxx0hyd8xd2hdlzfcm1d02hgawg4x82dd3";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25613,8 +25922,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "1.5.0";
-       sha256 = "0sfm6k600vakjx0jrvqwm3mx2hc16nn24f1v1k1fixm2h0kb6s9l";
+       version = "1.6.0";
+       sha256 = "016dgp4s2669jd3db1f8ngynhjrkr77l981rmf3wc92fsyyg4l89";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25632,8 +25941,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-inspector";
-       version = "1.5.0";
-       sha256 = "0ips5f6y58dglx4igxak3ixsyny383s8nxw4dcwky12b5qm8pn36";
+       version = "1.6.0";
+       sha256 = "0gp1rkrm2xv13cdn3shr5824g942yn2dwqvw3ln78fz671g01vxw";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25651,8 +25960,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iot";
-       version = "1.5.0";
-       sha256 = "0m6dvvxvffb136znnn32jnzc1jvv57sqwb5br7jx2j0nhjvc2dlx";
+       version = "1.6.0";
+       sha256 = "1l16ib9p6qzs4079a02hg852f0g79yv75k0ky3jj3l3vr5lj22qq";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25664,14 +25973,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-iot-analytics" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iot-analytics";
+       version = "1.6.0";
+       sha256 = "1n88xzq5m3g3xcxx6s5rkrp8cbxi8sbj2rri3c3ibyv5gcr75lhs";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon IoT Analytics SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-iot-dataplane" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-iot-dataplane";
-       version = "1.5.0";
-       sha256 = "0423d6fpkdby9jq6sya5bmq77ws1mrn7pfaajajixi5mqmsihw25";
+       version = "1.6.0";
+       sha256 = "0hl7m3s6ck01k5h00q414sc3yzpr41gamj7pfr7wr97cwv03prmf";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25683,14 +26010,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-iot-jobs-dataplane" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iot-jobs-dataplane";
+       version = "1.6.0";
+       sha256 = "08glywxj06bzybvdrbgy1laazfsqzxbsa8558ds76jph99nkmvvl";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon IoT Jobs Data Plane SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-kinesis" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "1.5.0";
-       sha256 = "07dxdbhwgr33649b6lgr3zz6q4cdzspapb0bjg1rxqz3vnbxdmbc";
+       version = "1.6.0";
+       sha256 = "0f1gwa92pcdrb1ijxinhq8vjspgigk5kcr37hnj6mzs6kv9437jl";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25708,8 +26053,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis-analytics";
-       version = "1.5.0";
-       sha256 = "06pbzbrmysj9a61d5kc4a8n5wfpd1lhxm04cqpnrf86lqn89grlr";
+       version = "1.6.0";
+       sha256 = "1vl5yski9fqpwv9f4aq3i2zqkjgkmn3lnpm3phg59x3fb4w59yvy";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25727,8 +26072,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis-firehose";
-       version = "1.5.0";
-       sha256 = "1him47imazymn50820qhdis3z2ini55xryga0ywy9j26qnwzx03z";
+       version = "1.6.0";
+       sha256 = "172ljz8ihcb8cx800xy0wpicdsqip52ng2ig1clk3h48r36la18j";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25740,14 +26085,68 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-kinesis-video" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-video";
+       version = "1.6.0";
+       sha256 = "0d9nbkm76ccy1bglny6xqa6bd41g7vjl80jnxrv5aqr87h0b814n";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Video Streams SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-kinesis-video-archived-media" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-video-archived-media";
+       version = "1.6.0";
+       sha256 = "01g269c2gnfkz5rzznl8l5m7fwb9zxxlxrbj2j7084nv1imj30vh";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Video Streams Archived Media SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-kinesis-video-media" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-video-media";
+       version = "1.6.0";
+       sha256 = "1glmwl51d945ba8dxwyi9nflavx824nl7arm6f3j90z8cii7na41";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Video Streams Media SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-kms" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "1.5.0";
-       sha256 = "0ljpq0z5nw30lmyhwlbmzcccm2h6p45k3lr8k07akwa4p9rw8km4";
+       version = "1.6.0";
+       sha256 = "16cfkvl7n7drx0z6fr5j88lyg9rkg3bfly2zb2jx155lhcsk79bs";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25765,8 +26164,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "1.5.0";
-       sha256 = "04lw538kpkzs9wmil8h6sjqzw55pjywnvrysdlac83nv0jdm3rmx";
+       version = "1.6.0";
+       sha256 = "01lvr775kakpbr2p7126nw3022dyp5p41s98asf9fwkmda4jd5k4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25784,8 +26183,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lex-models";
-       version = "1.5.0";
-       sha256 = "15k6r8vc6ijlnmj7dqlip1nqixmf1ns3pjd99p7x4kqdq8p4qzj9";
+       version = "1.6.0";
+       sha256 = "0hknmvp0cnvg2y8i7fdwmx76pwbw6v6pvmyw7w93qakfq7615l8z";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25803,8 +26202,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lex-runtime";
-       version = "1.5.0";
-       sha256 = "07xx971q204hkk6gd9bgs2025czk6zzk5s702g82pd6j5r5i1slb";
+       version = "1.6.0";
+       sha256 = "0bixnlb1gz2wn0ggcpxfglxj9w38lnm2xfahs07brsy099qivlka";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25822,8 +26221,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lightsail";
-       version = "1.5.0";
-       sha256 = "1ncby9zgmknmpfk1ncsydhb7l4r9kf46r466kg3cwjnb9w9wznkv";
+       version = "1.6.0";
+       sha256 = "1sxcc0hbvngxxjg0mg2rb3wkdax8123qbak8k3z0h3igzxm4q6vl";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25841,8 +26240,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-marketplace-analytics";
-       version = "1.5.0";
-       sha256 = "0fil2jcs12g0lfkbzw0jjzms6nh90dd91b7s6c6y3ch1yy7a44w0";
+       version = "1.6.0";
+       sha256 = "0sjxrnzcrzgd75kd841r9hadpg9zqmxx4g5hqqqm2yy1x6q0sv2d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25860,8 +26259,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-marketplace-entitlement";
-       version = "1.5.0";
-       sha256 = "0g8diq63yywxrq7i6j8bcchjczdxxayqymc7lzdrvywrlvy52vyb";
+       version = "1.6.0";
+       sha256 = "0npwzr4yc4ns989mi9jgdhxj7g2brhn9wyislp0r7wx6arsmhk17";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25879,8 +26278,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-marketplace-metering";
-       version = "1.5.0";
-       sha256 = "1a9prdrmchnwqz7h8rffmg1df944s0y8cggzxjxvpmydsr8pfrnk";
+       version = "1.6.0";
+       sha256 = "0xszzcmaz2d5h8cbdqaar1f3am35h31k5w1wihy6fyf5r95f2bb7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25898,8 +26297,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-mechanicalturk";
-       version = "1.5.0";
-       sha256 = "1qgznzbfxijz8rvara688pa1hvkfjvz14m4x9m639x7aqdrrllh0";
+       version = "1.6.0";
+       sha256 = "07z9w2i8dmq420wgsip0zm1x6asz446284skcywqbfmv7n73gmkv";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25911,14 +26310,104 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-mediaconvert" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mediaconvert";
+       version = "1.6.0";
+       sha256 = "04zml2hp8plb4ylspqi3y169daqc1fwx4lfb20wkifl54prbr7mk";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaConvert SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-medialive" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-medialive";
+       version = "1.6.0";
+       sha256 = "1plhi1nadmj5kl89z9l5wly524zy013p89xy9cbkda4l0axi1i0l";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaLive SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-mediapackage" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mediapackage";
+       version = "1.6.0";
+       sha256 = "0faji7pk4i26kp2f3xsn3jglgdr1dxjljwzap3ydy0xg30fjk9ai";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaPackage SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-mediastore" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mediastore";
+       version = "1.6.0";
+       sha256 = "19rvrh4l015pv869i8sj4fs9ygcnc0ziyx7vf1mpamkjqkx760xp";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaStore SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-mediastore-dataplane" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mediastore-dataplane";
+       version = "1.6.0";
+       sha256 = "1ldk1j4xs3m5igzzpsyrqqximdqm64wfa5dlhbiljjc4yhwkrh0m";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaStore Data Plane SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-migrationhub" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-migrationhub";
-       version = "1.5.0";
-       sha256 = "1v5sl8xywzr8sf4fbhkgqpq7bm4kcii38ijlfickcds7hv6fa5s1";
+       version = "1.6.0";
+       sha256 = "0iwbk5iwg28a7jlz1bhspdky0ipf5gixp3dwavac0wl9nbffyw8i";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25936,8 +26425,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "1.5.0";
-       sha256 = "0lbp5nji9w2w1dw230z04cyxmqg502jznwy02y8pk1x0i2masjwq";
+       version = "1.6.0";
+       sha256 = "1zkdal599npbylic9sgvzpfss15ri9k61pp9xwhafbm7f5xjvhcx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25955,8 +26444,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-mobile";
-       version = "1.5.0";
-       sha256 = "0x0qxm4aj9c34zv3i5x4yw8ci86sx69ma9kf88ajxqw4nv1azp53";
+       version = "1.6.0";
+       sha256 = "0p9gyrn2hpk128g3nh7dmi2jm01lf6ydv407rwyj4zpkyl1k9vhh";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25968,14 +26457,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-mq" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mq";
+       version = "1.6.0";
+       sha256 = "1m4mybwfhhs4nm6q6h8zkay9ivdifncsa1j6zfqcl54zc763swp9";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon MQ SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-opsworks" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "1.5.0";
-       sha256 = "1hcsz6yxav11xq10vrifspfx06v3gd40y8m2lkc8dwwqa6bpzbq6";
+       version = "1.6.0";
+       sha256 = "066rfarz6cbdcal6l5qn11pi3n2byzxbb6013crmdicfkcrp4hws";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25993,8 +26500,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-opsworks-cm";
-       version = "1.5.0";
-       sha256 = "1wf98wd1phavm022a0xznn20h9qfy8ld0d621dnm5cdb3l6wi4w5";
+       version = "1.6.0";
+       sha256 = "1x28lxvjz6sdkzlghw94h97yw8ywypz0v3d0rqazvzvhbxsrp7jg";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26012,8 +26519,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-organizations";
-       version = "1.5.0";
-       sha256 = "1n04xzs80nkrcx4742pay5pnzg240240ii0z02baqnkyqpxx55hj";
+       version = "1.6.0";
+       sha256 = "1v7sdjd58aka7yp9y7d8ap5izf4hpm4wf7qa10fy4h4ay180y61r";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26031,8 +26538,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-pinpoint";
-       version = "1.5.0";
-       sha256 = "0lj556yfwrgkbdspgyvwzf3df4rqz3idwyhzs2nn25f4spba8gwn";
+       version = "1.6.0";
+       sha256 = "01dh2vwigisbx4jrpaq76l1463v7qy1wx6brd1d7sdczpnmcvy5h";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26050,8 +26557,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-polly";
-       version = "1.5.0";
-       sha256 = "11dm2bbr75zl617m9s2zn26zs8d96d4xgl41shdjfhsm6vgc0c7k";
+       version = "1.6.0";
+       sha256 = "1l4ajm7ca0s4xwzs9brdhbjz1mhw8smmy7wzddhrxjr84vxdqgkp";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26069,8 +26576,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-pricing";
-       version = "1.5.0";
-       sha256 = "0k4fv6m5m0b6fgs4clry4kg27y7znsvxziphgvpqrjkmjbfsbaxh";
+       version = "1.6.0";
+       sha256 = "10xlxld5b45yvy30midf0i1drr3zimpl0fwvvz4z946mfpbdn7na";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26088,8 +26595,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "1.5.0";
-       sha256 = "0ir608fdj19wb7g4bam8x1givws4d54pd96mkjj9zm0865z19dxn";
+       version = "1.6.0";
+       sha256 = "0kf23dgv1zirxp35g1czlfnzq9ccwr1a67yvqnl3nfvpacy634y7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26107,8 +26614,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "1.5.0";
-       sha256 = "1ll4mx404vw403mx8r6k2i9d9yq7nrmj6kqhnf37cnff4k3h0kqy";
+       version = "1.6.0";
+       sha256 = "0adkj055f7kb1klxnvl9n1p8l504jgcpdw1ibgc2xm786rlvjsj2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26126,8 +26633,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rekognition";
-       version = "1.5.0";
-       sha256 = "1sizf0ha3n0712w7g3cmhjy93xscq3kg5mq81shxgdwajab8v49a";
+       version = "1.6.0";
+       sha256 = "1a1jynpr7bkzd5rs5p4781wrvnf1wivlzfjmn53jfdp545q44bj6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26139,14 +26646,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-resourcegroups" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-resourcegroups";
+       version = "1.6.0";
+       sha256 = "0q0j22992r11i47ix7njjkhx5rrd0b1wkc2q4wrhs62dgsb86zzj";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Resource Groups SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-resourcegroupstagging" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-resourcegroupstagging";
-       version = "1.5.0";
-       sha256 = "0jsri9l7q3hlrb924104fhzg87zsmqcw1fg7afpczf6p6r2kfrpf";
+       version = "1.6.0";
+       sha256 = "1306254b8rb8q7631jyccbayj3a7iv2lvg33l23qw184g5k3gs6j";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26164,8 +26689,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "1.5.0";
-       sha256 = "0saln45sais8cmwpzilwscr88g1mig4whrszwyx805lrhdhb48d4";
+       version = "1.6.0";
+       sha256 = "05v3m8fcpxbhhsh8nm0m35c357cx94z6xn36c75jhjy4v4xpgvv8";
        libraryHaskellDepends = [ amazonka-core base text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26177,14 +26702,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-route53-autonaming" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-route53-autonaming";
+       version = "1.6.0";
+       sha256 = "15j5l2x0x5qb24r7mcj3qdlzfggk542libcq3sw6d5iwr2vm7l5a";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Route 53 Auto Naming SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-route53-domains" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "1.5.0";
-       sha256 = "0fq62hdn1x4p2d0dbkc6m1myjgi9f6z3icd519crdy5sdmczbhl3";
+       version = "1.6.0";
+       sha256 = "1sm5w4r6kb8fl3wikp9n2hda3bxwr83397s729s3dispbwpzwnzp";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26202,8 +26745,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "1.5.0";
-       sha256 = "03v5fdn81g2k1pb1kn9c2r0yf52mnv3a8flxl9cms123n4lzhsrg";
+       version = "1.6.0";
+       sha256 = "0irz8vyklapjy3w3qasidpvq4hk2qwkmhrnrd23sf4yzs2xqx8gc";
        libraryHaskellDepends = [ amazonka-core base lens text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26237,14 +26780,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-sagemaker" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sagemaker";
+       version = "1.6.0";
+       sha256 = "1cgfwc7f9krln680zn42nwmhxwfz945dd8mafpwk0qwdqi1i12cx";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon SageMaker Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-sagemaker-runtime" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sagemaker-runtime";
+       version = "1.6.0";
+       sha256 = "1l4v7qw378qq8h4h61nag6al3dck2pz398kfahmk41y208fn04mc";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon SageMaker Runtime SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-sdb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "1.5.0";
-       sha256 = "1rgg9w4ry28bx9xcdldw14hp8738bwvlxjnymknhz63d43chgya3";
+       version = "1.6.0";
+       sha256 = "1zdxbwzkvj1fi9lay3zyqxbb2vzviwc6h2gfmjh7invg68hqphmr";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26256,14 +26835,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-secretsmanager" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-secretsmanager";
+       version = "1.6.0";
+       sha256 = "12imwyz239iv6yw658iyvxc7rfkmc1jgyc722ykz6kagkjr03110";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Secrets Manager SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-serverlessrepo" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-serverlessrepo";
+       version = "1.6.0";
+       sha256 = "1vlbn7jislc33wp2kacc54z95xhgk7ap9zapwzjij847hwn4ib88";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon ServerlessApplicationRepository SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-servicecatalog" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-servicecatalog";
-       version = "1.5.0";
-       sha256 = "09kp0af9dh93b7psmyl64l0zhqjna6ksp1d02m05lcv8hf35zy9c";
+       version = "1.6.0";
+       sha256 = "0r7j8v5mn048hqlp2h2mv7lyld457k22i95mdriyqhrb3cxxzy0i";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26281,8 +26896,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "1.5.0";
-       sha256 = "1bb948h51qhz2lsry254bydqzqc0zjfwvm1wzqvv512cl3bx596f";
+       version = "1.6.0";
+       sha256 = "00mxab03vhmmb0d5xfa00x4c0qz0vkfnfap1lz8kzbps73kk53bp";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26300,8 +26915,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-shield";
-       version = "1.5.0";
-       sha256 = "1yw51bqxl92rygg412fbxa8clli2vsn8mf3q45x90f14nk0qpknq";
+       version = "1.6.0";
+       sha256 = "1x7b8wvv50iqvdxydpnmvncz3yx3026vq4f9rg1pnqas5ddsi0xr";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26319,8 +26934,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sms";
-       version = "1.5.0";
-       sha256 = "0z8bw4dh9wkr1fpp6kb0vif93c39jjajk9yxkdsb11nnwa4gyrh9";
+       version = "1.6.0";
+       sha256 = "0zx4rpq5k18lqv5x55hf30s30g8x6yrsbv55h13n1mw856fkakgw";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26338,8 +26953,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-snowball";
-       version = "1.5.0";
-       sha256 = "13wzq3i9ijj627p1sagqpih4094rj6963a2z6552fn95cdnm6l94";
+       version = "1.6.0";
+       sha256 = "09gf0balrk7hzmg9ynasz4jf3jywj57lyp0wiggixfh5jbz30jsk";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26357,8 +26972,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "1.5.0";
-       sha256 = "0dbka3s5cd1sy7msik0dy9wfp9krl8c60z0dca69pw8r6nncxd41";
+       version = "1.6.0";
+       sha256 = "0wvmwca48rqls0szbvdvfr796iq8i3kp5l8l7dcysn8k0d4ba5hx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26376,8 +26991,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "1.5.0";
-       sha256 = "1imdr5a71n6pkn2fa8irqgnadxhqfqhlszxs0njqf3kfqkc93z06";
+       version = "1.6.0";
+       sha256 = "0cq4j16f12z4lzsi9clh3pzcad7zfpcg5z8af2ap0w18gmq3hf3l";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26395,8 +27010,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "1.5.0";
-       sha256 = "1x7zdv01jc3x4663vxs7c3al4x4phfrcq71slcfjk56g9qp7wrjq";
+       version = "1.6.0";
+       sha256 = "06kh3id8l24rq5wvjakfz1w62fr3cyzl2axdsp7hcb8afr4q488i";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26414,8 +27029,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-stepfunctions";
-       version = "1.5.0";
-       sha256 = "0xviq8ml3sr1r2kwrc42kriizankzagh3wv5x8fij622p70q62z2";
+       version = "1.6.0";
+       sha256 = "1gxci7x94jc7187wv8mrd8g8vy0ns9r6b8l0w5jxgmr8bma8xb4r";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26433,8 +27048,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "1.5.0";
-       sha256 = "0ab4ycaibhm08qbq4adn0mn64dlly1liqx6albdqz3ypd519y9hg";
+       version = "1.6.0";
+       sha256 = "0gdl905h9d5g20npx4ihc0fajgcqn5vjnqiss7mhfcgha1k3f1kg";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26452,8 +27067,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "1.5.0";
-       sha256 = "0c4g0i9088py961f3wxc02ipgl8sh9wm0zl7mfvrb93dps2xmrqy";
+       version = "1.6.0";
+       sha256 = "04lsm5wpzrykkq94fcrkj4cwc5slzcwmzqvsgw9mnyprsrknn19n";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26471,8 +27086,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "1.5.0";
-       sha256 = "1nd1s76w6j2plrbpgc78f9bcanmpmkajsz6xq7lriznvjwgaip84";
+       version = "1.6.0";
+       sha256 = "1sakd3r8g9r0ms7mrnvzh679i26pamh1ranpp7a1fa2zjzpllhvz";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26490,8 +27105,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "1.5.0";
-       sha256 = "09fiddb9nvl1n5bzh6dzh8fq1lfvw0a5bbnyg51l3z35zyqr64a4";
+       version = "1.6.0";
+       sha256 = "145aali4pqzra7r34g6ykbizwrqnapj6mwadqr31ylf1m5xl63hz";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26512,8 +27127,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-test";
-       version = "1.5.0";
-       sha256 = "020qm4za63w69hcbqzbky1r269nv05ajf4zxgvp8jvnz33nj3rs7";
+       version = "1.6.0";
+       sha256 = "0a6xfp97hijhqmhj9nv4aqax08ry8y809jpjhyj2819p01wvga26";
        libraryHaskellDepends = [
          aeson amazonka-core base bifunctors bytestring case-insensitive
          conduit conduit-extra groom http-client http-types process
@@ -26526,14 +27141,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-transcribe" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-transcribe";
+       version = "1.6.0";
+       sha256 = "02z344bwkn3g37fh190qsk6aa3ihrnkkv8zmxlgpw3sjzcxpx8p5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Transcribe Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-translate" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-translate";
+       version = "1.6.0";
+       sha256 = "08k0ilxfrbqbfhlwi1im515bc017njm6faj4wznqbqxdvdw6lv3v";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Translate SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-waf" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-waf";
-       version = "1.5.0";
-       sha256 = "0vv2602f3nhnkfwwj5r7qbkcsd1vflvaakyllnp6a29wrswr29ca";
+       version = "1.6.0";
+       sha256 = "105rpfal53qyjavknpkpiglndr8cgcsybl8iaw7zpn725g2rw2w8";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26551,8 +27202,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-waf-regional";
-       version = "1.5.0";
-       sha256 = "1rn090nrz2kk50r8fiyhlwyfcz2byzy8i71a5dghx545rsn7jc9x";
+       version = "1.6.0";
+       sha256 = "01aff4b6gp0zbhmjfnmdciw6a20a6jb5bs94i59cppzm216vfmji";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26570,8 +27221,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-workdocs";
-       version = "1.5.0";
-       sha256 = "0wypcv4w8m0qylk1ixb3s9zwh9mzz7682xw31w6cq62hxwy3w3gz";
+       version = "1.6.0";
+       sha256 = "0sjb55fj2hq0pndw5b81d3bgw5619px5mv8inni63cbhvlahyf3m";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26583,14 +27234,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-workmail" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-workmail";
+       version = "1.6.0";
+       sha256 = "0ac7awszhihl73zqrpg8srw58dwxjral7rpwamx30m5s65qhnkq5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon WorkMail SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-workspaces" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "1.5.0";
-       sha256 = "1kjyxmbwkj0p50bl0x3snk5680qc00g1486xhl4b600jrc2p2gkk";
+       version = "1.6.0";
+       sha256 = "110wr4ah80lz9yjxsx3yng2mx5r2z361rs4k6sr4v6jiij6k9ksn";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26608,8 +27277,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-xray";
-       version = "1.5.0";
-       sha256 = "1i9s8l0l98lffc7hvhndrjj8rv4r0j958qhfqic503d7pzq9m0gk";
+       version = "1.6.0";
+       sha256 = "1w4ham3rzkyz8ns5xrnclyw0gvaswm6kyxjrfz6h19hs6rsh0lcg";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -27060,14 +27729,14 @@ self: {
 
   "animate" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec, text
-     , vector
+     , vector, yaml
      }:
      mkDerivation {
        pname = "animate";
-       version = "0.6.0";
-       sha256 = "14fbxn3v4l5z6krqsycpg9ylx91y1xwzwqcxpqy5ihjba2g2r23a";
+       version = "0.6.1";
+       sha256 = "1mjjng8mr8r6gly822nah3ps4phgydfnyggyz43n5bhdr17f37f9";
        libraryHaskellDepends = [
-         aeson base bytestring containers text vector
+         aeson base bytestring containers text vector yaml
        ];
        testHaskellDepends = [ aeson base containers hspec vector ];
        homepage = "https://github.com/jxv/animate#readme";
@@ -27096,6 +27765,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "animate-preview" = callPackage
+    ({ mkDerivation, aeson, animate, base, bytestring, containers
+     , filepath, fsnotify, key-state, lens, linear, mtl
+     , optparse-applicative, optparse-generic, random, safe
+     , safe-exceptions, sdl2, sdl2-fps, sdl2-gfx, sdl2-image, sdl2-ttf
+     , StateVar, text, text-conversions, vector
+     }:
+     mkDerivation {
+       pname = "animate-preview";
+       version = "0.1.2.3";
+       sha256 = "0y8j3cmm579wkmswhflkgzlqv05dm5vrdiqxnhsvf4kr6hnaj8im";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson animate base bytestring containers filepath fsnotify
+         key-state lens linear mtl optparse-applicative optparse-generic
+         random safe safe-exceptions sdl2 sdl2-fps sdl2-gfx sdl2-image
+         sdl2-ttf StateVar text text-conversions vector
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/jxv/animate-preview#readme";
+       description = "Preview tool for sprite animation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "animate-sdl2" = callPackage
+    ({ mkDerivation, aeson, animate, base, sdl2, sdl2-image }:
+     mkDerivation {
+       pname = "animate-sdl2";
+       version = "0.1.0";
+       sha256 = "1wzwhhv6x098y3pkpssxx7y1cb69z1bb2gsa2r8prg729y664648";
+       libraryHaskellDepends = [ aeson animate base sdl2 sdl2-image ];
+       homepage = "https://github.com/jxv/animate-sdl2#readme";
+       description = "sdl2 + animate auxiliary library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "anki-tools" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
      , exceptions, filepath, mtl, scientific, sqlite-simple, text, time
@@ -27226,20 +27933,6 @@ self: {
      }) {};
 
   "ansi-terminal" = callPackage
-    ({ mkDerivation, base, colour }:
-     mkDerivation {
-       pname = "ansi-terminal";
-       version = "0.8.0.3";
-       sha256 = "18466bjgsmn2f96i3q6sp5f72paa2flqh40n9h137z29kvr53sva";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base colour ];
-       homepage = "https://github.com/feuerbach/ansi-terminal";
-       description = "Simple ANSI terminal support, with Windows compatibility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ansi-terminal_0_8_0_4" = callPackage
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
@@ -27251,7 +27944,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-terminal-game" = callPackage
@@ -27617,8 +28309,8 @@ self: {
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.14.0.0";
-       sha256 = "12pr670c4zw8dhmj5vgsqr44mw2jz5kqdqn3alfqhmkmb13kzc4v";
+       version = "0.15.0.0";
+       sha256 = "1bjqg484z9si3pyfwpvcakm0y71gca80bh6j1njc0qnjf2ddd3ad";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring HTTP http-client http-client-tls
          http-types text tls transformers
@@ -28931,6 +29623,8 @@ self: {
        pname = "arithmoi";
        version = "0.7.0.0";
        sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb";
+       revision = "1";
+       editedCabalFile = "10z6m57dnzyqbzmdx64ya6gx5485iwwa4j8afyn8bmvxjvn474a6";
        configureFlags = [ "-f-llvm" ];
        libraryHaskellDepends = [
          array base containers exact-pi ghc-prim integer-gmp
@@ -29468,8 +30162,8 @@ self: {
      }:
      mkDerivation {
        pname = "asn1-codec";
-       version = "0.1.0";
-       sha256 = "1l3ka458aggj04zn2sn3p1mzkrjsgy8p7rg45031cxr401msks5b";
+       version = "0.2.0";
+       sha256 = "03c5dknklv8zj69fyhkdfvb7abcp68byhv2h8mmlnfwd9nz8fsrg";
        libraryHaskellDepends = [
          base bytestring containers contravariant cryptonite hashable
          integer-gmp memory network pretty stm text vector
@@ -31395,8 +32089,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "16";
-       editedCabalFile = "0dv8lrnnb643fh1rsi10rq99nnb5a98akdl26lfxxjmmdmy238vd";
+       revision = "22";
+       editedCabalFile = "040kvq16wknnjq0kr5j6y17xvjfh87y22hska3whs3ci6zw1fr30";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -31547,8 +32241,8 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.3.0.2";
-       sha256 = "0kfw8srq675hinf1gajkngbpx15xc5w74vvf76yarmaal1vaavm4";
+       version = "0.3.0.4";
+       sha256 = "1f7wq5c7x99gbibwx9mdmq6d8gyz9szrj7k747gavvf5is8z9h6f";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -31682,32 +32376,33 @@ self: {
   "aws" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, byteable, bytestring
-     , case-insensitive, cereal, conduit, conduit-combinators
-     , conduit-extra, containers, cryptonite, data-default, directory
-     , errors, filepath, http-client, http-client-tls, http-conduit
-     , http-types, lifted-base, memory, monad-control, mtl, network
-     , old-locale, QuickCheck, quickcheck-instances, resourcet, safe
-     , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, transformers, transformers-base, unordered-containers
+     , case-insensitive, cereal, conduit, conduit-extra, containers
+     , cryptonite, data-default, directory, errors, exceptions, filepath
+     , http-client, http-client-tls, http-conduit, http-types
+     , lifted-base, memory, monad-control, mtl, network, old-locale
+     , QuickCheck, quickcheck-instances, resourcet, safe, scientific
+     , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, transformers-base, unordered-containers
      , utf8-string, vector, xml-conduit
      }:
      mkDerivation {
        pname = "aws";
-       version = "0.19";
-       sha256 = "0ykpnm2kyhjf1rf5ldhv0c7zy3zq7jgqmb6xwywk8b2s80ai4fxl";
+       version = "0.20";
+       sha256 = "0pwpabmypi1w8rni9qfwabgn95jks4h8dyw6889mn8xzsrhdhyf0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
-         conduit-extra containers cryptonite data-default directory filepath
-         http-conduit http-types lifted-base memory monad-control mtl
-         network old-locale resourcet safe scientific tagged text time
-         transformers unordered-containers utf8-string vector xml-conduit
+         conduit-extra containers cryptonite data-default directory
+         exceptions filepath http-conduit http-types lifted-base memory
+         monad-control mtl network old-locale resourcet safe scientific
+         tagged text time transformers unordered-containers utf8-string
+         vector xml-conduit
        ];
        testHaskellDepends = [
-         aeson base bytestring conduit-combinators errors http-client
-         http-client-tls http-types lifted-base monad-control mtl QuickCheck
+         aeson base bytestring conduit errors http-client http-client-tls
+         http-types lifted-base monad-control mtl QuickCheck
          quickcheck-instances resourcet tagged tasty tasty-hunit
          tasty-quickcheck text time transformers transformers-base
        ];
@@ -32572,7 +33267,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "backprop_0_2_1_0" = callPackage
+  "backprop_0_2_2_0" = callPackage
     ({ mkDerivation, base, bifunctors, containers, criterion, deepseq
      , directory, hmatrix, lens, microlens, mnist-idx, mwc-random
      , primitive, reflection, time, transformers, type-combinators
@@ -32580,8 +33275,8 @@ self: {
      }:
      mkDerivation {
        pname = "backprop";
-       version = "0.2.1.0";
-       sha256 = "0qm352klwjv1fy2gpsr8xhd9byaydps6fwhwrr9fldmj2bn1220m";
+       version = "0.2.2.0";
+       sha256 = "029lc57dhvq3hy38vdf6bgfbmkh93xc64gzi7k34y4rm6d1m2y89";
        libraryHaskellDepends = [
          base containers deepseq microlens primitive reflection transformers
          type-combinators vector
@@ -33200,6 +33895,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-prelude_1_2_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-prelude";
+       version = "1.2.1";
+       sha256 = "1f4s2f454zpcfrb5qi7pdlmljsfyw8zpk0kzs3dngki0ysh0rwq7";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/nikita-volkov/base-prelude";
+       description = "The most complete prelude formed solely from the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-unicode-symbols" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -33628,8 +34336,8 @@ self: {
      }:
      mkDerivation {
        pname = "battleplace";
-       version = "0.1.0.4";
-       sha256 = "0n3fw4z48hz188i4f02ya2wcaicl0l5nhb2w1r8hsvvgf0cixsxl";
+       version = "0.1.0.5";
+       sha256 = "0n0ry8gssd6rnhgsj0q24bbf8ad8wqjqmkxdrn0lxmd6bgj52bv9";
        libraryHaskellDepends = [
          aeson base bytestring cereal data-default hashable memory servant
          text vector
@@ -33773,25 +34481,24 @@ self: {
      }) {};
 
   "bdcs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
-     , codec-rpm, cond, conduit, conduit-combinators, conduit-extra
-     , containers, content-store, cpio-conduit, cryptonite, directory
-     , esqueleto, exceptions, filepath, gi-gio, gi-glib, gi-ostree
-     , gitrev, hspec, http-conduit, HUnit, lifted-base, listsafe, memory
-     , monad-control, monad-logger, monad-loops, mtl, network-uri
-     , ostree, parsec, parsec-numbers, persistent, persistent-sqlite
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, codec-rpm
+     , cond, conduit, conduit-combinators, conduit-extra, containers
+     , content-store, cpio-conduit, cryptonite, directory, esqueleto
+     , exceptions, filepath, gi-gio, gi-glib, gi-ostree, gitrev, hspec
+     , http-conduit, HUnit, lifted-base, listsafe, memory, monad-control
+     , monad-logger, monad-loops, mtl, network-uri, ostree, parsec
+     , parsec-numbers, persistent, persistent-sqlite
      , persistent-template, regex-pcre, resourcet, split
      , string-conversions, tar, tar-conduit, temporary, text, time
      , typed-process, unix, unordered-containers, xml-conduit
      }:
      mkDerivation {
        pname = "bdcs";
-       version = "0.6.0";
-       sha256 = "0irxrabxrdf20mc7b0kknnch0fhxgafh2mdrrksj78jx2dbmn85h";
+       version = "0.6.1";
+       sha256 = "1q81ic3jpcjjnbvbww7qabfy6byvlhwsvs0pf7y8a0sm4i0sqj8g";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
          aeson base bytestring codec-rpm cond conduit conduit-combinators
          conduit-extra containers content-store cpio-conduit cryptonite
@@ -37000,9 +37707,9 @@ self: {
      }:
      mkDerivation {
        pname = "bits-extra";
-       version = "0.0.0.2";
-       sha256 = "067k2kczi56454mgv86x9r0fpzdc0v3m8z4rc0jb93bqd33knq7r";
-       libraryHaskellDepends = [ base ghc-prim ];
+       version = "0.0.1.0";
+       sha256 = "0slxzlc81nbzzd7513i9crwqlpxxvpfz9haq5hr9qp533pr4cyz4";
+       libraryHaskellDepends = [ base ghc-prim vector ];
        testHaskellDepends = [
          base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog
        ];
@@ -39502,6 +40209,8 @@ self: {
        pname = "brittany";
        version = "0.11.0.0";
        sha256 = "1fgcim4q5y7csk8c038rm97w6b8bgynmi6h1dwyr2hsmzw9hxa26";
+       revision = "1";
+       editedCabalFile = "1v5k1gsy9d1xrw1qw1mdhm00ryalnd3dp531sc44lx8brgxypywf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39668,6 +40377,29 @@ self: {
        license = "unknown";
      }) {};
 
+  "bson_0_3_2_6" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cryptohash
+     , data-binary-ieee754, mtl, network, QuickCheck, test-framework
+     , test-framework-quickcheck2, text, time
+     }:
+     mkDerivation {
+       pname = "bson";
+       version = "0.3.2.6";
+       sha256 = "106fdxzwpkp5vrnfsrjjwy8dn9rgmxrp79ji7xaxv8dgb9hw73bk";
+       libraryHaskellDepends = [
+         base binary bytestring cryptohash data-binary-ieee754 mtl network
+         text time
+       ];
+       testHaskellDepends = [
+         base binary bytestring cryptohash data-binary-ieee754 mtl network
+         QuickCheck test-framework test-framework-quickcheck2 text time
+       ];
+       homepage = "http://github.com/mongodb-haskell/bson";
+       description = "BSON documents are JSON-like objects with a standard binary encoding";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bson-generic" = callPackage
     ({ mkDerivation, base, bson, ghc-prim, text }:
      mkDerivation {
@@ -39751,26 +40483,22 @@ self: {
      }) {};
 
   "btree" = callPackage
-    ({ mkDerivation, base, clock, compact-mutable, containers, ghc-prim
-     , hashable, prim-array, primitive, smallcheck, tasty, tasty-hunit
+    ({ mkDerivation, base, clock, containers, ghc-prim, hashable
+     , MonadRandom, primitive, smallcheck, tasty, tasty-hunit
      , tasty-smallcheck, transformers
      }:
      mkDerivation {
        pname = "btree";
-       version = "0.2";
-       sha256 = "02qypsanm4pnc7jiwjwak9xi7mfz4dlmfirdwvbxnjz48nqch7x2";
-       libraryHaskellDepends = [
-         base compact-mutable ghc-prim prim-array primitive
-       ];
+       version = "0.3";
+       sha256 = "058pry7g9sbmd0crd1gdpsj9ynvyfcyyvlna1wb49my9m5qmxp79";
+       libraryHaskellDepends = [ base ghc-prim 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
+         base containers hashable MonadRandom primitive smallcheck tasty
+         tasty-hunit tasty-smallcheck transformers
        ];
-       homepage = "https://github.com/andrewthad/b-plus-tree#readme";
-       description = "B-Tree on the compact heap";
+       benchmarkHaskellDepends = [ base clock ghc-prim hashable ];
+       homepage = "https://github.com/andrewthad/btree";
+       description = "B-Tree on Unmanaged Heap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -41885,6 +42613,26 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "cabal-rpm_0_12_3" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , http-client, http-client-tls, http-conduit, process, time, unix
+     }:
+     mkDerivation {
+       pname = "cabal-rpm";
+       version = "0.12.3";
+       sha256 = "0nid91q38k4b3hgjrhv6sy68y5h74f85j08991hmfbwzd727dzfg";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath http-client
+         http-client-tls http-conduit process time unix
+       ];
+       homepage = "https://github.com/juhp/cabal-rpm";
+       description = "RPM packaging tool for Haskell Cabal-based packages";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-scripts" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -41937,8 +42685,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-sort";
-       version = "0.0.5.3";
-       sha256 = "1312kj7jhb5z3hidlgqvj6rlgiiribwfj3458i4axv8r345xcyqc";
+       version = "0.0.5.4";
+       sha256 = "1pssbb9i5h3q97i3qrybz9iyd1nsh9y27ykxvda6vk820jxjvb9b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42791,34 +43539,39 @@ self: {
 
   "camfort" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim
-     , happy, hmatrix, hspec, lattices, matrix, mtl
-     , optparse-applicative, partial-order, QuickCheck, sbv, syb, syz
-     , text, transformers, uniplate, vector
+     , directory, fgl, filepath, flint, fortran-src, GenericPretty
+     , ghc-prim, happy, hmatrix, hspec, lattices, lens, matrix, mmorph
+     , mtl, optparse-applicative, partial-order, QuickCheck, sbv
+     , silently, singletons, syb, syz, template-haskell, temporary, text
+     , time, transformers, uniplate, vector, verifiable-expressions
+     , vinyl
      }:
      mkDerivation {
        pname = "camfort";
-       version = "0.904";
-       sha256 = "0j1m9vc4fs7151s2bm1nl480c87mqfann6xv7bzcx6p76iqxvii8";
+       version = "0.905";
+       sha256 = "14wp9xkssingashbys07i536xnmrgh891260drc0f88d0mwjc935";
        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
+         fortran-src GenericPretty ghc-prim hmatrix lattices lens matrix
+         mmorph mtl partial-order sbv singletons syb syz template-haskell
+         text transformers uniplate vector verifiable-expressions vinyl
        ];
+       librarySystemDepends = [ flint ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [ base optparse-applicative ];
+       executableHaskellDepends = [ base directory optparse-applicative ];
        testHaskellDepends = [
-         array base binary bytestring containers directory filepath
-         fortran-src hmatrix hspec lattices mtl partial-order QuickCheck sbv
-         text uniplate
+         array base binary bytestring containers directory fgl filepath
+         fortran-src hmatrix hspec lattices lens mtl partial-order
+         QuickCheck sbv silently temporary text time uniplate
+         verifiable-expressions
        ];
        homepage = "https://camfort.github.io";
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) flint;};
 
   "camh" = callPackage
     ({ mkDerivation, base, bytestring, Imlib, terminfo }:
@@ -44177,6 +44930,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cayley-client_0_4_6" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
+     , mtl, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cayley-client";
+       version = "0.4.6";
+       sha256 = "1wyf6bz87b83lxcdbm84db7ziv3ggb3zbj4qd2cvfc7m4wr9a0v6";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring exceptions http-client
+         http-conduit lens lens-aeson mtl text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec unordered-containers ];
+       homepage = "https://github.com/MichelBoucey/cayley-client";
+       description = "A Haskell client for the Cayley graph database";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cayley-dickson" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -44326,8 +45100,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.1.0";
-       sha256 = "1pgarp84p757jyx71qma64g84fcyg6rrhrmrh4c1sszykqjnw7g0";
+       version = "0.1.1.2";
+       sha256 = "0fvl3pzz73mjc0y8pqkfbqkipma9km26qp0n1jfrnh0nqh9104l1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45255,8 +46029,8 @@ self: {
      }:
      mkDerivation {
        pname = "chatwork";
-       version = "0.1.3.2";
-       sha256 = "17wvmn2immigdbc5kbckwbl8hsali8w0mdii9mib9lfxykawyh54";
+       version = "0.1.3.3";
+       sha256 = "15al7z2b73bb0ibd1pf3jljay6jc55sxpkr41hm6r97qri7fkd1m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46226,6 +47000,8 @@ self: {
        pname = "circle-packing";
        version = "0.1.0.6";
        sha256 = "06z8irwrjxxgk5xqlpy6a9mjl44kp9pgx2xpslhgxrd31nll9vk4";
+       revision = "1";
+       editedCabalFile = "10dh8jgjah1h54f83s9289abfqzc4ifykb01p5jljfac63yn42zs";
        libraryHaskellDepends = [ base ];
        description = "Simple heuristic for packing discs of varying radii in a circle";
        license = stdenv.lib.licenses.bsd3;
@@ -46628,8 +47404,10 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.99";
-       sha256 = "19s6h0ly0pz1wi1zs5ln9wai6kp9f49xdcjyc3z6mskcabv5b8q2";
+       version = "0.99.1";
+       sha256 = "0ybkjqza4wl6v4wghrbm87j7ns3qgsg4lb8g6i8rj9nb8yn43jsm";
+       revision = "1";
+       editedCabalFile = "1j11iplvng6m882c013fr0jzni1sqmvcw28k5p9icl3dgad990kf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46657,8 +47435,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.99";
-       sha256 = "1dl9pwv9fc5byimdxsl4xa4401nz74bgzrxmgk6hcbyvh7i4b17i";
+       version = "0.99.1";
+       sha256 = "1jrfvi3jxwmzc32nnf2kjyciws649ldixc38g7acsbapkpjhcfy5";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base bytestring clash-prelude
@@ -46698,8 +47476,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.99";
-       sha256 = "13qclvisklwy4syc5hgr5dvcz7wm4nwasgky3xvjhnhjg05wjd6l";
+       version = "0.99.1";
+       sha256 = "03yys72aq9zhl6g9lw1mvx7ds90ch6jx90n7pv9995lg1nhc83fd";
        libraryHaskellDepends = [
          array base bifunctors constraints data-binary-ieee754 data-default
          deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat
@@ -46932,6 +47710,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "classyplate_0_3_1_0" = callPackage
+    ({ mkDerivation, base, criterion, parallel, template-haskell
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "classyplate";
+       version = "0.3.1.0";
+       sha256 = "0ayiyxslvnhzngf8afqb82jz20i83par8piqf81s0yldk4lg4j4m";
+       libraryHaskellDepends = [ base template-haskell ];
+       benchmarkHaskellDepends = [ base criterion parallel uniplate ];
+       description = "Fuseable type-class based generics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clay" = callPackage
     ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
      mkDerivation {
@@ -50078,6 +50871,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "componentm" = callPackage
+    ({ mkDerivation, base, containers, deepseq, exceptions
+     , prettyprinter, rio, tasty, tasty-hunit, teardown
+     }:
+     mkDerivation {
+       pname = "componentm";
+       version = "0.0.0.1";
+       sha256 = "1r2z9jbb0ka2i0lxbrb30p1x0zbwdcxid5k53mkzg82d5v2f08k9";
+       libraryHaskellDepends = [
+         base containers deepseq exceptions prettyprinter rio teardown
+       ];
+       testHaskellDepends = [
+         base containers prettyprinter rio tasty tasty-hunit teardown
+       ];
+       homepage = "https://github.com/roman/Haskell-componentm#readme";
+       description = "Monad for allocation and cleanup of application resources";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "composable-associations" = callPackage
     ({ mkDerivation, base, lens, tasty, tasty-hunit }:
      mkDerivation {
@@ -52530,8 +53342,8 @@ self: {
     ({ mkDerivation, base, criterion, hspec, recursion-schemes }:
      mkDerivation {
        pname = "continued-fraction";
-       version = "0.1.0.9";
-       sha256 = "1831a093wnbf7kvplsp59xkdhj0g8wva08ixf9w12x6vl0yyj6sb";
+       version = "0.1.0.10";
+       sha256 = "1c9lp30q94ddgrmvy93psas5lbyczkhwhr5nijg02sxjkmvrj47v";
        libraryHaskellDepends = [ base recursion-schemes ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -53908,15 +54720,15 @@ self: {
        license = "unknown";
      }) {};
 
-  "cql_4_0_0" = callPackage
+  "cql_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, Decimal
      , iproute, network, QuickCheck, tasty, tasty-quickcheck
      , template-haskell, text, time, transformers, uuid, vector
      }:
      mkDerivation {
        pname = "cql";
-       version = "4.0.0";
-       sha256 = "09sm9wxjfmiv62brrj6hcfsjz3s8xwc4ihrwxdq8fqsv9cf82fj7";
+       version = "4.0.1";
+       sha256 = "021qaz6qvbdp76gdyfcs07wnnq6k6r1cmqky0g3giinjdrm4qac9";
        libraryHaskellDepends = [
          base bytestring cereal containers Decimal iproute network
          template-haskell text time transformers uuid vector
@@ -54901,6 +55713,8 @@ self: {
        pname = "crypt-sha512";
        version = "0";
        sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2";
+       revision = "1";
+       editedCabalFile = "0wi8d12i2v76irrv0f16y4sfcn2a9sg92l11499djidmdq50vji9";
        libraryHaskellDepends = [
          attoparsec base bytestring cryptohash-sha512
        ];
@@ -55687,14 +56501,14 @@ self: {
 
   "csg" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
-     , criterion, doctest, doctest-discover, gloss, gloss-raster
+     , criterion, doctest, doctest-driver-gen, gloss, gloss-raster
      , QuickCheck, simple-vec3, strict, system-filepath, tasty
      , tasty-hunit, tasty-quickcheck, transformers, turtle, vector
      }:
      mkDerivation {
        pname = "csg";
-       version = "0.1";
-       sha256 = "06fc7j1izwwalngjvgvkg90xvp3cjr53c4laqp5giwl2vdqrj2zs";
+       version = "0.1.0.2";
+       sha256 = "19lqlc8li2cx2kc2y3p4n6s2jz94h490zqnm0fywj7vgp4f11rcm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55706,7 +56520,7 @@ self: {
          system-filepath turtle
        ];
        testHaskellDepends = [
-         base bytestring doctest doctest-discover simple-vec3 tasty
+         base bytestring doctest doctest-driver-gen simple-vec3 tasty
          tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [
@@ -55898,8 +56712,26 @@ self: {
        pname = "css-syntax";
        version = "0.0.5";
        sha256 = "17hbwnhwz9c6xdw508chygq684h7hrrv16yyrmqdj7f8hfzy0s9r";
-       revision = "1";
-       editedCabalFile = "15s7q21kahh1gmm7i3jd937d5pq5khn9a6sq8kdhs6bx11cfa5ap";
+       revision = "3";
+       editedCabalFile = "0p32287dxngmz6bk2xpvj8vh0kawjcrdxxdnczmay6pa1bzyhrik";
+       libraryHaskellDepends = [
+         attoparsec base bytestring scientific text
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring directory hspec scientific text
+       ];
+       description = "This package implments a parser for the CSS syntax";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "css-syntax_0_0_7" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
+     , scientific, text
+     }:
+     mkDerivation {
+       pname = "css-syntax";
+       version = "0.0.7";
+       sha256 = "0r30rnwpmzvwbhj9di5rvbsigfn1w325c700hvjyw826x53ivz13";
        libraryHaskellDepends = [
          attoparsec base bytestring scientific text
        ];
@@ -55908,6 +56740,7 @@ self: {
        ];
        description = "This package implments a parser for the CSS syntax";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "css-text" = callPackage
@@ -58148,6 +58981,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-filter" = callPackage
+    ({ mkDerivation, base, data-default }:
+     mkDerivation {
+       pname = "data-filter";
+       version = "0.1.0.0";
+       sha256 = "1yz22b42rqsf4i9p4lnl06l8id3f1a84dng96q2nk1mmih9v3pbm";
+       libraryHaskellDepends = [ base data-default ];
+       homepage = "https://github.com/LadyBoonami/data-filter";
+       description = "Utilities for filtering";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "data-fin" = callPackage
     ({ mkDerivation, base, lazysmallcheck, prelude-safeenum, QuickCheck
      , reflection, smallcheck, tagged
@@ -58317,6 +59162,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-index" = callPackage
+    ({ mkDerivation, base, containers, doctest }:
+     mkDerivation {
+       pname = "data-index";
+       version = "0.1.0.0";
+       sha256 = "0rfb688h0q6prsiyf1rfax1xv20m2r69m2389qar1z85izk2hfjf";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/Toucandy/data-index#readme";
+       description = "Extending the concept of indices for lists and other containers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-interval" = callPackage
     ({ mkDerivation, base, ChasingBottoms, containers, deepseq
      , extended-reals, hashable, HUnit, lattices, QuickCheck, syb, tasty
@@ -59200,8 +60058,8 @@ self: {
      }:
      mkDerivation {
        pname = "datafix";
-       version = "0.0.0.1";
-       sha256 = "0pdpqwdbc8hmwwq460yisbj4072x3jyh7gcrf1flm2545acgahvq";
+       version = "0.0.0.2";
+       sha256 = "0z13m81cl3dnkzrl9fym9mf269lhyw4039fkqpijs024pwbvp0ni";
        setupHaskellDepends = [ base Cabal cabal-toolkit ];
        libraryHaskellDepends = [
          base containers lattices pomaps primitive transformers vector
@@ -60884,14 +61742,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_5_1_0" = callPackage
+  "dejafu_1_6_0_0" = callPackage
     ({ mkDerivation, base, concurrency, containers, contravariant
      , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.5.1.0";
-       sha256 = "0whxbn6h5k7n38w0wzm5iwqc20yyvzri88zsp3hhp8pdfj34df7d";
+       version = "1.6.0.0";
+       sha256 = "101lbnan5cgyl6v6j4hbys8j8br814m14clxgc366yyd2rkf8saf";
        libraryHaskellDepends = [
          base concurrency containers contravariant deepseq exceptions
          leancheck profunctors random transformers
@@ -61480,6 +62338,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "deriving-compat_0_4_2" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, containers
+     , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
+     , template-haskell, th-abstraction, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "deriving-compat";
+       version = "0.4.2";
+       sha256 = "0vwpir5sd0x0r5ml83qg9hrwyq1s2psalpl8m007mh3hr8d4wgvz";
+       libraryHaskellDepends = [
+         base containers ghc-boot-th ghc-prim template-haskell
+         th-abstraction transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base base-compat base-orphans hspec QuickCheck tagged
+         template-haskell transformers transformers-compat
+       ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/haskell-compat/deriving-compat";
+       description = "Backports of GHC deriving extensions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "derp" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -62217,10 +63100,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-cairo";
-       version = "1.4";
-       sha256 = "10gabibjg1hb83pm7qbqxmskrvrb52m5wdb8fcqwy9d3vfzwhkm9";
-       revision = "2";
-       editedCabalFile = "1h21l3wa4vbl7p6n7sk949jpxvxikkhf81y2qjqgn904564w73r6";
+       version = "1.4.1";
+       sha256 = "0n368gv7jjnynp7gfbnaywnd4x65956qqifcxpi3gsy8yi0zsr6z";
        libraryHaskellDepends = [
          array base bytestring cairo colour containers data-default-class
          diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
@@ -62240,10 +63121,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-canvas";
-       version = "1.4";
-       sha256 = "1sbnnmj85vm6kjgzvrd3jyg40crz0i16ik6q3prwm4c38zr2yqih";
-       revision = "1";
-       editedCabalFile = "174nkb6ki100zh0hbrj8p4n52031jny6683n80i602544iikvbn9";
+       version = "1.4.1";
+       sha256 = "1ihmv42412d8dk3s894zd70xd386wrk9ycxkid19barry1vz5plj";
        libraryHaskellDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
@@ -62265,8 +63144,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-contrib";
-       version = "1.4.2.1";
-       sha256 = "1l7xz360chrqj9by6l5v0vwpvy81lniif600r3b6vf9ckyj747yz";
+       version = "1.4.3";
+       sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5";
        libraryHaskellDepends = [
          base circle-packing colour containers cubicbezier data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -62292,6 +63171,8 @@ self: {
        pname = "diagrams-core";
        version = "1.4.1";
        sha256 = "0zirk4v8qbyv0zbalh28ms9njafnj4z579dvrjvxbg6gqqcx3mcl";
+       revision = "1";
+       editedCabalFile = "0qv5jq4l0adks83zj2n4cgfazmg39flfb4k2i39l1w0bcmrzqjsc";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl profunctors semigroups unordered-containers
@@ -62422,6 +63303,8 @@ self: {
        pname = "diagrams-lib";
        version = "1.4.2.2";
        sha256 = "1rfn1fk251n84bxfn6p82p62gdjiq4yp4dwqmspp7ha2x6abn2s7";
+       revision = "2";
+       editedCabalFile = "1iwcrwfsga9kxp1h9cf3358dn64fzw3rbzrx1z24nd3ayy937vjk";
        libraryHaskellDepends = [
          active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -62553,16 +63436,15 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-rasterific";
-       version = "1.4";
-       sha256 = "190mc32fjjf3770fjp1bmbh3zc8l5bhqhqy30vv48l0pypfjrsns";
-       revision = "1";
-       editedCabalFile = "0y4hf13l9y4179vhdsak8zq69wyn3rgmwnz9wp0x4rj32gdjjp3j";
+       version = "1.4.1";
+       sha256 = "0zlpmmgn79jgckzzib758c82brci391r181hg43267s1lx463iih";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
          lens mtl optparse-applicative Rasterific
        ];
+       testHaskellDepends = [ base diagrams-core diagrams-lib ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
@@ -62632,8 +63514,10 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.4.1.1";
-       sha256 = "1ans2lliaxqbx2q2459kiv59ff307vz6plqnh082pxhvmk36h1n8";
+       version = "1.4.2";
+       sha256 = "1lnyxx45yawqas7hmvvannwaa3ycf1l9g40lsl2m8sl2ja6vcmal";
+       revision = "1";
+       editedCabalFile = "1mb2fdfvy0c1v7nahspq2cisfqrn37xjh4a6xhqr3b36pfz8rwnd";
        libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
@@ -62851,6 +63735,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diff" = callPackage
+    ({ mkDerivation, base, Enum, util }:
+     mkDerivation {
+       pname = "diff";
+       version = "0.1.0.0";
+       sha256 = "19sn53b4sb0sa7ibcz9wvpn3vhja0yx62p8f9ibawrycm4cpbpzl";
+       libraryHaskellDepends = [ base Enum util ];
+       description = "Diff and patch";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diff-gestalt" = callPackage
     ({ mkDerivation, base, Diff, KMP, QuickCheck, string-similarity }:
      mkDerivation {
@@ -63317,12 +64212,12 @@ self: {
      }) {};
 
   "dimensions" = callPackage
-    ({ mkDerivation, base, Cabal, ghc-prim, QuickCheck }:
+    ({ mkDerivation, base, Cabal, QuickCheck }:
      mkDerivation {
        pname = "dimensions";
-       version = "0.3.2.0";
-       sha256 = "1ps9yy363xfpvq6dl5mjp02h0cj1vdib2vggvsykvgqwwrnra83p";
-       libraryHaskellDepends = [ base ghc-prim ];
+       version = "1.0.0.0";
+       sha256 = "13y87wakhkw7fzfhqjif96y8z57h6pa0c7wirb0rvhfzdknyc1x0";
+       libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Safe type-level dimensionality for multidimensional data";
@@ -64803,6 +65698,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "djinn-lib_0_0_1_3" = callPackage
+    ({ mkDerivation, base, containers, mtl, pretty }:
+     mkDerivation {
+       pname = "djinn-lib";
+       version = "0.0.1.3";
+       sha256 = "0r1kby67flpyizj117r5q0q3sj61csqxd44za5r9292hj3cacd9v";
+       libraryHaskellDepends = [ base containers mtl pretty ];
+       homepage = "http://www.augustsson.net/Darcs/Djinn/";
+       description = "Generate Haskell code from a type. Library extracted from djinn package.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "djinn-th" = callPackage
     ({ mkDerivation, base, containers, logict, template-haskell }:
      mkDerivation {
@@ -64883,6 +65791,35 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "dmcc" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive
+     , classy-prelude, configurator, containers, HsOpenSSL, http-client
+     , io-streams, lens, monad-control, monad-logger, network
+     , openssl-streams, random, safe-exceptions, stm, text, time
+     , transformers-base, unix, unliftio, websockets, xml-conduit
+     , xml-hamlet
+     }:
+     mkDerivation {
+       pname = "dmcc";
+       version = "1.0.0.1";
+       sha256 = "1qlw3jx9nn2by757kqask1ib2wi32zgdj53kinj2lnjn5f9qs466";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring case-insensitive classy-prelude
+         containers HsOpenSSL http-client io-streams lens monad-control
+         monad-logger network openssl-streams safe-exceptions stm text time
+         transformers-base unliftio xml-conduit xml-hamlet
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring classy-prelude configurator containers
+         monad-control monad-logger random stm text unix unliftio websockets
+       ];
+       homepage = "https://github.com/f-me/dmcc#readme";
+       description = "AVAYA DMCC API bindings and WebSockets server for AVAYA";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dmenu" = callPackage
     ({ mkDerivation, base, containers, directory, lens, mtl, process
      , transformers
@@ -64980,6 +65917,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dns_3_0_3" = callPackage
+    ({ mkDerivation, async, attoparsec, auto-update, base
+     , base64-bytestring, binary, bytestring, containers, cryptonite
+     , doctest, hspec, iproute, mtl, network, psqueues, QuickCheck, safe
+     , time, word8
+     }:
+     mkDerivation {
+       pname = "dns";
+       version = "3.0.3";
+       sha256 = "0m7xgf5vgh3xj5yrv8hyvhx3lligx1xrnq22a9b6s2prbywyllfv";
+       libraryHaskellDepends = [
+         async attoparsec auto-update base base64-bytestring binary
+         bytestring containers cryptonite iproute mtl network psqueues safe
+         time
+       ];
+       testHaskellDepends = [
+         base bytestring doctest hspec iproute network QuickCheck word8
+       ];
+       testTarget = "spec";
+       description = "DNS library in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dnscache" = callPackage
     ({ mkDerivation, base, bytestring, containers, contstuff, dns
      , iproute, time
@@ -65703,8 +66664,8 @@ self: {
      }:
      mkDerivation {
        pname = "dotenv";
-       version = "0.5.2.4";
-       sha256 = "13c6b01gkkykg1sl1dk1374nbayg523w4fiy2bg494bj5ia516di";
+       version = "0.5.2.5";
+       sha256 = "1qglnss7jpns585l1k2m3pwqv7mq3jvh66ypmjjxxi1zcihbz5x1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -66624,8 +67585,8 @@ self: {
      }:
      mkDerivation {
        pname = "dual-tree";
-       version = "0.2.1.1";
-       sha256 = "1wzv6rrhz2kz0v1wirgs28fdlr0r4nwxlix9xda4fphzpp922gzr";
+       version = "0.2.2";
+       sha256 = "1sx9p9yr06z7bi7pshjpswizs6bkmfzcpw8xlasriniry86df4kl";
        libraryHaskellDepends = [
          base monoid-extras newtype-generics semigroups
        ];
@@ -66670,8 +67631,8 @@ self: {
      }:
      mkDerivation {
        pname = "duckling";
-       version = "0.1.4.0";
-       sha256 = "0m5f71z9rqfvvqxpsvbpr258rgirphgdyfvzb1wv20zdhfi67lzh";
+       version = "0.1.6.0";
+       sha256 = "0hk7nnqq20wl6sc3jlaykgsn9b4crgw6hl91xml2dh5d83sknvvq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66680,9 +67641,9 @@ self: {
          time timezone-series unordered-containers
        ];
        executableHaskellDepends = [
-         aeson base bytestring dependent-sum directory extra filepath
-         haskell-src-exts snap-core snap-server text text-show time
-         timezone-olson timezone-series unordered-containers
+         aeson base bytestring deepseq dependent-sum directory extra
+         filepath hashable haskell-src-exts snap-core snap-server text
+         text-show time timezone-olson timezone-series unordered-containers
        ];
        testHaskellDepends = [
          aeson base tasty tasty-hunit text time unordered-containers
@@ -67404,6 +68365,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "easy-file_0_2_2" = callPackage
+    ({ mkDerivation, base, directory, filepath, time, unix }:
+     mkDerivation {
+       pname = "easy-file";
+       version = "0.2.2";
+       sha256 = "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj";
+       libraryHaskellDepends = [ base directory filepath time unix ];
+       homepage = "http://github.com/kazu-yamamoto/easy-file";
+       description = "Cross-platform File handling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "easyjson" = callPackage
     ({ mkDerivation, base, mtl, parsec, text, unordered-containers
      , vector
@@ -67451,14 +68425,12 @@ self: {
      }) {};
 
   "easytensor" = callPackage
-    ({ mkDerivation, base, Cabal, dimensions, ghc-prim, QuickCheck
-     , time
-     }:
+    ({ mkDerivation, base, Cabal, dimensions, QuickCheck, time }:
      mkDerivation {
        pname = "easytensor";
-       version = "0.4.0.0";
-       sha256 = "13wgg67gjg07r1n91kqikbhz8nnzfbgmi0v8a1596a6z7al4kvpr";
-       libraryHaskellDepends = [ base dimensions ghc-prim ];
+       version = "1.0.0.0";
+       sha256 = "0qi7p82s5av0x9xqll4sjwh82x4r6bijypqh29f7xmk4y6dzs19c";
+       libraryHaskellDepends = [ base dimensions ];
        testHaskellDepends = [ base Cabal dimensions QuickCheck ];
        benchmarkHaskellDepends = [ base dimensions time ];
        homepage = "https://github.com/achirkin/easytensor#readme";
@@ -67466,6 +68438,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "easytensor-vulkan" = callPackage
+    ({ mkDerivation, base, dimensions, easytensor, vulkan-api }:
+     mkDerivation {
+       pname = "easytensor-vulkan";
+       version = "1.0.0.0";
+       sha256 = "1d3jxqhv0c6pd08av31mdxshban2g0msdpljhl3wi5flrj93s8m3";
+       libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
+       homepage = "https://github.com/achirkin/easytensor#readme";
+       description = "Use easytensor with vulkan-api";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "easytest" = callPackage
     ({ mkDerivation, async, base, call-stack, containers, mtl, random
      , stm, text, transformers
@@ -67625,12 +68609,16 @@ self: {
      }) {};
 
   "ecstasy" = callPackage
-    ({ mkDerivation, base, containers, mtl, transformers }:
+    ({ mkDerivation, base, containers, kan-extensions, mtl
+     , transformers
+     }:
      mkDerivation {
        pname = "ecstasy";
-       version = "0.1.1.0";
-       sha256 = "06j5fpgrcf8nwwvs52gwdd55g7pxxv3ygsz5g08g8ap7wl2i9mby";
-       libraryHaskellDepends = [ base containers mtl transformers ];
+       version = "0.2.1.0";
+       sha256 = "1hyb1xnc45mmghvjvnxc2wnkrks8glw2bs5jwnc1pmn3p39l4nci";
+       libraryHaskellDepends = [
+         base containers kan-extensions mtl transformers
+       ];
        homepage = "http://github.com/isovector/ecstasy/";
        description = "A GHC.Generics based entity component system.";
        license = stdenv.lib.licenses.bsd3;
@@ -67715,8 +68703,8 @@ self: {
      }:
      mkDerivation {
        pname = "ede";
-       version = "0.2.8.7";
-       sha256 = "02jy6v9w7vpzs3fikfvgd09p0dvfq9isxcag281naazgn1my8swb";
+       version = "0.2.9";
+       sha256 = "0gvs9kyq4xyz11x5cqmr7vnh4d1vany36rfpmm4dg23w3yj36fab";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base bifunctors bytestring comonad directory
@@ -68223,6 +69211,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "either-both" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "either-both";
+       version = "0.1.0.0";
+       sha256 = "1lbvahbbmhz6cazl5s4wkf66h1l20cg7380g027h53v5pjpvpdpl";
+       libraryHaskellDepends = [ base ];
+       description = "Either or both";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "either-list-functions" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
@@ -68529,6 +69528,8 @@ self: {
        pname = "ekg-wai";
        version = "0.1.0.3";
        sha256 = "1sd2fz4l4slizm179x9cskqdvrpf6w4d779kah9hrnk3nqbmklxz";
+       revision = "1";
+       editedCabalFile = "0crcpwrnh1pi5n4dlp9cwminj1gls9ywm4fgvisafh480097b100";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath http-types network
@@ -70440,6 +71441,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "errors_2_3_0" = callPackage
+    ({ mkDerivation, base, exceptions, safe, text, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "errors";
+       version = "2.3.0";
+       sha256 = "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7";
+       libraryHaskellDepends = [
+         base exceptions safe text transformers transformers-compat
+       ];
+       description = "Simplified error-handling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "errors-ext" = callPackage
     ({ mkDerivation, base, errors, exceptions, HUnit, monad-control
      , mtl, transformers
@@ -70720,8 +71737,8 @@ self: {
      }:
      mkDerivation {
        pname = "etc";
-       version = "0.3.2.0";
-       sha256 = "1j4qjw1hqw5q9i47ixiwcr3zpcs1x39l46mh5yii5xkqmwlw9gk0";
+       version = "0.4.0.0";
+       sha256 = "0zyyayk9b6jzksxd14k08594ms5szgcpa63nlw3vnni1q1c2x1v4";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base hashable rio text typed-process unliftio
@@ -71565,6 +72582,42 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eventstore_1_1_3" = callPackage
+    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
+     , cereal, clock, connection, containers, dns, dotnet-timespan
+     , ekg-core, exceptions, fast-logger, hashable, http-client
+     , interpolate, lifted-async, lifted-base, machines, monad-control
+     , monad-logger, mono-traversable, mtl, protobuf, random
+     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
+     , tasty-hunit, text, time, transformers-base, unordered-containers
+     , uuid
+     }:
+     mkDerivation {
+       pname = "eventstore";
+       version = "1.1.3";
+       sha256 = "076pxyaslvw4kiqqbhapvqi0nr501l2z8nvajkqw1d9iasgwcfxz";
+       libraryHaskellDepends = [
+         aeson array base bifunctors bytestring cereal clock connection
+         containers dns dotnet-timespan ekg-core exceptions fast-logger
+         hashable http-client interpolate lifted-async lifted-base machines
+         monad-control monad-logger mono-traversable mtl protobuf random
+         safe-exceptions semigroups stm stm-chans text time
+         transformers-base unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring cereal connection containers
+         dotnet-timespan exceptions fast-logger hashable lifted-async
+         lifted-base monad-control mono-traversable protobuf safe-exceptions
+         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
+         transformers-base unordered-containers uuid
+       ];
+       homepage = "https://github.com/YoEight/eventstore#readme";
+       description = "EventStore TCP Client";
+       license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "every" = callPackage
     ({ mkDerivation, async, base, stm }:
      mkDerivation {
@@ -72447,15 +73500,16 @@ self: {
      }) {};
 
   "expressions" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, lattices, singletons
-     , text, transformers
+    ({ mkDerivation, attoparsec, base, containers, free, lattices
+     , singletons, text, transformers
      }:
      mkDerivation {
        pname = "expressions";
-       version = "0.1.5";
-       sha256 = "1iw6i922wjvs844gqqvmvhvfaq8c06lxlca806s6rbk0sxq40nmz";
+       version = "0.1.6";
+       sha256 = "081yglpbk0297s7qyq845x9pfkl0dcbz4i2dv1rppslvkhpwa270";
        libraryHaskellDepends = [
-         attoparsec base containers lattices singletons text transformers
+         attoparsec base containers free lattices singletons text
+         transformers
        ];
        testHaskellDepends = [ base singletons text ];
        description = "Expressions and Formulae a la carte";
@@ -72463,15 +73517,15 @@ self: {
      }) {};
 
   "expressions-z3" = callPackage
-    ({ mkDerivation, base, containers, expressions, singletons
+    ({ mkDerivation, base, containers, expressions, list-t, singletons
      , transformers, z3
      }:
      mkDerivation {
        pname = "expressions-z3";
-       version = "0.1.3";
-       sha256 = "1hb44k4558lwsx3z02lgmf1i24ajjlbyqbc88lzgjh3vswfahsj8";
+       version = "0.1.5";
+       sha256 = "07ah8bb7pv1jzj4aa783s8axh909hnysfy21x9slwgc8nwlx6rcr";
        libraryHaskellDepends = [
-         base containers expressions singletons transformers z3
+         base containers expressions list-t singletons transformers z3
        ];
        testHaskellDepends = [
          base containers expressions singletons transformers z3
@@ -72577,6 +73631,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extensible_0_4_9" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, comonad
+     , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton
+     , mtl, prettyprinter, primitive, profunctors, QuickCheck
+     , semigroups, StateVar, tagged, template-haskell, text, th-lift
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "extensible";
+       version = "0.4.9";
+       sha256 = "11iyz4lgs2bf6wg1iiancwj58ywpj8f93bqj9scy4mzz8mpyllmp";
+       libraryHaskellDepends = [
+         aeson base bytestring cassava comonad constraints deepseq ghc-prim
+         hashable monad-skeleton mtl prettyprinter primitive profunctors
+         QuickCheck semigroups StateVar tagged template-haskell text th-lift
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [ base lens QuickCheck template-haskell ];
+       homepage = "https://github.com/fumieval/extensible";
+       description = "Extensible, efficient, optics-friendly data types and effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extensible-data" = callPackage
     ({ mkDerivation, base, data-lens, hashable, template-haskell
      , unordered-containers
@@ -72641,6 +73719,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "extensible-effects-concurrent" = callPackage
+    ({ mkDerivation, base, containers, directory, extensible-effects
+     , filepath, lens, mtl, parallel, process, QuickCheck, random, stm
+     , tagged, time, transformers
+     }:
+     mkDerivation {
+       pname = "extensible-effects-concurrent";
+       version = "0.1.1.0";
+       sha256 = "1zf67f7400n4nvwvvb0znr3aigkhawqnlz911rl79bybcibx85nc";
+       libraryHaskellDepends = [
+         base containers directory extensible-effects filepath lens mtl
+         parallel process QuickCheck random stm tagged time transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/sheyll/extensible-effects-concurrent#readme";
+       description = "Message passing concurrency as extensible-effect";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "extensible-exceptions" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -72804,6 +73901,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ez3" = callPackage
+    ({ mkDerivation, base, transformers, z3 }:
+     mkDerivation {
+       pname = "ez3";
+       version = "0.1.0.0";
+       sha256 = "0p2i8ingh27qn61rizh79ink63ydf3wcm86q57f4kd4arbnp7gs4";
+       revision = "1";
+       editedCabalFile = "13pr43yrrkxp0fmdw1s4wavz8zak5pw1aq2wf1zc8fskysyfx67w";
+       libraryHaskellDepends = [ base transformers z3 ];
+       description = "Z3 bonds with pure interface";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "faceted" = callPackage
     ({ mkDerivation, base, free }:
      mkDerivation {
@@ -73131,8 +74241,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.6.0.3";
-       sha256 = "1q9fdx61wpznpw551id09xg1yw8vyh77cvcwswmi0grld4hqn17g";
+       version = "0.6.0.5";
+       sha256 = "138qdgwqc3qnafi0kf5nkva3nvcfn71b1ch2xrwgxkna5kniqjrh";
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ];
        benchmarkHaskellDepends = [ arithmoi base combinat criterion ];
@@ -74977,8 +76087,8 @@ self: {
      }:
      mkDerivation {
        pname = "filestore";
-       version = "0.6.3.2";
-       sha256 = "0nx16b6nvzvzwrwrbyzjm7dh2ilk3vbrwr6r9m2c62ll1k99100v";
+       version = "0.6.3.3";
+       sha256 = "04qvp5hmnnassw13lw7g1l785lgdlfzl9msy4k1ja8p6gksy7r1c";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
@@ -75094,10 +76204,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "filtrable";
-       version = "0.1.0.5";
-       sha256 = "0znfhi3sxfnrhqnmll7dx9pyw5wcyvlj62b8ir9hz3cznvb7aakd";
-       revision = "1";
-       editedCabalFile = "0wa848jypc7vvr4y6h7rvfd6m8n1747889rqzybrl3cvm138572v";
+       version = "0.1.1.0";
+       sha256 = "0g1ngsbxrydbwa637sk8zvpvygppr6abj9hh87maf56ily4ki9fn";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/strake/filtrable.hs";
        description = "Class of filtrable containers";
@@ -77014,8 +78122,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.5.2.0";
-       sha256 = "1dx9b7ivypa1avwb8ip7lqixm0lba15piiq3mh6wclxb93nf1n63";
+       version = "0.6.0.0";
+       sha256 = "177ar0c66lzp5rnnpbia0v3ri9aspc97qnj9yjwh3bz2drn01q0y";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers foldl free
          monoid-subclasses profunctors semigroupoids semigroups split text
@@ -77659,13 +78767,13 @@ self: {
 
   "fortran-src" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , directory, fgl, filepath, GenericPretty, happy, hspec, mtl
-     , pretty, text, uniplate
+     , deepseq, directory, fgl, filepath, GenericPretty, happy, hspec
+     , mtl, pretty, text, uniplate
      }:
      mkDerivation {
        pname = "fortran-src";
-       version = "0.2.0.0";
-       sha256 = "0mmzr58rbanmml2mfawgg58s7v9v7gkw9maxpy96vyfkk4wjvnwc";
+       version = "0.2.1.1";
+       sha256 = "000i0395k6wpmzymiqc4x4xi06y6a8q4yianqplfl7zn2ghyxcsz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77678,10 +78786,10 @@ self: {
          GenericPretty mtl pretty text uniplate
        ];
        testHaskellDepends = [
-         array base binary bytestring containers directory fgl filepath
-         GenericPretty hspec mtl pretty text uniplate
+         array base binary bytestring containers deepseq directory fgl
+         filepath GenericPretty hspec mtl pretty text uniplate
        ];
-       description = "Parser and anlyses for Fortran standards 66, 77, 90";
+       description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -79000,6 +80108,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fsnotify-conduit_0_1_1_0" = callPackage
+    ({ mkDerivation, base, conduit, directory, filepath, fsnotify
+     , hspec, resourcet, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "fsnotify-conduit";
+       version = "0.1.1.0";
+       sha256 = "03mlb8yhdajf00dzddvbmb7jm3p05zw1y33f2acaa52pk45zh063";
+       libraryHaskellDepends = [
+         base conduit directory filepath fsnotify resourcet transformers
+       ];
+       testHaskellDepends = [
+         base conduit directory filepath fsnotify hspec resourcet temporary
+         transformers
+       ];
+       homepage = "https://github.com/fpco/fsnotify-conduit#readme";
+       description = "Get filesystem notifications as a stream of events";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fst" = callPackage
     ({ mkDerivation, array, base, haskeline, mtl, QuickCheck
      , transformers
@@ -81151,8 +82280,8 @@ self: {
        pname = "generic-xmlpickler";
        version = "0.1.0.5";
        sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym";
-       revision = "7";
-       editedCabalFile = "0v4sqm0m8vr2i6hinx0mpax3mz73mvf21bdbga0vdgx7dac2nvkb";
+       revision = "8";
+       editedCabalFile = "1hpcglml4b5yv192syxazminr5v7qjrgqwb2wk0cf7f0sjpm5d0q";
        libraryHaskellDepends = [ base generic-deriving hxt text ];
        testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
@@ -81480,12 +82609,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "genvalidity_0_5_0_2" = callPackage
+  "genvalidity_0_5_0_3" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.5.0.2";
-       sha256 = "1l1lv8k8gl7i5zd54636ihbwddgq49088lgb2gragm05cki823c1";
+       version = "0.5.0.3";
+       sha256 = "0xf1sd5g87gvdg1n3g7in7x8x4cf1jnsbaxmq64qmjlns4qr0fnk";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -81518,7 +82647,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-aeson_0_2_0_0" = callPackage
+  "genvalidity-aeson_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
      , genvalidity-scientific, genvalidity-text
      , genvalidity-unordered-containers, genvalidity-vector, hspec
@@ -81526,8 +82655,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-aeson";
-       version = "0.2.0.0";
-       sha256 = "0lwy2r7gb5s26hilgxs2hf8zcn4dhdwqhr8r05zrvjcry4inn5mm";
+       version = "0.2.0.1";
+       sha256 = "0cfp5smj5ap5ppsk95yf0qmpbysqypsiccbcdckqkiky73nnvax8";
        libraryHaskellDepends = [
          aeson base genvalidity genvalidity-scientific genvalidity-text
          genvalidity-unordered-containers genvalidity-vector QuickCheck
@@ -81562,14 +82691,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-bytestring_0_2_0_0" = callPackage
+  "genvalidity-bytestring_0_2_0_1" = callPackage
     ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec
      , hspec, QuickCheck, validity, validity-bytestring
      }:
      mkDerivation {
        pname = "genvalidity-bytestring";
-       version = "0.2.0.0";
-       sha256 = "0ai3pmybs2xky8b596s0xs6511ab1h28ywbaishn5s0217q225zf";
+       version = "0.2.0.1";
+       sha256 = "0lyxaisy2wjsqh0igx74wkjginnza3mmjasi8gdvkzk8kd85jvcl";
        libraryHaskellDepends = [
          base bytestring genvalidity QuickCheck validity validity-bytestring
        ];
@@ -81602,14 +82731,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-containers_0_4_0_0" = callPackage
+  "genvalidity-containers_0_4_0_1" = callPackage
     ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
      , hspec, QuickCheck, validity, validity-containers
      }:
      mkDerivation {
        pname = "genvalidity-containers";
-       version = "0.4.0.0";
-       sha256 = "0q7dzmp8ik3v8ckv8i9cnc687306i4i80mx7sbh956hw5kr6bqnb";
+       version = "0.4.0.1";
+       sha256 = "1b8q17s22wimh4dgm2igaw6icdc2bqfr7ih28ba6chmnhsjiw9wf";
        libraryHaskellDepends = [
          base containers genvalidity QuickCheck validity validity-containers
        ];
@@ -81643,14 +82772,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec_0_6_0_2" = callPackage
+  "genvalidity-hspec_0_6_0_3" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
      , hspec, hspec-core, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.6.0.2";
-       sha256 = "0l14vn5hddkvyzhch8l9abwh3naya27p9f6lz918zd8i5l5pd32n";
+       version = "0.6.0.3";
+       sha256 = "195r2yw1ivss2w7criarmw5bpwjfpa19myvxfpkwk769wz9vih63";
        libraryHaskellDepends = [
          base genvalidity genvalidity-property hspec hspec-core QuickCheck
          validity
@@ -81687,15 +82816,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec-aeson_0_2_0_0" = callPackage
+  "genvalidity-hspec-aeson_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
      , genvalidity, genvalidity-aeson, genvalidity-hspec
      , genvalidity-text, hspec, QuickCheck, text
      }:
      mkDerivation {
        pname = "genvalidity-hspec-aeson";
-       version = "0.2.0.0";
-       sha256 = "0xkignwkq1hdyvachslwf5clzvnw0bmyi00mv3nkigxn8q1vbf7h";
+       version = "0.2.0.1";
+       sha256 = "0q681wj05vpxrplklvdxcr8l67gm71hvs7b991m7rfslpkx24smh";
        libraryHaskellDepends = [
          aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
          QuickCheck
@@ -81728,14 +82857,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec-binary_0_2_0_0" = callPackage
+  "genvalidity-hspec-binary_0_2_0_1" = callPackage
     ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
      , genvalidity-hspec, hspec, QuickCheck
      }:
      mkDerivation {
        pname = "genvalidity-hspec-binary";
-       version = "0.2.0.0";
-       sha256 = "0qmmhbka2ba9x9ypafij5q9gmmm7x4v1frf9mrfi4ffw91fnfnpv";
+       version = "0.2.0.1";
+       sha256 = "1ch48h0z7njxkv8ig8hk3d2s5a1w0ssxy2br05qn43snbdh33vx0";
        libraryHaskellDepends = [
          base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
@@ -81764,14 +82893,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec-cereal_0_2_0_0" = callPackage
+  "genvalidity-hspec-cereal_0_2_0_1" = callPackage
     ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
      , genvalidity-hspec, hspec, QuickCheck
      }:
      mkDerivation {
        pname = "genvalidity-hspec-cereal";
-       version = "0.2.0.0";
-       sha256 = "18fz57lwn6ljrm9fszb1n2jzn93kqvqi7x9fyp6a0kh733lyzrnn";
+       version = "0.2.0.1";
+       sha256 = "18md81dfwgf6cq6aq4yz0qm0j5myfq8md9zpbb87yrdmrqsvyapn";
        libraryHaskellDepends = [
          base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
@@ -81805,15 +82934,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec-hashable_0_2_0_0" = callPackage
+  "genvalidity-hspec-hashable_0_2_0_1" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
      , genvalidity-property, hashable, hspec, hspec-core, QuickCheck
      , validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec-hashable";
-       version = "0.2.0.0";
-       sha256 = "1mw3lg792hssbfasb0av9x9n7ksqcjwxpgab0n9ia1jspxacrxr4";
+       version = "0.2.0.1";
+       sha256 = "1llgq9181n24cjd7blan1fc2lgv9039nfwl3sj95z2z9wvy63cgm";
        libraryHaskellDepends = [
          base genvalidity genvalidity-hspec genvalidity-property hashable
          hspec QuickCheck validity
@@ -81844,14 +82973,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-path_0_3_0_0" = callPackage
+  "genvalidity-path_0_3_0_1" = callPackage
     ({ mkDerivation, base, criterion, genvalidity, genvalidity-hspec
      , hspec, path, QuickCheck, validity-path
      }:
      mkDerivation {
        pname = "genvalidity-path";
-       version = "0.3.0.0";
-       sha256 = "00rbizzxy9ccd85gr0bf4kw6b5bz15pzhg05qzsifpjj6vfy4izf";
+       version = "0.3.0.1";
+       sha256 = "13avz2nlksvp6yam0mjny4fcj77i40vp8an5585n1mzrikadhr8x";
        libraryHaskellDepends = [
          base genvalidity path QuickCheck validity-path
        ];
@@ -81882,14 +83011,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "genvalidity-property_0_2_0_1" = callPackage
+  "genvalidity-property_0_2_0_2" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, genvalidity
      , hspec, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-property";
-       version = "0.2.0.1";
-       sha256 = "02ypm53llfdrqasji79bng3ybkjs8ak7klcrhkg15k6jgk0ca877";
+       version = "0.2.0.2";
+       sha256 = "1rsxi6d5a4bz2dcxcrsa3xpav2nkxss8hindyncfqgn2af0vk5rp";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
@@ -81920,14 +83049,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-scientific_0_2_0_0" = callPackage
+  "genvalidity-scientific_0_2_0_1" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, scientific, validity, validity-scientific
      }:
      mkDerivation {
        pname = "genvalidity-scientific";
-       version = "0.2.0.0";
-       sha256 = "0zf0akzbggyy79h48m78cfsp82nmdgk0py8crfp81sh0pd3cydpi";
+       version = "0.2.0.1";
+       sha256 = "1wxrcpmhcbiklzqf5zjn0q7hpgkds5jjmdhl9kq68vbm96lm8zgn";
        libraryHaskellDepends = [
          base genvalidity QuickCheck scientific validity validity-scientific
        ];
@@ -81960,14 +83089,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-text_0_5_0_0" = callPackage
+  "genvalidity-text_0_5_0_1" = callPackage
     ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, text, validity, validity-text
      }:
      mkDerivation {
        pname = "genvalidity-text";
-       version = "0.5.0.0";
-       sha256 = "0vyw27l0b9snndl1nixidg8ghk6i95qv2xk59fbj1r1ybg27b837";
+       version = "0.5.0.1";
+       sha256 = "05dgf67zm9gbk985mz89jm4vdwd1s9rnazmjzwxn9gqkd6niqxyw";
        libraryHaskellDepends = [
          array base genvalidity QuickCheck text validity validity-text
        ];
@@ -81998,14 +83127,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-time_0_2_0_1" = callPackage
+  "genvalidity-time_0_2_0_2" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, time, validity-time
      }:
      mkDerivation {
        pname = "genvalidity-time";
-       version = "0.2.0.1";
-       sha256 = "0kd2rxmz197yzfhxya4pbvl77iv7knl0zc1v56089ls4vk4by2gg";
+       version = "0.2.0.2";
+       sha256 = "0b0cyssqirpafla3dxkg6klq0nv6xnbaj10szb714lwiyvcx8dj1";
        libraryHaskellDepends = [
          base genvalidity QuickCheck time validity-time
        ];
@@ -82038,15 +83167,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-unordered-containers_0_2_0_2" = callPackage
+  "genvalidity-unordered-containers_0_2_0_3" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
      , hspec, QuickCheck, unordered-containers, validity
      , validity-unordered-containers
      }:
      mkDerivation {
        pname = "genvalidity-unordered-containers";
-       version = "0.2.0.2";
-       sha256 = "0sjs06qf0pk6xvgc38qayzfqk6wm1qgpx3yzglpkhdy809gl5pfa";
+       version = "0.2.0.3";
+       sha256 = "0r89pisv6a7m0vf6dif7lx7w7gc4jsx33d4hzskwz3x6si07xadd";
        libraryHaskellDepends = [
          base genvalidity hashable QuickCheck unordered-containers validity
          validity-unordered-containers
@@ -83177,6 +84306,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof_1_4_1_2" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, directory, filepath
+     , process, scientific, tasty, tasty-hunit, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "ghc-prof";
+       version = "1.4.1.2";
+       sha256 = "0rippzp76g2zn8vhxfkvpf9r2l62lid6525ym6zz1pyq4xzsbqrf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base containers scientific text time
+       ];
+       testHaskellDepends = [
+         attoparsec base containers directory filepath process tasty
+         tasty-hunit temporary text
+       ];
+       homepage = "https://github.com/maoe/ghc-prof";
+       description = "Library for parsing GHC time and allocation profiling reports";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-prof-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }:
      mkDerivation {
@@ -83323,6 +84475,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-syntax-highlighter" = callPackage
+    ({ mkDerivation, base, ghc, hspec, hspec-discover, text }:
+     mkDerivation {
+       pname = "ghc-syntax-highlighter";
+       version = "0.0.2.0";
+       sha256 = "1gcdhsbjpj1mwwgc4l2ibdcvicw9xx6bmva8r7ddd7bqbhnmqcyg";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base ghc text ];
+       testHaskellDepends = [ base hspec text ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/mrkkrp/ghc-syntax-highlighter";
+       description = "Syntax highlighter for Haskell using lexer of GHC itself";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-tcplugins-extra" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -83390,6 +84557,8 @@ self: {
        pname = "ghc-typelits-extra";
        version = "0.2.4";
        sha256 = "0inj776401846brd945p00qkjylniwlvycn1c300p90kyighkpdg";
+       revision = "1";
+       editedCabalFile = "1ysf5mr85877a995951wjdg633ylrbpqhpqnn27yb6ayimky5z7a";
        libraryHaskellDepends = [
          base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
          ghc-typelits-natnormalise integer-gmp transformers
@@ -83435,6 +84604,8 @@ self: {
        pname = "ghc-typelits-knownnat";
        version = "0.4.2";
        sha256 = "1h0l5hks2pdaibq4w46b9064idshan615iiyjjbzkc2zg04xsbbr";
+       revision = "1";
+       editedCabalFile = "16x3i6js5z0qr1yw9pfpc7hwhb28djijas2pkx4idwp997mryjaj";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
          template-haskell transformers
@@ -83477,6 +84648,8 @@ self: {
        pname = "ghc-typelits-natnormalise";
        version = "0.5.10";
        sha256 = "15xn69jdv77pgyd4mgm35zbrc1h0phyvw733j6s5iy01fhrhrdny";
+       revision = "1";
+       editedCabalFile = "1d4j47glcw0xvdr6sgr221rfpjs48bijx5c5hyqqz6jfp0164grr";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra integer-gmp
        ];
@@ -84080,6 +85253,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo;};
 
+  "gi-cairo_1_0_17" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-cairo";
+       version = "1.0.17";
+       sha256 = "1ax7aly9ahvb18m3zjmy0dk47qfdx5yl15q52c3wp4wa0c5aggax";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ cairo ];
+       doHaddock = false;
+       preCompileBuildDriver = ''
+         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
+         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
+       '';
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Cairo bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) cairo;};
+
   "gi-dbusmenu" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
@@ -84134,8 +85333,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "3.0.15";
-       sha256 = "17cjg6m69xlmlnwlwa6s23f1j28bfrwkg08v3n5xmz56zvzsgykg";
+       version = "3.0.16";
+       sha256 = "0jp3d3zfm20b4ax1g5k1wzh8fxxzsw4ssw7zqx0d13167m4smc3y";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
@@ -84446,8 +85645,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.22";
-       sha256 = "017nnypxsrxsqar7pmbf0kwvbkpdnp3y7dvn8s82b09qiymxa0rz";
+       version = "3.0.23";
+       sha256 = "0lii8k87adhrdhpwqcfdcnclh7wf9hi6rkn819c2xmpbchaj3s4k";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -84627,8 +85826,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.16";
-       sha256 = "0hp90rx33xbi3w2y3iacf19p9mhkz6s4q8q6hcsrh5jnbavbpjwy";
+       version = "1.0.17";
+       sha256 = "1ysf9an7cmacyz7hzw0p7zshrn466v51d0dpqbkn2j1p2akr2v1a";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
@@ -85074,8 +86273,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180427";
-       sha256 = "0pjdb0mk5hmjl0sra37ap3cr5xp9pa7fyikqmz4156hzk925rrds";
+       version = "6.20180509";
+       sha256 = "09rl41c7fsz9jzf9234qcqfix61afxyc2vjx6sld2zyqiky7rhvh";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -85399,28 +86598,25 @@ self: {
      }) {};
 
   "git-vogue" = callPackage
-    ({ mkDerivation, base, bifunctors, Cabal, containers, cpphs, Diff
-     , directory, extra, filepath, formatting, ghc-mod, git
-     , haskell-src-exts, hlint, hscolour, hspec, optparse-applicative
-     , process, split, strict, stylish-haskell, temporary, text
-     , transformers, unix
+    ({ mkDerivation, base, bifunctors, containers, cpphs, Diff
+     , directory, filepath, formatting, git, haskell-src-exts, hlint
+     , hscolour, hspec, optparse-applicative, process, split, strict
+     , stylish-haskell, temporary, text, transformers, unix
      }:
      mkDerivation {
        pname = "git-vogue";
-       version = "0.2.2.2";
-       sha256 = "13i5kb3bqkjhgla98ywl5rhjyi8dnxzi4srsjw3x3hwy0srmh7l8";
+       version = "0.3.0.2";
+       sha256 = "0p3h4107pfcxap83xbqffb30zymi2ipzjqgcdg2qzpbnczw6j5ml";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
-         base containers directory extra filepath formatting
-         optparse-applicative process split text transformers unix
+         base containers directory filepath formatting optparse-applicative
+         process split temporary text transformers unix
        ];
        executableHaskellDepends = [
-         base bifunctors Cabal cpphs Diff directory ghc-mod haskell-src-exts
-         hlint hscolour optparse-applicative process strict stylish-haskell
-         text
+         base bifunctors cpphs Diff directory haskell-src-exts hlint
+         hscolour optparse-applicative process strict stylish-haskell text
        ];
        testHaskellDepends = [
          base containers directory filepath hspec process temporary
@@ -87084,8 +88280,8 @@ self: {
     ({ mkDerivation, base, gmp, recursion-schemes }:
      mkDerivation {
        pname = "gmpint";
-       version = "0.1.0.12";
-       sha256 = "0l3qd8hps55am4ddj4x83f0vyi1rwhh7gj36k465n4m1pz7ndxrx";
+       version = "0.1.0.13";
+       sha256 = "0n4syarw91367kkvsbn9ag3caiksbplx4grm8q4z96wh39dvb24y";
        libraryHaskellDepends = [ base recursion-schemes ];
        librarySystemDepends = [ gmp ];
        description = "GMP integer conversions";
@@ -91319,8 +92515,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk";
-       version = "0.14.9";
-       sha256 = "1khz6ymwga07h7s1k9gadf212m242l9qq09qn2fvx8v67p4wvxxz";
+       version = "0.14.10";
+       sha256 = "0cq6cpr42mjansnbk3p38xkqslqcb8lbl4smc73kaqr1xcg6gq98";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
@@ -91426,28 +92622,28 @@ self: {
      }) {};
 
   "gtk-sni-tray" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dbus, directory
-     , enclosed-exceptions, filepath, gi-dbusmenugtk3, gi-gdk
-     , gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut, gtk3, haskell-gi
-     , haskell-gi-base, hslogger, optparse-applicative
-     , status-notifier-item, text, transformers, unix
+    ({ mkDerivation, base, bytestring, cairo, containers, dbus
+     , dbus-hslogger, directory, enclosed-exceptions, filepath, gi-cairo
+     , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut
+     , gtk3, haskell-gi, haskell-gi-base, hslogger, optparse-applicative
+     , status-notifier-item, text, transformers, transformers-base, unix
      }:
      mkDerivation {
        pname = "gtk-sni-tray";
-       version = "0.1.2.0";
-       sha256 = "1imgna34fdsg2fwlxk5xb0dvw8sbqjk7qgvh1p3wc8q9yx8zl0qm";
+       version = "0.1.3.0";
+       sha256 = "197a0wfbg6xzyka2ydbmbs6g6mghlp1ncchbmrb6gzn3b85iggq6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers dbus directory enclosed-exceptions
-         filepath gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib gi-gtk
-         gtk-strut haskell-gi haskell-gi-base hslogger status-notifier-item
-         text transformers unix
+         base bytestring cairo containers dbus directory enclosed-exceptions
+         filepath gi-cairo gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib
+         gi-gtk gtk-strut haskell-gi haskell-gi-base hslogger
+         status-notifier-item text transformers transformers-base unix
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        executableHaskellDepends = [
-         base dbus gi-gdk gi-gtk gtk-strut hslogger optparse-applicative
-         status-notifier-item text unix
+         base dbus dbus-hslogger gi-gdk gi-gtk gtk-strut hslogger
+         optparse-applicative status-notifier-item text unix
        ];
        homepage = "https://github.com/IvanMalison/gtk-sni-tray#readme";
        description = "A standalone StatusNotifierItem/AppIndicator tray";
@@ -92215,35 +93411,33 @@ self: {
     ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
      , base16-bytestring, base64-bytestring, bifunctors, binary
      , binary-conduit, bytestring, bzlib, conduit, conduit-extra
-     , containers, criterion, crypto-cipher-types, cryptonite
-     , data-default-class, errors, hashable, incremental-parser
-     , ixset-typed, lens, memory, monad-loops, nettle, network
-     , network-uri, newtype, openpgp-asciiarmor, QuickCheck
-     , quickcheck-instances, resourcet, semigroups, split, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
-     , transformers, unliftio-core, unordered-containers
-     , wl-pprint-extras, zlib
+     , containers, criterion, crypto-cipher-types, cryptonite, errors
+     , hashable, incremental-parser, ixset-typed, lens, memory
+     , monad-loops, nettle, network, network-uri, newtype
+     , openpgp-asciiarmor, QuickCheck, quickcheck-instances, resourcet
+     , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, time-locale-compat, transformers, unliftio-core
+     , unordered-containers, wl-pprint-extras, zlib
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.6.1";
-       sha256 = "1al531lrsgfsqjc21117l420pcd7ymv4vdzywka189lkd8p5yzj7";
+       version = "2.6.2";
+       sha256 = "1jlhhil5ilsw4nzjwsmfppcsfg59w5hw7nxjba92dgm3bsicf1ln";
        libraryHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring
          base64-bytestring bifunctors binary binary-conduit bytestring bzlib
          conduit conduit-extra containers crypto-cipher-types cryptonite
-         data-default-class errors hashable incremental-parser ixset-typed
-         lens memory monad-loops nettle network-uri newtype
-         openpgp-asciiarmor resourcet semigroups split text time
-         time-locale-compat transformers unliftio-core unordered-containers
-         wl-pprint-extras zlib
+         errors hashable incremental-parser ixset-typed lens memory
+         monad-loops nettle network-uri newtype openpgp-asciiarmor resourcet
+         semigroups split text time time-locale-compat transformers
+         unliftio-core unordered-containers wl-pprint-extras zlib
        ];
        testHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring bifunctors
          binary binary-conduit bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite data-default-class errors
-         hashable incremental-parser ixset-typed lens memory monad-loops
-         nettle network network-uri newtype QuickCheck quickcheck-instances
+         containers crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype QuickCheck quickcheck-instances
          resourcet semigroups split tasty tasty-hunit tasty-quickcheck text
          time time-locale-compat transformers unliftio-core
          unordered-containers wl-pprint-extras zlib
@@ -92251,11 +93445,62 @@ self: {
        benchmarkHaskellDepends = [
          aeson base base16-bytestring base64-bytestring bifunctors binary
          binary-conduit bytestring bzlib conduit conduit-extra containers
-         criterion crypto-cipher-types cryptonite data-default-class errors
-         hashable incremental-parser ixset-typed lens memory monad-loops
-         nettle network network-uri newtype openpgp-asciiarmor resourcet
-         semigroups split text time time-locale-compat transformers
-         unliftio-core unordered-containers wl-pprint-extras zlib
+         criterion crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype openpgp-asciiarmor resourcet semigroups
+         split text time time-locale-compat transformers unliftio-core
+         unordered-containers wl-pprint-extras zlib
+       ];
+       homepage = "https://salsa.debian.org/clint/hOpenPGP";
+       description = "native Haskell implementation of OpenPGP (RFC4880)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hOpenPGP_2_7" = callPackage
+    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
+     , base16-bytestring, base64-bytestring, bifunctors, binary
+     , binary-conduit, bytestring, bzlib, conduit, conduit-extra
+     , containers, criterion, crypto-cipher-types, cryptonite, errors
+     , hashable, incremental-parser, ixset-typed, lens, memory
+     , monad-loops, nettle, network, network-uri, newtype
+     , openpgp-asciiarmor, prettyprinter, QuickCheck
+     , quickcheck-instances, resourcet, semigroups, split, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
+     , transformers, unliftio-core, unordered-containers, zlib
+     }:
+     mkDerivation {
+       pname = "hOpenPGP";
+       version = "2.7";
+       sha256 = "0s4afs5s6sz2j9vkgz6xhx426dva72i6gk8804avjphjrfvvgdzg";
+       libraryHaskellDepends = [
+         aeson asn1-encoding attoparsec base base16-bytestring
+         base64-bytestring bifunctors binary binary-conduit bytestring bzlib
+         conduit conduit-extra containers crypto-cipher-types cryptonite
+         errors hashable incremental-parser ixset-typed lens memory
+         monad-loops nettle network-uri newtype openpgp-asciiarmor
+         prettyprinter resourcet semigroups split text time
+         time-locale-compat transformers unliftio-core unordered-containers
+         zlib
+       ];
+       testHaskellDepends = [
+         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
+         binary binary-conduit bytestring bzlib conduit conduit-extra
+         containers crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype prettyprinter QuickCheck
+         quickcheck-instances resourcet semigroups split tasty tasty-hunit
+         tasty-quickcheck text time time-locale-compat transformers
+         unliftio-core unordered-containers zlib
+       ];
+       benchmarkHaskellDepends = [
+         aeson base base16-bytestring base64-bytestring bifunctors binary
+         binary-conduit bytestring bzlib conduit conduit-extra containers
+         criterion crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype openpgp-asciiarmor prettyprinter
+         resourcet semigroups split text time time-locale-compat
+         transformers unliftio-core unordered-containers zlib
        ];
        homepage = "https://salsa.debian.org/clint/hOpenPGP";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
@@ -93587,6 +94832,8 @@ self: {
        pname = "haddock-api";
        version = "2.19.0.1";
        sha256 = "0c6i7sljp7myz25d90gyw68a90i5jcrkajkxcciikp2hjirfaas3";
+       revision = "1";
+       editedCabalFile = "0lfvhpiy8zr117wn9s9nc5va83rb0jz1h14ggm88565xr6qbwmjx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
@@ -94002,6 +95249,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hailgun_0_4_1_8" = 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.8";
+       sha256 = "1hyww94b0ndfypk47iffvfxm96m24ygrbm26a820arpcmxkp7k4x";
+       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 {
@@ -96324,16 +97591,16 @@ self: {
      }) {};
 
   "hasbolt-extras" = callPackage
-    ({ mkDerivation, base, containers, hasbolt, lens
+    ({ mkDerivation, base, containers, free, hasbolt, lens, mtl
      , neat-interpolation, template-haskell, text, th-lift-instances
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.7";
-       sha256 = "0bbyrbs1rm83sd5nsd65yxxfyz4day20hs3vz7rlkh2hjxhpvxjv";
+       version = "0.0.0.9";
+       sha256 = "08crjy05k2jryfl3cqz4xdmmrj546pyjd4474di67rya8bn3zjwl";
        libraryHaskellDepends = [
-         base containers hasbolt lens neat-interpolation template-haskell
-         text th-lift-instances
+         base containers free hasbolt lens mtl neat-interpolation
+         template-haskell text th-lift-instances
        ];
        homepage = "https://github.com/biocad/hasbolt-extras#readme";
        description = "Extras for hasbolt library";
@@ -97598,17 +98865,17 @@ self: {
 
   "haskell-igraph" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-lexing, c2hs, cereal
-     , cereal-conduit, colour, conduit, data-default-class, data-ordlist
-     , hashable, hxt, igraph, matrices, primitive, random, split, tasty
-     , tasty-golden, tasty-hunit, unordered-containers
+     , colour, conduit, data-ordlist, hashable, hxt, igraph, matrices
+     , primitive, random, singletons, split, tasty, tasty-golden
+     , tasty-hunit, unordered-containers
      }:
      mkDerivation {
        pname = "haskell-igraph";
-       version = "0.5.0";
-       sha256 = "1hil0zl4pnvkh0ingp0bgi0m7mhmvf1pqr7qskjxm6pa9kqybrw9";
+       version = "0.6.0";
+       sha256 = "15mq27zxgnnd0z0xcv8ncg7spw3hwmr7w65cr4y1wqixgxjzqsm0";
        libraryHaskellDepends = [
-         base bytestring bytestring-lexing cereal cereal-conduit colour
-         conduit data-default-class hashable hxt primitive split
+         base bytestring bytestring-lexing cereal colour conduit
+         data-ordlist hashable hxt primitive singletons split
          unordered-containers
        ];
        librarySystemDepends = [ igraph ];
@@ -99364,8 +100631,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskey";
-       version = "0.3.0.1";
-       sha256 = "1v5af0pd015d7ccdi0f2wc3gb60xy4j59kzngx6wh6dljkxrcga7";
+       version = "0.3.0.2";
+       sha256 = "1s24k6mwb1231j3ryd4iizday4l966vs9rcghr53k3jx2nl0h74h";
        libraryHaskellDepends = [
          base binary bytestring containers directory exceptions filepath
          focus haskey-btree list-t lz4 mtl semigroups stm stm-containers
@@ -99413,8 +100680,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskey-mtl";
-       version = "0.3.0.0";
-       sha256 = "0jc2wa41gmx01ccb7svv91llncm47adb2g6winm513k23bvk8028";
+       version = "0.3.0.1";
+       sha256 = "0n0wrk9sh62x87ms3fxnaj68jm91qdjd4265wk8x3lm66xw6vigw";
        libraryHaskellDepends = [
          base exceptions haskey haskey-btree mtl transformers
        ];
@@ -99899,20 +101166,22 @@ self: {
 
   "hasktags" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, HUnit, json
-     , utf8-string
+     , microlens-platform, utf8-string
      }:
      mkDerivation {
        pname = "hasktags";
-       version = "0.69.5";
-       sha256 = "0jln0r3dzd7g17avxqgnyxzv4nmqlmqaw41vrysb838yql6g6ns8";
+       version = "0.70.1";
+       sha256 = "01ngdfaiwlzwai34wmhi7wysk6raxb465v0imyn7j3ibk374af5v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring directory filepath json utf8-string
+         base bytestring directory filepath json microlens-platform
+         utf8-string
        ];
        executableHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [
-         base bytestring directory filepath HUnit json utf8-string
+         base bytestring directory filepath HUnit json microlens-platform
+         utf8-string
        ];
        homepage = "http://github.com/MarcWeber/hasktags";
        description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
@@ -100279,6 +101548,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasql-optparse-applicative_0_3_0_1" = callPackage
+    ({ mkDerivation, base-prelude, hasql, hasql-pool
+     , optparse-applicative
+     }:
+     mkDerivation {
+       pname = "hasql-optparse-applicative";
+       version = "0.3.0.1";
+       sha256 = "19a31qg4fj74qcjrf6ng11za7zbywg08hnls4pri816fwkjdjs9k";
+       libraryHaskellDepends = [
+         base-prelude hasql hasql-pool optparse-applicative
+       ];
+       homepage = "https://github.com/sannsyn/hasql-optparse-applicative";
+       description = "\"optparse-applicative\" parsers for \"hasql\"";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-pool" = callPackage
     ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
      mkDerivation {
@@ -100871,6 +102157,34 @@ self: {
        license = "unknown";
      }) {};
 
+  "haxl_2_0_0_0" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
+     , stm, test-framework, test-framework-hunit, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "haxl";
+       version = "2.0.0.0";
+       sha256 = "12ba1hylv181101s6lyjkf6kn8r42qkh60xd9xinzsm2mcfbbbmy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers deepseq exceptions filepath
+         ghc-prim hashable pretty stm text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring containers deepseq filepath hashable
+         HUnit test-framework test-framework-hunit text time
+         unordered-containers
+       ];
+       homepage = "https://github.com/facebook/Haxl";
+       description = "A Haskell library for efficient, concurrent, and concise data access";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haxl-amazonka" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, async, base, conduit
      , hashable, haxl, transformers
@@ -102166,6 +103480,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedgehog_0_6" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring
+     , concurrent-output, containers, directory, exceptions
+     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
+     , random, resourcet, semigroups, stm, template-haskell, text
+     , th-lift, time, transformers, transformers-base, unix
+     , wl-pprint-annotated
+     }:
+     mkDerivation {
+       pname = "hedgehog";
+       version = "0.6";
+       sha256 = "0c3y4gvl1i2r54ayha2kw5i2gdpd8nfzfzjly5vhxm13ylygwvxq";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring concurrent-output containers
+         directory exceptions lifted-async mmorph monad-control mtl
+         pretty-show primitive random resourcet semigroups stm
+         template-haskell text th-lift time transformers transformers-base
+         unix wl-pprint-annotated
+       ];
+       testHaskellDepends = [
+         base containers pretty-show semigroups text transformers
+       ];
+       homepage = "https://hedgehog.qa";
+       description = "Hedgehog will eat all your bugs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedgehog-checkers" = callPackage
     ({ mkDerivation, base, containers, either, hedgehog, semigroupoids
      , semigroups
@@ -102240,6 +103582,8 @@ self: {
        pname = "hedgehog-quickcheck";
        version = "0.1";
        sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1";
+       revision = "1";
+       editedCabalFile = "1l6gpzhi56mj4a4nqmqhndhly3pdffkpbxinypk5ra77nxqns6n5";
        libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
        homepage = "https://hedgehog.qa";
        description = "Use QuickCheck generators in Hedgehog and vice versa";
@@ -103089,19 +104433,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "herms_1_8_2_2" = callPackage
+  "herms_1_9_0_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, brick, directory, microlens
-     , microlens-th, optparse-applicative, semigroups, split, vty
+     , microlens-th, mtl, optparse-applicative, semigroups, split, vty
      }:
      mkDerivation {
        pname = "herms";
-       version = "1.8.2.2";
-       sha256 = "0x6h1l9kikjqzyyxa23y9df6bdw529cr07g74qc2qbdbg39713zq";
+       version = "1.9.0.0";
+       sha256 = "0k3fn5rq294qly8zzfbjdp3sc2zvxslkhyfhh8na9azrkgz2szia";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
-         ansi-terminal base brick directory microlens microlens-th
+         ansi-terminal base brick directory microlens microlens-th mtl
          optparse-applicative semigroups split vty
        ];
        homepage = "https://github.com/JackKiefer/herms";
@@ -103469,6 +104813,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hexmino" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, gloss
+     , optparse-applicative, random
+     }:
+     mkDerivation {
+       pname = "hexmino";
+       version = "0.1.0.0";
+       sha256 = "0s8sqpqirnnm9jp1lmifywy7ad6vxpj8k85nfyh4zjqybrs2m2p9";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers directory filepath gloss optparse-applicative
+         random
+       ];
+       homepage = "https://github.com/pasqu4le/hexmino";
+       description = "A small game based on domino-like hexagonal tiles";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hexml" = callPackage
     ({ mkDerivation, base, bytestring, extra }:
      mkDerivation {
@@ -103854,6 +105217,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hformat_0_3_2_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec
+     , text
+     }:
+     mkDerivation {
+       pname = "hformat";
+       version = "0.3.2.0";
+       sha256 = "1761gw0g7ar4ls4pzm8vq3k48nckd4lliq7f9s7br961215sjgx9";
+       libraryHaskellDepends = [
+         ansi-terminal base base-unicode-symbols text
+       ];
+       testHaskellDepends = [ base base-unicode-symbols hspec text ];
+       homepage = "http://github.com/mvoidex/hformat";
+       description = "Simple Haskell formatting";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hfov" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -104481,8 +105862,8 @@ self: {
      }:
      mkDerivation {
        pname = "hierarchy";
-       version = "1.0.1";
-       sha256 = "11xnqf5s0vda2wjgdazkgkmjp46jyl9zcaia5r01szfwjihj5ldg";
+       version = "1.0.2";
+       sha256 = "060kgg8gfp2155fibksi65xy5psbwabh4wymg7i6cqh3k3zhxy95";
        libraryHaskellDepends = [
          base exceptions free mmorph monad-control mtl transformers
          transformers-base transformers-compat
@@ -105814,6 +107195,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hkt" = callPackage
+    ({ mkDerivation, base, hspec, inspection-testing, protolude, text
+     }:
+     mkDerivation {
+       pname = "hkt";
+       version = "0.0.1";
+       sha256 = "14w3r5i0gqsh1c6xjrr4xz3ym94gp206sji9gkyy4ahdp2ymyvj6";
+       libraryHaskellDepends = [ base protolude ];
+       testHaskellDepends = [
+         base hspec inspection-testing protolude text
+       ];
+       homepage = "https://github.com/eliaslfox/hkt#readme";
+       description = "A library for higher kinded types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hlatex" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, containers, derive
      , directory, filepath, mtl, process, template-haskell, transformers
@@ -105999,8 +107396,8 @@ self: {
     ({ mkDerivation, base, hledger-lib, text, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.13";
-       sha256 = "0kngmnpn5qk76hbf1ynfz9zfzwvsslq7klih78k103zl76ggdvsv";
+       version = "0.2.0.14";
+       sha256 = "16njnl51kxmk2ika1ily5snl761559k0pbiql42pbn7zry93l1zn";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
@@ -106401,8 +107798,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlrdb-core";
-       version = "0.1.1.0";
-       sha256 = "0jxpzbwlcf8ix08sbxppcbvlvq2hhs8ya0mkk9b262zb2bfv3m4i";
+       version = "0.1.1.1";
+       sha256 = "1c74v3fq1cw6fq33rmmmm6hb595a8f6iyv934w8kww74g79qli7d";
        libraryHaskellDepends = [
          base bytestring hashable hedis lens mtl profunctors random time
          unordered-containers
@@ -107213,6 +108610,8 @@ self: {
        pname = "hnix";
        version = "0.5.1";
        sha256 = "1rhbx7ixzg4147j3pcqvfzn1k2b1xcn8428z98cq6ghnrmgss9al";
+       revision = "1";
+       editedCabalFile = "1l8h9zc9mrqvp8hvkfz1g2inq2b95x42gscyfn6qv0jcxwn4sbpr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107249,7 +108648,7 @@ self: {
          optparse-applicative serialise template-haskell text time
          transformers unordered-containers
        ];
-       homepage = "https://github.com/jwiegley/hnix#readme";
+       homepage = "https://github.com/haskell-nix/hnix#readme";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108270,8 +109669,8 @@ self: {
        pname = "hookup";
        version = "0.2";
        sha256 = "17sj62b78a22alq9hpsrjcri5yxz7yzxdar521yd6x7jv3xxpix2";
-       revision = "1";
-       editedCabalFile = "1g4zijk8f4rff0g2y0m0308zmnwsbx0a3swbx8i8gvfd6v1g4cf6";
+       revision = "2";
+       editedCabalFile = "06iw66x7hjjf5fl5d4glz8lnpagjkbdl3hf44vh6ycgflyh1p434";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL HsOpenSSL-x509-system network socks
        ];
@@ -108372,14 +109771,14 @@ self: {
      , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
      , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client
      , http-client-tls, http-types, ixset-typed, lens, monad-loops
-     , openpgp-asciiarmor, optparse-applicative, resourcet, text, time
-     , time-locale-compat, transformers, unordered-containers
-     , wl-pprint-extras, wl-pprint-terminfo, yaml
+     , openpgp-asciiarmor, optparse-applicative, prettyprinter
+     , prettyprinter-ansi-terminal, resourcet, text, time
+     , time-locale-compat, transformers, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "hopenpgp-tools";
-       version = "0.20.1";
-       sha256 = "1nidlipz0isj65vg6zhi79ln14i9kxvnn164s0haf086vm81kw32";
+       version = "0.21";
+       sha256 = "0ks84gnr3wgca7h0nh8igiigp2y2vv9vrjng49fyrak8k8fw2ln3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108387,14 +109786,14 @@ self: {
          binary-conduit bytestring conduit conduit-extra containers
          crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP
          http-client http-client-tls http-types ixset-typed lens monad-loops
-         openpgp-asciiarmor optparse-applicative resourcet text time
-         time-locale-compat transformers unordered-containers
-         wl-pprint-extras wl-pprint-terminfo yaml
+         openpgp-asciiarmor optparse-applicative prettyprinter
+         prettyprinter-ansi-terminal resourcet text time time-locale-compat
+         transformers unordered-containers yaml
        ];
        executableToolDepends = [ alex happy ];
        homepage = "https://salsa.debian.org/clint/hOpenPGP";
        description = "hOpenPGP-based command-line tools";
-       license = "unknown";
+       license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -110579,17 +111978,17 @@ self: {
   "hs2ats" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude
      , cpphs, criterion, deepseq, haskell-src-exts, hspec
-     , hspec-dirstream, language-ats, lens, system-filepath
+     , hspec-dirstream, language-ats, microlens, system-filepath
      }:
      mkDerivation {
        pname = "hs2ats";
-       version = "0.3.0.1";
-       sha256 = "1z8afx8bc9igd0iv6anw635zfj6vwqq10kp4j95p3fs58wyjg21v";
+       version = "0.3.0.2";
+       sha256 = "0yimapbxy0il6yv12r1xx03vjjgc8hl3iyyi21y41bqdzzl4f37p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base casing composition-prelude cpphs deepseq
-         haskell-src-exts language-ats lens
+         haskell-src-exts language-ats microlens
        ];
        testHaskellDepends = [
          base hspec hspec-dirstream system-filepath
@@ -112079,8 +113478,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslua";
-       version = "0.9.5.1";
-       sha256 = "1l3lkmzcal3106acw2bvky5dlblz4n331gnl1ly18j79flbzn7v8";
+       version = "0.9.5.2";
+       sha256 = "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f";
        configureFlags = [ "-fsystem-lua" ];
        libraryHaskellDepends = [
          base bytestring containers exceptions fail mtl text
@@ -112515,15 +113914,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_5_0" = callPackage
+  "hspec_2_5_1" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.5.0";
-       sha256 = "16vp3k8bdqvsdhv12srahda3anf1pia7blczh201snib52is9vdb";
+       version = "2.5.1";
+       sha256 = "1hip8937prrvkdp63jwicg80b9fpj1yb4rfwl68jd76x2j15hyyl";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -112626,7 +114025,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_5_0" = callPackage
+  "hspec-core_2_5_1" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -112634,8 +114033,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.5.0";
-       sha256 = "1p88sxarrpfzic4h37n9crpvmklisv514cm0v6fxmk1f2jvf3rgj";
+       version = "2.5.1";
+       sha256 = "0yfw5rxyh830sb4l0zmsvjyanlg4q20y9hd90d3np5qwhpz4b3p8";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -112692,13 +114091,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_5_0" = callPackage
+  "hspec-discover_2_5_1" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.5.0";
-       sha256 = "1r91g9hqdn815i86hsrv5bagv76rhq4n0avkmhkh670kkryc0iry";
+       version = "2.5.1";
+       sha256 = "0a3j58jxfv9i15shifhmm7i6i0xd9p4pd3grm4my5c80nhsps61w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -114609,8 +116008,8 @@ self: {
      }:
      mkDerivation {
        pname = "htoml-megaparsec";
-       version = "1.1.0.4";
-       sha256 = "03ffmff09k6aqpd9rv41bfi566pr6hk4vdjm0my2wfypbn2mrgb0";
+       version = "1.2.0.2";
+       sha256 = "0kqy3vfiira8bm0ipynwk2dny99llsw2gnvyh0rsdc0bphiwjh62";
        libraryHaskellDepends = [
          base composition-prelude containers deepseq megaparsec mtl text
          time unordered-containers vector
@@ -114807,6 +116206,8 @@ self: {
        pname = "http-client";
        version = "0.5.12.1";
        sha256 = "0gnnkcy2d2v1k44ip59s7l86jgigllsp3lsqsac08zr19lr1clab";
+       revision = "1";
+       editedCabalFile = "03x2ms2nl3jjm2sfk8dwy02v920czhmdlkyfy3kqc1sg4nw2134y";
        libraryHaskellDepends = [
          array base blaze-builder bytestring case-insensitive containers
          cookie deepseq exceptions filepath ghc-prim http-types memory
@@ -116105,12 +117506,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_1_2_0_0" = callPackage
+  "hunit-dejafu_1_2_0_1" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "1.2.0.0";
-       sha256 = "0djn982mlz4m58hxsghxxj34vsw78i57scxx9a1i3zk7qznmingv";
+       version = "1.2.0.1";
+       sha256 = "1shkfbn14qfk9bjnrmdn3zz88718jb1m942idg2vl53yfj16ahy9";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
@@ -116892,6 +118293,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-prim_0_6_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+     , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "hw-prim";
+       version = "0.6.0.0";
+       sha256 = "1x1ypc098zkgc0gcsyszfqgf2jw7b239d0qrwqzg5iwvzwlwapwk";
+       libraryHaskellDepends = [ base bytestring mmap vector ];
+       testHaskellDepends = [
+         base bytestring directory exceptions hedgehog hspec
+         hw-hspec-hedgehog mmap QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion mmap vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-prim#readme";
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim-bits" = callPackage
     ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
      , hw-hspec-hedgehog, QuickCheck, vector
@@ -116946,7 +118369,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-rankselect_0_12_0_1" = callPackage
+  "hw-rankselect_0_12_0_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
      , directory, hedgehog, hspec, hw-balancedparens, hw-bits
      , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens
@@ -116954,8 +118377,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.12.0.1";
-       sha256 = "0jg27cpdw341gr1mjnqm5rq66q84q1rzwa5bp8czzws71m5kpfpy";
+       version = "0.12.0.2";
+       sha256 = "02fr2p1sl7ynpc1280l1nakf24ifp4fkpjpy2lac8rk4iab48syk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117002,15 +118425,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-rankselect-base_0_3_0_0" = callPackage
+  "hw-rankselect-base_0_3_2_0" = callPackage
     ({ mkDerivation, base, bits-extra, criterion, hedgehog, hspec
      , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-prim
      , hw-string-parse, QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-rankselect-base";
-       version = "0.3.0.0";
-       sha256 = "19gclmljps2nplfqch26grzagvsraafr4540s6x19x2m58aa3m7g";
+       version = "0.3.2.0";
+       sha256 = "0kb5iqv56fg482w59nlwhfz7fi8vkdg840dsa4lb3bqgy5w0mn3s";
        libraryHaskellDepends = [
          base bits-extra hw-bits hw-int hw-prim hw-string-parse safe vector
        ];
@@ -120232,14 +121655,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "incremental-parser_0_3_1" = callPackage
+  "incremental-parser_0_3_1_1" = callPackage
     ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
      , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "incremental-parser";
-       version = "0.3.1";
-       sha256 = "1nygr5hs547innw9f5wx8ifpkiq01ckbhx34266ds6rmnjsqxzby";
+       version = "0.3.1.1";
+       sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz";
        libraryHaskellDepends = [ base monoid-subclasses ];
        testHaskellDepends = [
          base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
@@ -120450,14 +121873,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "indexed-list-literals_0_2_0_0" = callPackage
-    ({ mkDerivation, base, Only }:
+  "indexed-list-literals_0_2_1_1" = callPackage
+    ({ mkDerivation, base, hspec, Only }:
      mkDerivation {
        pname = "indexed-list-literals";
-       version = "0.2.0.0";
-       sha256 = "0n0j5x4v099000fm2ar0lmn06f21gnq39srmimy9bm3zisx8zmzd";
+       version = "0.2.1.1";
+       sha256 = "1b4g2196pi7v347gzl1x68qriwwfgr2iddjqfs49h5swh7qqqpfg";
        libraryHaskellDepends = [ base Only ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/davidm-d/indexed-list-literals";
        description = "Type safe indexed list literals";
        license = stdenv.lib.licenses.bsd3;
@@ -120633,8 +122056,8 @@ self: {
      }:
      mkDerivation {
        pname = "inflections";
-       version = "0.4.0.1";
-       sha256 = "1vc04afp5lvh5drs4pf6djmkn80513h4phkw5gs4g4d37h3d3jg2";
+       version = "0.4.0.3";
+       sha256 = "028dj9pgs5g6qb9x1hc8r4rn0rznr1ynn79vln48k2llyf2r38dx";
        libraryHaskellDepends = [
          base exceptions megaparsec text unordered-containers
        ];
@@ -120934,14 +122357,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "inline-c-cpp_0_2_2_0" = callPackage
+  "inline-c-cpp_0_2_2_1" = callPackage
     ({ mkDerivation, base, hspec, inline-c, safe-exceptions
      , template-haskell
      }:
      mkDerivation {
        pname = "inline-c-cpp";
-       version = "0.2.2.0";
-       sha256 = "1sglwjg8agzi3gspv97g999vb0zzsf5c41znqnnnvqx605jpsd5g";
+       version = "0.2.2.1";
+       sha256 = "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci";
        libraryHaskellDepends = [
          base inline-c safe-exceptions template-haskell
        ];
@@ -121323,8 +122746,8 @@ self: {
      }:
      mkDerivation {
        pname = "int-multimap";
-       version = "0.2.1";
-       sha256 = "080ypcd99pvw0wsrydz6hzd9hrr18v4kcb3wihz6v8ylfn08d6ci";
+       version = "0.3";
+       sha256 = "1hsd55hg52mb6vimk5813l0s72spvy9njrhzz6dc6jddh65v58lv";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -121404,6 +122827,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "integreat" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, cassava
+     , containers, fgl, foldl, hmatrix, lens, mtl, mwc-random
+     , optparse-generic, parallel, random-fu, rank-product, sequence
+     , statistics, stringsearch, text, text-show, vector
+     , vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "integreat";
+       version = "0.2.2.1";
+       sha256 = "1kyahjbvl6y53ymlnzmjgpi32wdnnq0pwamb7fbzcf3mh94l57lz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring cassava containers fgl foldl hmatrix
+         lens mtl mwc-random parallel random-fu rank-product sequence
+         statistics stringsearch text text-show vector vector-th-unbox
+       ];
+       executableHaskellDepends = [
+         base bytestring cassava containers lens mtl optparse-generic text
+         vector
+       ];
+       homepage = "http://github.com/GregorySchwartz/integreat#readme";
+       description = "Integrate different assays";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "intel-aes" = callPackage
     ({ mkDerivation, base, bytestring, cereal, crypto-api, DRBG
      , intel_aes, largeword, process, random, rdtsc, split, tagged, time
@@ -121493,8 +122943,8 @@ self: {
      }:
      mkDerivation {
        pname = "interlude-l";
-       version = "0.3.0.0";
-       sha256 = "0aa26cgap70ji6qjy555039i8zrynibmfsxpdpkww6pqj3hwrc93";
+       version = "0.4.0.0";
+       sha256 = "0dh3n0kx1i46k7v7y7i4i39raacjc6kf5yb8p410hlsk4wwijw1n";
        libraryHaskellDepends = [
          aeson base exceptions lens monad-control MonadRandom mtl protolude
          string-conv text transformers witherable
@@ -122284,7 +123734,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ip_1_2_0" = callPackage
+  "ip_1_2_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , doctest, hashable, hspec, HUnit, primitive, QuickCheck
      , quickcheck-classes, semigroups, test-framework
@@ -122292,10 +123742,8 @@ self: {
      }:
      mkDerivation {
        pname = "ip";
-       version = "1.2.0";
-       sha256 = "09d1y0x5cri08kx5c52jblnj1679z0yw0byigjvwics6pwkgrx0f";
-       revision = "1";
-       editedCabalFile = "09g6nhh6r52dnk6adnxv6qiin6fxif567dl1nca49z5njphcvyl3";
+       version = "1.2.1";
+       sha256 = "024cl4dx0580wch2z9m45siak2n9dpbj3853gc4p9r257zp5xalr";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive semigroups text
          vector
@@ -122393,13 +123841,16 @@ self: {
      }) {};
 
   "ipcvar" = callPackage
-    ({ mkDerivation, base, binary, bytestring, directory, hspec, unix
+    ({ mkDerivation, base, binary, bytestring, directory, hspec, text
+     , unix, uuid
      }:
      mkDerivation {
        pname = "ipcvar";
-       version = "0.0.1";
-       sha256 = "085p03xk29wk03yfshpjvzkf2z79byhp9yy81vra1aci9nkgjr3n";
-       libraryHaskellDepends = [ base binary bytestring directory unix ];
+       version = "0.1.1";
+       sha256 = "169gbfd6pgj6v87rvn8pmr1sx3aj58c4fvn1gdxdgzm70910hkmk";
+       libraryHaskellDepends = [
+         base binary bytestring directory text unix uuid
+       ];
        testHaskellDepends = [ base hspec unix ];
        description = "Simple inter-process communication through IPCVars";
        license = stdenv.lib.licenses.mit;
@@ -122458,6 +123909,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "iproute_1_7_5" = callPackage
+    ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
+     , network, QuickCheck, safe
+     }:
+     mkDerivation {
+       pname = "iproute";
+       version = "1.7.5";
+       sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd";
+       libraryHaskellDepends = [
+         appar base byteorder containers network
+       ];
+       testHaskellDepends = [
+         appar base byteorder containers doctest hspec network QuickCheck
+         safe
+       ];
+       homepage = "http://www.mew.org/~kazu/proj/iproute/";
+       description = "IP Routing Table";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "iptables-helpers" = callPackage
     ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe
      , syb, utf8-string
@@ -122562,8 +124034,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-client";
-       version = "1.1.0.2";
-       sha256 = "1y9camx7vwpgr2qvqnkzk7rz9k0wkxrb35wflar4g9k0q6xqp2mi";
+       version = "1.1.0.3";
+       sha256 = "1lw271lkl7ps0lxd2as95hi7hbkhmmy21i178h4hrp8v28lsmqxy";
        libraryHaskellDepends = [
          base bytestring conduit connection containers contravariant
          exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
@@ -124324,8 +125796,8 @@ self: {
      }:
      mkDerivation {
        pname = "jmacro";
-       version = "0.6.14";
-       sha256 = "084rvwav0j33nffiklsrgafg3kmsmd2wnrydw152l6cznwd43fdc";
+       version = "0.6.15";
+       sha256 = "1b3crf16szj11pcgrg3912xq072vnv0myq6mzg0ypaabdzn3zr7s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124361,6 +125833,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "jmacro-rpc_0_3_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
+     , containers, contravariant, jmacro, mtl, scientific, split, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "jmacro-rpc";
+       version = "0.3.3";
+       sha256 = "0gqyv8y4hjk2fwvzar173hvhgw860as0wijfhxqnxbkhd7f2r4gf";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-html bytestring containers
+         contravariant jmacro mtl scientific split text unordered-containers
+         vector
+       ];
+       homepage = "http://hub.darcs.net/gershomb/jmacro";
+       description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jmacro-rpc-happstack" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
      , happstack-server, jmacro, jmacro-rpc, mtl
@@ -125400,6 +126892,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-rpc-generic_0_2_1_4" = callPackage
+    ({ mkDerivation, aeson, aeson-generic-compat, base, containers
+     , dlist, QuickCheck, quickcheck-simple, scientific, text
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "json-rpc-generic";
+       version = "0.2.1.4";
+       sha256 = "0zibbxc5fqm9mazfdjbi6angyh5rlcccfd260k667w8lcxc6h7kl";
+       libraryHaskellDepends = [
+         aeson aeson-generic-compat base containers dlist scientific text
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base QuickCheck quickcheck-simple text
+       ];
+       homepage = "http://github.com/khibino/haskell-json-rpc-generic";
+       description = "Generic encoder and decode for JSON-RPC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "json-rpc-server" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, HUnit, mtl
      , test-framework, test-framework-hunit, text, unordered-containers
@@ -125435,8 +126949,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an";
-       revision = "13";
-       editedCabalFile = "07r9sdkhhp7wp7zyrw8mnr9dk1z83drm3jfcayv9gz28jnr3gpv1";
+       revision = "14";
+       editedCabalFile = "0pf2j8v62mfh6dk0v4a93l75by6i6jsfangbsabksdbzhh64hyrr";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -125550,8 +127064,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-tracer";
-       version = "0.0.2.0";
-       sha256 = "0fgyx2m0xnkwkqlvmbqmwjklfdif8gprz1bcwbcmmvyznsc6wngq";
+       version = "0.0.3.0";
+       sha256 = "164plgxsaz2nyjl59zip8zj6rxn6gzq91vfqp11fdmafxn3cjv61";
        libraryHaskellDepends = [
          aeson base containers ghc-prim hashable microlens microlens-ghc mtl
          template-haskell text transformers unordered-containers
@@ -125926,8 +127440,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.3.5";
-       sha256 = "1ibx0pr0ddnzx5jbgkjzidkmja65gan7ji7s42v2iwn05fm125ki";
+       version = "0.3.7";
+       sha256 = "1m9za59bgvgzjd7fn11l322aq8j0xb6zsn94ycm0j5z3dwxv0l46";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126450,15 +127964,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "kanji_3_3_0" = callPackage
+  "kanji_3_4_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
      , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
      , optparse-applicative, tasty, tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "kanji";
-       version = "3.3.0";
-       sha256 = "0wapqdrh18344j0dz3y3g08vcfharc43xlcgkk8ksj5r30zq1vff";
+       version = "3.4.0";
+       sha256 = "1wc17b5515vb19ah7wm1zwmpf7b3jgjzrhk21hk8ysr14pcxwifr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126651,8 +128165,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.5.4.0";
-       sha256 = "1144krzz4wvwhdh1b2673302xn7svz2b6kjfvq9728f1bzkkspad";
+       version = "0.5.5.0";
+       sha256 = "10s2bv79shvnpkz1zbcn220mxv05xxq5gny332vhrhflnlcsq9jr";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either hostname
          microlens microlens-th monad-control mtl old-locale resourcet
@@ -126822,21 +128336,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "katydid_0_3_0_1" = callPackage
+  "katydid_0_3_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , directory, either, extra, filepath, HUnit, hxt, ilist, json, mtl
      , parsec, primes, regex-tdfa, tasty, tasty-hunit, text
-     , transformers-either
+     , transformers
      }:
      mkDerivation {
        pname = "katydid";
-       version = "0.3.0.1";
-       sha256 = "08q8qmvxc47y8rxs8vam31xwjgwyjga4bdd65m1n4plpndi0zhyg";
+       version = "0.3.1.0";
+       sha256 = "0h7w54z9318m85qdd9whlmg3vnkv69gbl8nxc8iz35pw2cbw51r2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers deepseq either extra hxt ilist json mtl
-         parsec regex-tdfa text transformers-either
+         parsec regex-tdfa text transformers
        ];
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [
@@ -127037,6 +128551,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "keccak" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, HUnit
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "keccak";
+       version = "0.1.0";
+       sha256 = "1z3daxxpqj0pwv6ln7kils7aqqmcp8m438x9z3xay5szr8l1i8sz";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/aupiff/keccak#readme";
+       description = "haskell keccak functions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "keenser" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , fast-logger, hedis, hostname, lifted-base, monad-control
@@ -128037,6 +129570,8 @@ self: {
        pname = "kraken";
        version = "0.1.0";
        sha256 = "12l24z6alscbdicp11nfc8fwmlhk5mjdjyh6xdqyvlzphp5yfp1k";
+       revision = "1";
+       editedCabalFile = "0ycdikk0mwy1ys9v29ybiws4fr59arwkpibdx62p9vpdv9f0p9k6";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls mtl
        ];
@@ -129213,17 +130748,17 @@ self: {
   "language-ats" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base
      , composition-prelude, containers, cpphs, criterion, deepseq, happy
-     , hspec, hspec-dirstream, lens, recursion-schemes, system-filepath
-     , transformers
+     , hspec, hspec-dirstream, micro-recursion-schemes, microlens
+     , microlens-th, system-filepath, transformers
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.9";
-       sha256 = "0narp1zhvyannd627bafh6yhk8y5lfw6f5nqr9wi1qvbynmlmhmg";
+       version = "1.2.0.10";
+       sha256 = "1998i63gn8f5pn4jlkv30869679jab0vz0gvjzr4yqlyq4npsvpy";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
-         lens recursion-schemes transformers
+         micro-recursion-schemes microlens microlens-th transformers
        ];
        libraryToolDepends = [ alex cpphs happy ];
        testHaskellDepends = [
@@ -130718,8 +132253,8 @@ self: {
      }:
      mkDerivation {
        pname = "layered-state";
-       version = "1.1.2";
-       sha256 = "1z9xz9nvzlqvzrp4dva9skci70g70lzzf5d5d38ilxvfk7kh56h6";
+       version = "1.1.3";
+       sha256 = "01pi8bslw7pmd3cm7jxxs500i35ny2lbaqi0hnl2a7kzjjxfrs6s";
        libraryHaskellDepends = [
          base constraints data-default exceptions lens lens-utils
          monad-branch monoid mtl primitive profunctors prologue transformers
@@ -133075,21 +134610,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lifted-async_0_10_0_1" = callPackage
+  "lifted-async_0_10_0_2" = callPackage
     ({ mkDerivation, async, base, constraints, criterion, deepseq
-     , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
-     , tasty-th, transformers-base
+     , HUnit, lifted-base, monad-control, mtl, tasty
+     , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
      }:
      mkDerivation {
        pname = "lifted-async";
-       version = "0.10.0.1";
-       sha256 = "1cf44j2jr2svp8g03hzf3xfmjlh7xcd40ra1k7dv6vzyzwb5p4hd";
+       version = "0.10.0.2";
+       sha256 = "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf";
        libraryHaskellDepends = [
          async base constraints lifted-base monad-control transformers-base
        ];
        testHaskellDepends = [
-         async base HUnit lifted-base monad-control mtl tasty tasty-hunit
-         tasty-th
+         async base HUnit lifted-base monad-control mtl tasty
+         tasty-expected-failure tasty-hunit tasty-th
        ];
        benchmarkHaskellDepends = [ async base criterion deepseq ];
        homepage = "https://github.com/maoe/lifted-async";
@@ -133139,6 +134674,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lifted-stm" = callPackage
+    ({ mkDerivation, array, base, monad-finally, stm, transformers
+     , transformers-abort, transformers-base, transformers-compat
+     }:
+     mkDerivation {
+       pname = "lifted-stm";
+       version = "0.1";
+       sha256 = "1rjz8mkj17w9b7b10qx1ijj4x45abkgzp4khyl3gjmzb654zzym0";
+       libraryHaskellDepends = [
+         array base monad-finally stm transformers transformers-abort
+         transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/mvv/lifted-stm";
+       description = "STM operations lifted through monad transformer stacks";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lifted-threads" = callPackage
     ({ mkDerivation, base, monad-control, threads, transformers-base }:
      mkDerivation {
@@ -135048,8 +136600,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-hs-pretty";
-       version = "0.2.1.0";
-       sha256 = "1v8nz7c7wvvh29c48li10m12lj8y3yn5b8rs1b86y351s11vsag6";
+       version = "0.3.0.0";
+       sha256 = "1q67rsjnw8wsfvmz4a54nr7b9il59fdjbbra2wwnnyjldi29ykdq";
        libraryHaskellDepends = [
          array base bytestring llvm-hs-pure text wl-pprint-text
        ];
@@ -135698,8 +137250,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-effect";
-       version = "1.0.0";
-       sha256 = "0xj0g5g054ayycdajryischj2yy9rb75cm782sgsj67p04943c5y";
+       version = "1.0.1";
+       sha256 = "0679irh73lqd8jl3mzndijrdjq8z02lqbi4pbmj8qs6m4q9a6akn";
        libraryHaskellDepends = [
          base bytestring extensible-effects monad-control text
          transformers-base
@@ -135710,6 +137262,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "log-effect-syslog" = callPackage
+    ({ mkDerivation, base, bytestring, extensible-effects, hsyslog
+     , log-effect, monad-control, transformers-base
+     }:
+     mkDerivation {
+       pname = "log-effect-syslog";
+       version = "0.1.0";
+       sha256 = "0db4pgl0np1yyl9arq5cvdp3njdlw62dnbldggjc9p0q6dh3hspc";
+       libraryHaskellDepends = [
+         base bytestring extensible-effects hsyslog log-effect monad-control
+         transformers-base
+       ];
+       homepage = "https://github.com/greydot/log-effect-syslog";
+       description = "Syslog functions for log-effect";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "log-elasticsearch" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bloodhound, bytestring, deepseq, http-client, http-client-tls
@@ -135963,6 +137532,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logging-effect_1_3_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, criterion, exceptions
+     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
+     , prettyprinter, semigroups, stm, stm-delay, text, time
+     , transformers, transformers-base, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "logging-effect";
+       version = "1.3.0";
+       sha256 = "02acs3f4zx0xwivzfpw5i4mnig63m330n1a2ni0brck3kbj9qsrn";
+       libraryHaskellDepends = [
+         async base exceptions free monad-control mtl prettyprinter
+         semigroups stm stm-delay text time transformers transformers-base
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion fast-logger lifted-async monad-logger
+         text time wl-pprint-text
+       ];
+       homepage = "https://github.com/ocharles/logging-effect";
+       description = "A mtl-style monad transformer for general purpose & compositional logging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-effect-extra" = callPackage
     ({ mkDerivation, base, logging-effect, logging-effect-extra-file
      , logging-effect-extra-handler, wl-pprint-text
@@ -138973,8 +140566,8 @@ self: {
      }:
      mkDerivation {
        pname = "mapalgebra";
-       version = "0.1.0";
-       sha256 = "1d4cdwkrbvkh53h3vkzghikmbnba3x1j84r0wgsc90cnr2im5san";
+       version = "0.1.1";
+       sha256 = "1zcba17nj804lbhnlr02bcg8qfaxv3nq8ddiqxpq2qp4mv8n8g4f";
        libraryHaskellDepends = [
          base bytestring containers data-default deepseq hmatrix massiv
          massiv-io vector
@@ -141553,8 +143146,8 @@ self: {
      }:
      mkDerivation {
        pname = "micro-recursion-schemes";
-       version = "5.0.2.1";
-       sha256 = "1n1sza3a87vh74hx1da4mcfwarbjkz2cfvnkldnqwfnqvngq1gaq";
+       version = "5.0.2.2";
+       sha256 = "17jybjra4s1hapjz6i8bwlv8y6rm70g72vl7cd2y7xrq4vrd3p9v";
        libraryHaskellDepends = [ base template-haskell th-abstraction ];
        libraryToolDepends = [ cpphs ];
        testHaskellDepends = [ base HUnit template-haskell ];
@@ -142753,18 +144346,6 @@ self: {
      }) {};
 
   "mintty" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "mintty";
-       version = "0.1.1";
-       sha256 = "10wz5q85h366g22jijai5g6hpxa22zy2hr33bzidxs4r36gk8zy8";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/RyanGlScott/mintty";
-       description = "A reliable way to detect the presence of a MinTTY console on Windows";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mintty_0_1_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "mintty";
@@ -142774,7 +144355,6 @@ self: {
        homepage = "https://github.com/RyanGlScott/mintty";
        description = "A reliable way to detect the presence of a MinTTY console on Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mios" = callPackage
@@ -143151,6 +144731,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmark-ext_0_2_1_0" = callPackage
+    ({ mkDerivation, base, foldl, hspec, hspec-discover, lucid
+     , microlens, mmark, modern-uri, skylighting, text
+     }:
+     mkDerivation {
+       pname = "mmark-ext";
+       version = "0.2.1.0";
+       sha256 = "1k9zw9fbfhlp5irbykycpw5qkjyhlcb8qrnbmsrn133hh1m3j0hs";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base foldl lucid microlens mmark modern-uri skylighting text
+       ];
+       testHaskellDepends = [ base hspec lucid mmark text ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/mmark-md/mmark-ext";
+       description = "Commonly useful extensions for the MMark markdown processor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmorph" = callPackage
     ({ mkDerivation, base, mtl, transformers, transformers-compat }:
      mkDerivation {
@@ -144088,8 +145688,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-logger-prefix";
-       version = "0.1.9";
-       sha256 = "1xvw1nd9arn2v2x4a8r0nljfv0a4z9kqa5pbrhmskgr70l9py4jm";
+       version = "0.1.10";
+       sha256 = "0xfrl084b45nq7598239ax3v0qck56d75p4jcqlykn8k7822vb53";
        libraryHaskellDepends = [
          base exceptions monad-control monad-logger mtl resourcet text
          transformers transformers-base
@@ -145315,6 +146915,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoid-extras_0_5" = callPackage
+    ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups
+     }:
+     mkDerivation {
+       pname = "monoid-extras";
+       version = "0.5";
+       sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6";
+       libraryHaskellDepends = [ base groups semigroupoids semigroups ];
+       benchmarkHaskellDepends = [ base criterion semigroups ];
+       description = "Various extra monoid-related definitions and utilities";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoid-owns" = callPackage
     ({ mkDerivation, base, bytestring, containers }:
      mkDerivation {
@@ -145703,6 +147317,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "morte_1_6_19" = callPackage
+    ({ mkDerivation, alex, array, base, binary, code-page, containers
+     , criterion, deepseq, Earley, formatting, http-client
+     , http-client-tls, microlens, microlens-mtl, mtl
+     , optparse-applicative, pipes, QuickCheck, system-fileio
+     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "morte";
+       version = "1.6.19";
+       sha256 = "1mqkjdn3hr3ihjai9qpcfrbn318pkddnlkck96v8byfmil6d4dph";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base binary containers deepseq Earley formatting http-client
+         http-client-tls microlens microlens-mtl pipes system-fileio
+         system-filepath text transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         base code-page formatting optparse-applicative text
+       ];
+       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
@@ -146861,6 +148509,8 @@ self: {
        pname = "multiplate";
        version = "0.0.3";
        sha256 = "1gsfmw7dzsxycixqqrh5wr1g3izn7rm2a4a20nh8pp6fgn21c01c";
+       revision = "1";
+       editedCabalFile = "0cka6nwvbiddlv2j4f7jqq4cxz5mfw7vga5p020h0m9ws98gqbsx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://haskell.org/haskellwiki/Multiplate";
@@ -147702,8 +149352,8 @@ self: {
     ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
        pname = "mwc-probability";
-       version = "2.0.2";
-       sha256 = "1v2k0vpz33xmf58dhidwnjjvhkczfqizlcgwalf1vk19sw1ls3x5";
+       version = "2.0.3";
+       sha256 = "18gnr5bjmz2bl717dhvg6hwj6z06y5sw2nmsw7d3vl37qd9rp6by";
        libraryHaskellDepends = [ base mwc-random primitive transformers ];
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
@@ -148356,39 +150006,40 @@ self: {
      }) {};
 
   "nakadi-client" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
-     , classy-prelude, conduit, conduit-combinators, conduit-extra
-     , containers, exceptions, fast-logger, hashable, http-client
-     , http-client-tls, http-conduit, http-types, iso8601-time, lens
-     , lens-aeson, lifted-async, monad-control, monad-logger, mtl
-     , random, resourcet, retry, safe-exceptions, say, scientific, split
-     , stm, stm-chans, stm-conduit, tasty, tasty-hunit, template-haskell
-     , text, time, transformers, transformers-base, unliftio
-     , unliftio-core, unordered-containers, uuid, vector, wai, warp
+    ({ mkDerivation, aeson, aeson-casing, async, async-timer, base
+     , bytestring, classy-prelude, conduit, conduit-extra, containers
+     , exceptions, fast-logger, hashable, http-client, http-client-tls
+     , http-conduit, http-types, iso8601-time, lens, lens-aeson
+     , lifted-async, monad-control, monad-logger, mtl, random, resourcet
+     , retry, safe-exceptions, say, scientific, split, stm, stm-chans
+     , stm-conduit, tasty, tasty-hunit, template-haskell, text, time
+     , transformers, transformers-base, unliftio, unliftio-core
+     , unordered-containers, uuid, vector, wai, warp
      }:
      mkDerivation {
        pname = "nakadi-client";
-       version = "0.5.0.3";
-       sha256 = "0c0jrvvlk3mxwka6b1996gylgkhqqh023wc4vxg98qaaxpy851x4";
+       version = "0.5.1.0";
+       sha256 = "1g8jddskklbcirgb35b71lbgkm492rfhbx50kipi5wrnh0r4zh67";
        libraryHaskellDepends = [
-         aeson aeson-casing base bytestring conduit conduit-combinators
+         aeson aeson-casing async-timer base bytestring conduit
          conduit-extra containers exceptions hashable http-client
          http-client-tls http-conduit http-types iso8601-time lens
          monad-control monad-logger mtl resourcet retry safe-exceptions
-         scientific split template-haskell text time transformers
-         transformers-base unliftio-core unordered-containers uuid vector
+         scientific split stm template-haskell text time transformers
+         transformers-base unliftio unliftio-core unordered-containers uuid
+         vector
        ];
        testHaskellDepends = [
-         aeson aeson-casing async base bytestring classy-prelude conduit
-         conduit-combinators conduit-extra containers exceptions fast-logger
-         hashable http-client http-client-tls http-conduit http-types
-         iso8601-time lens lens-aeson lifted-async monad-control
-         monad-logger mtl random resourcet retry safe-exceptions say
-         scientific split stm stm-chans stm-conduit tasty tasty-hunit
-         template-haskell text time transformers transformers-base unliftio
-         unliftio-core unordered-containers uuid vector wai warp
+         aeson aeson-casing async async-timer base bytestring classy-prelude
+         conduit conduit-extra containers exceptions fast-logger hashable
+         http-client http-client-tls http-conduit http-types iso8601-time
+         lens lens-aeson lifted-async monad-control monad-logger mtl random
+         resourcet retry safe-exceptions say scientific split stm stm-chans
+         stm-conduit tasty tasty-hunit template-haskell text time
+         transformers transformers-base unliftio unliftio-core
+         unordered-containers uuid vector wai warp
        ];
-       homepage = "https://github.com/mtesseract/nakadi-haskell#readme";
+       homepage = "http://nakadi-client.haskell.silverratio.net";
        description = "Client library for the Nakadi Event Broker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148932,8 +150583,8 @@ self: {
        pname = "natural-transformation";
        version = "0.4";
        sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
-       revision = "4";
-       editedCabalFile = "1zppa1fcc7pl7ak0hs3w3pkx34398nrfiiwa3w689ib08kqkdpby";
+       revision = "5";
+       editedCabalFile = "1wlmkq9k9aym4wig9rn5w6sygq2fg9kd02d18pfzgxw70icqjlq3";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
@@ -150533,6 +152184,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-simple_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, network
+     , transformers
+     }:
+     mkDerivation {
+       pname = "network-simple";
+       version = "0.4.1";
+       sha256 = "07cvvgbp8cbwh1x7ii326d97hfmqwiyiqhkg8dqypzwzfwb3mgkj";
+       libraryHaskellDepends = [
+         base bytestring exceptions network transformers
+       ];
+       homepage = "https://github.com/k0001/network-simple";
+       description = "Simple network sockets usage patterns";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-simple-sockaddr" = callPackage
     ({ mkDerivation, base, bytestring, directory, exceptions, network
      , transformers
@@ -150551,16 +152219,17 @@ self: {
      }) {};
 
   "network-simple-tls" = callPackage
-    ({ mkDerivation, base, bytestring, certificate, cprng-aes
-     , exceptions, network, network-simple, tls, tls-extra, transformers
+    ({ mkDerivation, base, bytestring, data-default, exceptions
+     , network, network-simple, tls, transformers, x509, x509-store
+     , x509-system, x509-validation
      }:
      mkDerivation {
        pname = "network-simple-tls";
-       version = "0.2.1";
-       sha256 = "0hbpxbs357bxifksbqrlrdkwkkfaydxcf9wdla6kafaymhrxhc0k";
+       version = "0.3";
+       sha256 = "11s5r7vibba7pmmbnglx1w2v5wxykxrzwkrwy4hifxzpbb2gybdw";
        libraryHaskellDepends = [
-         base bytestring certificate cprng-aes exceptions network
-         network-simple tls tls-extra transformers
+         base bytestring data-default exceptions network network-simple tls
+         transformers x509 x509-store x509-system x509-validation
        ];
        homepage = "https://github.com/k0001/network-simple-tls";
        description = "Simple interface to TLS secured network sockets";
@@ -152154,6 +153823,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "normalize" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers, lens
+     , optparse-generic, statistics, text, vector
+     }:
+     mkDerivation {
+       pname = "normalize";
+       version = "0.3.0.1";
+       sha256 = "1wx7jfbc5s1zpksyq1vhb3460gll1fl6lkdbp3349rxifz0l27dq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cassava containers lens statistics text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring cassava containers optparse-generic text vector
+       ];
+       homepage = "http://github.com/GregorySchwartz/normalize#readme";
+       description = "Normalize data using a variety of methods";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "normalize-imports" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
@@ -152620,6 +154310,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "numbers_3000_2_0_2" = callPackage
+    ({ mkDerivation, base, QuickCheck, test-framework
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "numbers";
+       version = "3000.2.0.2";
+       sha256 = "0xssrf7lbyplkgnbfw1jqkib3w9wgn1d6n85pk86nx63j05y9kph";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/jwiegley/numbers#readme";
+       description = "Various number types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "numerals" = callPackage
     ({ mkDerivation, base, containers, criterion, fingertree, HUnit
      , integer-gmp, QuickCheck, test-framework, test-framework-hunit
@@ -152872,8 +154580,8 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-histogram";
-       version = "0.1.1.0";
-       sha256 = "18xnkwmf7bwnj2ldj20afg38ykpzdnpg773pgj9af9yzk40vpd28";
+       version = "0.1.2.0";
+       sha256 = "03zq5qg9m5yndllc1gs5f7848j37dysb94zkh6pc465ascskl7d9";
        libraryHaskellDepends = [
          base containers foldl numhask-prelude numhask-range tdigest
        ];
@@ -152921,14 +154629,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask-range_0_2_1_0" = callPackage
+  "numhask-range_0_2_2_0" = callPackage
     ({ mkDerivation, adjunctions, base, distributive, doctest
      , numhask-prelude, protolude, QuickCheck, semigroupoids, tasty
      }:
      mkDerivation {
        pname = "numhask-range";
-       version = "0.2.1.0";
-       sha256 = "1i6kpx0jdr0q2lp19m0aqfd73wsi1dm6qhl1w9x8wp4px12j4caz";
+       version = "0.2.2.0";
+       sha256 = "1wrh8s6nknw6jkbl91iym7cvy1g1qmccikfbr1qhc4gzylkf5m4v";
        libraryHaskellDepends = [
          adjunctions base distributive numhask-prelude protolude QuickCheck
          semigroupoids
@@ -153014,8 +154722,8 @@ self: {
      }:
      mkDerivation {
        pname = "nuxeo";
-       version = "0.2.0.1";
-       sha256 = "046vwj0p53pzrdmni08gqyzrr0mhz8qrf5zn09plgzjadq3yp2p2";
+       version = "0.2.0.3";
+       sha256 = "1assz03rv0vdbgl2ihcr7sbx7ifsv7m2mp6lg2jgy5h0ghnlwzcd";
        libraryHaskellDepends = [
          attoparsec base bytestring conduit conduit-extra text time
        ];
@@ -154296,6 +156004,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye_0_6_7000_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , case-insensitive, containers, contravariant, dotenv, hspec
+     , hspec-discover, multiset, postgresql-simple, pretty
+     , product-profunctors, profunctors, QuickCheck, scientific
+     , semigroups, text, time, time-locale-compat, transformers, uuid
+     , void
+     }:
+     mkDerivation {
+       pname = "opaleye";
+       version = "0.6.7000.0";
+       sha256 = "11wj57k7fswln9is47r09yj7h60hbqa6x0lnh6cg2bmg9ynnvmxk";
+       revision = "1";
+       editedCabalFile = "1g2asrmd4aaw61dcprs9mih1j065q9xipnrhkxablqwcpr8pzz21";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring case-insensitive
+         contravariant postgresql-simple pretty product-profunctors
+         profunctors scientific semigroups text time time-locale-compat
+         transformers uuid void
+       ];
+       testHaskellDepends = [
+         aeson base containers contravariant dotenv hspec hspec-discover
+         multiset postgresql-simple product-profunctors profunctors
+         QuickCheck semigroups text time transformers
+       ];
+       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
+       description = "An SQL-generating DSL targeting PostgreSQL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opaleye-classy" = callPackage
     ({ mkDerivation, base, bytestring, lens, mtl, opaleye
      , postgresql-simple, product-profunctors, transformers
@@ -156099,8 +157838,8 @@ self: {
        pname = "ottparse-pretty";
        version = "0.1.2.6";
        sha256 = "1q52zc214bjiksrrrr5pcr30yimjzgga4ciw943za169kw3xpas5";
-       revision = "1";
-       editedCabalFile = "0c6m005ddrdmh8yrnhar5ams2clcbgdmhfrnlvvyppgqprvb3z9z";
+       revision = "2";
+       editedCabalFile = "05fxdr12vwf486609f8ld6d3cgpr632402n404gi8hgxj5ijc6yx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -156763,7 +158502,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_2" = callPackage
+  "pandoc_2_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , Cabal, case-insensitive, cmark-gfm, containers, criterion
@@ -156778,8 +158517,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.2";
-       sha256 = "0sc51sw7g9jni9jamj7rcdn9fqf5476gzp7cahhkjj29xak88a8g";
+       version = "2.2.1";
+       sha256 = "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -160315,6 +162054,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "permutations" = callPackage
+    ({ mkDerivation, alg, base, base-unicode-symbols, Fin
+     , natural-induction, peano, smallcheck, tasty, tasty-smallcheck
+     , universe-base, util
+     }:
+     mkDerivation {
+       pname = "permutations";
+       version = "0.1.0.0";
+       sha256 = "0dx4xx4g35r2qq4al431l5s1664psf95pf0nf6y59c1i1km5qpq4";
+       libraryHaskellDepends = [
+         alg base base-unicode-symbols Fin natural-induction peano
+         universe-base util
+       ];
+       testHaskellDepends = [
+         alg base Fin natural-induction peano smallcheck tasty
+         tasty-smallcheck universe-base
+       ];
+       description = "Permutations of finite sets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "permute" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -161973,6 +163733,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pinboard_0_9_12_10" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec
+     , http-client, http-client-tls, http-types, monad-logger, mtl
+     , network, profunctors, QuickCheck, random, safe-exceptions
+     , semigroups, text, time, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "pinboard";
+       version = "0.9.12.10";
+       sha256 = "0jdhckdlpmgqrp8xy7m285w7kclg8dpl02szl6fd6iwzs8l8vjds";
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-client http-client-tls
+         http-types monad-logger mtl network profunctors random
+         safe-exceptions text time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec mtl QuickCheck
+         safe-exceptions semigroups text time transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/jonschoning/pinboard";
+       description = "Access to the Pinboard API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pinch" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
@@ -162605,6 +164392,8 @@ self: {
        pname = "pipes-files";
        version = "0.1.2";
        sha256 = "0ca53bgb15i6bjyp2dxnb1lbkzcbjdkrznnh2bwj0l4jk04pcxkw";
+       revision = "1";
+       editedCabalFile = "0bg0ji5w17kx8qnba0aisvyf6md5qf5846gy9kdh8k3vh410sc2r";
        libraryHaskellDepends = [
          attoparsec base bytestring directory exceptions filepath free
          hierarchy mmorph monad-control mtl pipes pipes-safe posix-paths
@@ -162857,6 +164646,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-network_0_6_5" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, network
+     , network-simple, pipes, pipes-safe, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-network";
+       version = "0.6.5";
+       sha256 = "15f7kn9vpzsm8s108cly80pi6yqpv6v04w032ng0wr9g78an393l";
+       libraryHaskellDepends = [
+         base bytestring exceptions network network-simple pipes pipes-safe
+         transformers
+       ];
+       homepage = "https://github.com/k0001/pipes-network";
+       description = "Use network sockets together with the pipes library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-network-tls" = callPackage
     ({ mkDerivation, base, bytestring, network, network-simple
      , network-simple-tls, pipes, pipes-network, pipes-safe, tls
@@ -162864,8 +164671,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-network-tls";
-       version = "0.2.1";
-       sha256 = "0k3w13s3vasd85mapa594xhi31mhdwqycxqnadidqy24q5s6zdhc";
+       version = "0.3";
+       sha256 = "1cmsnvgr3ffjxqn7bwj0ghqsxqd4hnhfdn4di6p8q6np2mmllsd2";
        libraryHaskellDepends = [
          base bytestring network network-simple network-simple-tls pipes
          pipes-network pipes-safe tls transformers
@@ -163102,8 +164909,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-transduce";
-       version = "0.4.3.2";
-       sha256 = "0q4xc2r0yzyj6gpg16z9scdxm0a3fjzsm1r6qihkr2zks9sac36x";
+       version = "0.4.4.0";
+       sha256 = "181zzyyzy7p13zgiprfacvzn8b00xw36bv3l4ishwbac8yxg15cl";
        libraryHaskellDepends = [
          base bifunctors bytestring conceit foldl free microlens pipes
          pipes-bytestring pipes-concurrency pipes-group pipes-parse
@@ -163275,22 +165082,24 @@ self: {
      }) {};
 
   "pivotal-tracker" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, base, either, servant
-     , servant-client, text, time, transformers
+    ({ mkDerivation, aeson, aeson-casing, base, either, hspec
+     , http-client, http-client-tls, mtl, servant, servant-client, text
+     , time, transformers
      }:
      mkDerivation {
        pname = "pivotal-tracker";
-       version = "0.1.0.1";
-       sha256 = "0ipzlzrzvwgzg1k3wkgy0bgf0k1kalf4swln24zfbjrp6lnnss79";
+       version = "0.2.0.0";
+       sha256 = "1sc95mbf3cxjy9kxaqr3xgrgvmr6wghh69i4qqkil2grghvw90am";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-casing base servant servant-client text time
-         transformers
+         aeson aeson-casing base http-client http-client-tls mtl servant
+         servant-client text time transformers
        ];
        executableHaskellDepends = [
          base either servant text transformers
        ];
+       testHaskellDepends = [ base hspec ];
        description = "A library and a CLI tool for accessing Pivotal Tracker API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163484,8 +165293,8 @@ self: {
      }:
      mkDerivation {
        pname = "planb-token-introspection";
-       version = "0.1.2.0";
-       sha256 = "09b54m2m90g8ci6sxsgayvfxd9gmkwp2xw16gk1afxnha39lzwlq";
+       version = "0.1.3.0";
+       sha256 = "1n7ck623ik3rss5vhby9wz8q5r1kfww678d3yiqkx7pg5fn4rwmk";
        libraryHaskellDepends = [
          aeson aeson-casing base bytestring containers http-client
          http-client-tls http-types mtl safe-exceptions text transformers
@@ -163789,18 +165598,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "plot-light_0_3_3_2" = callPackage
-    ({ mkDerivation, base, blaze-svg, colour, containers
-     , data-default-class, hspec, mtl, QuickCheck, scientific, text
-     , time
+  "plot-light_0_4_3" = callPackage
+    ({ mkDerivation, base, blaze-markup, blaze-svg, colour, containers
+     , exceptions, histogram-fill, hspec, mtl, QuickCheck, scientific
+     , text, time, vector
      }:
      mkDerivation {
        pname = "plot-light";
-       version = "0.3.3.2";
-       sha256 = "0im5rw52aim1zspisdar87gyn1ar4dkk52ipcq0s41pcycbwib12";
+       version = "0.4.3";
+       sha256 = "1fwz74a2fh7rgxv7i9kz6izxl1zrpa8bml2dxph7w7hdz1pi3g5b";
        libraryHaskellDepends = [
-         base blaze-svg colour containers data-default-class mtl scientific
-         text time
+         base blaze-markup blaze-svg colour containers exceptions
+         histogram-fill mtl scientific text time vector
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/ocramz/plot-light";
@@ -163815,8 +165624,8 @@ self: {
      }:
      mkDerivation {
        pname = "plot-light-examples";
-       version = "0.2.0.0";
-       sha256 = "0sw7hxp96s8sbaghs3lzl856q72y0gxn58px0wd4568fdbvgd6vl";
+       version = "0.3.0.0";
+       sha256 = "0jw4ysfkshvw8r2xfy76997rz5072b5bhm9rca8pcc77fqifhavv";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -165402,6 +167211,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-binary_0_12_1_1" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, bytestring-strict-builder, containers, conversion
+     , conversion-bytestring, conversion-text, criterion, json-ast
+     , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck
+     , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unordered-containers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.12.1.1";
+       sha256 = "181npyfnz9xbmwjfzcrmbwlzw2xchy2fsibiw6d3c01y45xv607v";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring
+         bytestring-strict-builder containers loch-th network-ip
+         placeholders scientific text time transformers unordered-containers
+         uuid vector
+       ];
+       testHaskellDepends = [
+         aeson conversion conversion-bytestring conversion-text json-ast
+         loch-th network-ip placeholders postgresql-libpq QuickCheck
+         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ criterion rerebase ];
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -168671,6 +170511,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pronounce" = callPackage
+    ({ mkDerivation, base, binary, containers, filepath, mtl, text }:
+     mkDerivation {
+       pname = "pronounce";
+       version = "1.1.0.2";
+       sha256 = "0nhns8pnp9n88w5514dgb9kwfkd1fqx042z4p8ai1yf5q1igygw5";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base binary containers filepath mtl text
+       ];
+       homepage = "https://github.com/buonuomo/Text.Pronounce";
+       description = "A library for interfacing with the CMU Pronouncing Dictionary";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "proof-combinators" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -168707,8 +170562,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "5.3.5";
-       sha256 = "0x6whnn53grfkjqybn91kfsr69w3r9mk9r39yzwx35skwkqj3vb9";
+       version = "5.4.0";
+       sha256 = "1ykzagmw2an1aglkglkpkqv65mxaqqfj7zia27f6npnihb6hwi5v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169257,6 +171112,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proxy" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "proxy";
+       version = "0.1.0.0";
+       sha256 = "1465mvkdq9cv202sj2hiwa8a2a07906dww2msan235fvkrnhj9jz";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/chessai/proxy.git";
+       description = "proxy helpers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "proxy-kindness" = callPackage
     ({ mkDerivation, base, tagged }:
      mkDerivation {
@@ -169497,14 +171364,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "publicsuffix_0_20180426" = callPackage
+  "publicsuffix_0_20180513" = callPackage
     ({ mkDerivation, base, criterion, filepath, hspec, random
      , template-haskell
      }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20180426";
-       sha256 = "0pfxsh2ds3dwm6mq6g85vhq8rdgc93bn84pq1b4lk3sf71sqs2ii";
+       version = "0.20180513";
+       sha256 = "0wq9hz1z924a5pk17zyaf9nyz5z5fyrlf806rypdxnpvi4q1j7xm";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion random ];
@@ -169901,8 +171768,8 @@ self: {
      }:
      mkDerivation {
        pname = "pure-zlib";
-       version = "0.6.2";
-       sha256 = "022ciqcsw39wi4r577q92s9awjwkc2da61ljqi8n5qsal83vhayh";
+       version = "0.6.3";
+       sha256 = "1bsbpzywbh33kp2l7p80g8pnh66fd76sii4900f80x1yjig03gb8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -170741,8 +172608,8 @@ self: {
      }:
      mkDerivation {
        pname = "qnap-decrypt";
-       version = "0.3.1";
-       sha256 = "1ns5wz427ilw7xn886sw7ip9d1nbfqbs1qcgjm9cvdi5v5v89pi6";
+       version = "0.3.2";
+       sha256 = "1qq1cpnn7bg3nb3ig86wcc6xvjyljckjd1bgivh1sfhxh8p0p4ys";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -171818,18 +173685,17 @@ self: {
 
   "quickspec" = callPackage
     ({ mkDerivation, base, constraints, containers, data-lens-light
-     , dlist, QuickCheck, random, reflection, template-haskell
-     , transformers, twee-lib, uglymemo
+     , dlist, QuickCheck, quickcheck-instances, random, spoon
+     , template-haskell, transformers, twee-lib, uglymemo
      }:
      mkDerivation {
        pname = "quickspec";
-       version = "2";
-       sha256 = "0hdyw114f5skc66v0n0mghcx1ax8gfgilm42h4wqkwzyj6rkiy6r";
-       revision = "1";
-       editedCabalFile = "1nic3b13khhnykpvynzw7xjsw7ldvc4jfxdbjfj6xxsyig7lk4qb";
+       version = "2.1";
+       sha256 = "0xzb442pjm26khdp46vjkzza1gyb01jzhghv3hxff2pwjs3jjsyy";
        libraryHaskellDepends = [
-         base constraints containers data-lens-light dlist QuickCheck random
-         reflection template-haskell transformers twee-lib uglymemo
+         base constraints containers data-lens-light dlist QuickCheck
+         quickcheck-instances random spoon template-haskell transformers
+         twee-lib uglymemo
        ];
        homepage = "https://github.com/nick8325/quickspec";
        description = "Equational laws for free!";
@@ -172537,8 +174403,8 @@ self: {
      }:
      mkDerivation {
        pname = "rakuten";
-       version = "0.1.1.1";
-       sha256 = "01p6f8vapygcw6viwq7kkg6b5fifqzbkski0763x9by49h5gpbsi";
+       version = "0.1.1.2";
+       sha256 = "153801dij5i5byf151xf39anz005i3w7xmmkk434xr6zxc8jm604";
        libraryHaskellDepends = [
          aeson base bytestring connection constraints data-default-class
          extensible http-api-data http-client http-client-tls http-types
@@ -172554,6 +174420,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rakuten_0_1_1_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, connection, constraints
+     , data-default-class, extensible, hspec, http-api-data, http-client
+     , http-client-tls, http-types, lens, req, servant-server, text
+     , warp
+     }:
+     mkDerivation {
+       pname = "rakuten";
+       version = "0.1.1.3";
+       sha256 = "1c578rmjrb8x26c9b0fraz2l6a7d01wky8arzwa1kigfgw9ihqxh";
+       libraryHaskellDepends = [
+         aeson base bytestring connection constraints data-default-class
+         extensible http-api-data http-client http-client-tls http-types
+         lens req text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring connection constraints data-default-class
+         extensible hspec http-api-data http-client http-client-tls
+         http-types lens req servant-server text warp
+       ];
+       homepage = "https://github.com/matsubara0507/rakuten#readme";
+       description = "The Rakuten API in Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ralist" = callPackage
     ({ mkDerivation, base, criterion, deepseq, hspec }:
      mkDerivation {
@@ -173026,6 +174918,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "range-set-list_0_1_2_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "range-set-list";
+       version = "0.1.2.1";
+       sha256 = "06f8z9rmk2phmds9wv95y2xvjhfx8dr9jbqlv4ybv8m21283x0kw";
+       libraryHaskellDepends = [ base containers deepseq hashable ];
+       testHaskellDepends = [
+         base containers deepseq hashable tasty tasty-quickcheck
+       ];
+       homepage = "https://github.com/phadej/range-set-list#readme";
+       description = "Memory efficient sets with ranges of elements";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "range-space" = callPackage
     ({ mkDerivation, base, QuickCheck, semigroups, test-framework
      , test-framework-quickcheck2, time, vector-space
@@ -174581,8 +176491,8 @@ self: {
     ({ mkDerivation, base, HTTP, network, network-uri, xhtml }:
      mkDerivation {
        pname = "recaptcha";
-       version = "0.1.0.3";
-       sha256 = "18rqsqzni11nr2cvs7ah9k87w493d92c0gmc0n6fhfq6gay9ia19";
+       version = "0.1.0.4";
+       sha256 = "03a3f34lcd387112pfa931wwna58av5yv4jvx4nl0zkryp1p4qd2";
        libraryHaskellDepends = [ base HTTP network network-uri xhtml ];
        homepage = "http://github.com/jgm/recaptcha/tree/master";
        description = "Functions for using the reCAPTCHA service in web applications";
@@ -174628,8 +176538,8 @@ self: {
     ({ mkDerivation, base, extra, filepath }:
      mkDerivation {
        pname = "record-dot-preprocessor";
-       version = "0.1";
-       sha256 = "1py5bkwxwwq1jjsa16rmjm92hxnil0clim5579h5mizzq47fczrd";
+       version = "0.1.1";
+       sha256 = "1lb60mggn6f350l3v54cavvwnyx5hrm6hlyrfhsjb5gq5qmids9m";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base extra filepath ];
@@ -174865,12 +176775,12 @@ self: {
     ({ mkDerivation, aeson, api-builder, base, bytestring, Cabal
      , data-default-class, free, hspec, http-client, http-client-tls
      , http-types, network, text, time, transformers
-     , unordered-containers, vector
+     , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "reddit";
-       version = "0.2.2.2";
-       sha256 = "0k94rsnrnanjc7bwqfjzlk8l005gc3141mm8iqq680d8pdcgf8m8";
+       version = "0.2.3.0";
+       sha256 = "1hm1ax5h3p0avk4v3w08gac8mfiav8k9vd1vbkn77xlhxamp8jfi";
        libraryHaskellDepends = [
          aeson api-builder base bytestring data-default-class free
          http-client http-client-tls http-types network text time
@@ -174878,9 +176788,9 @@ self: {
        ];
        testHaskellDepends = [
          aeson api-builder base bytestring Cabal data-default-class hspec
-         http-client http-client-tls text time transformers
+         http-client http-client-tls text time transformers yaml
        ];
-       homepage = "https://github.com/intolerable/reddit";
+       homepage = "https://github.com/intolerable/reddit#readme";
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178394,6 +180304,8 @@ self: {
        pname = "rethinkdb-client-driver";
        version = "0.0.25";
        sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g";
+       revision = "1";
+       editedCabalFile = "1hblwarlxjxq2lp52bjlqwdjsqlwm8ffqi2pj1n8zpidjv6m8330";
        libraryHaskellDepends = [
          aeson base binary bytestring containers hashable mtl network
          old-locale scientific stm template-haskell text time
@@ -181986,7 +183898,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
-  "sbv_7_7" = callPackage
+  "sbv_7_8" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, data-binary-ieee754, deepseq, directory, doctest
      , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
@@ -181995,8 +183907,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.7";
-       sha256 = "0yf68qyp29kxgpdx5xdyx64vkn0dvfrizn5hq2xgrik0v9vb1ja0";
+       version = "7.8";
+       sha256 = "12k47j4xv08dl61qfz2g3dla8rwsx6s7yy5mfnv21c5d2x2bxk6i";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -182609,30 +184521,6 @@ self: {
      }) {};
 
   "scientific" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , deepseq, hashable, integer-gmp, integer-logarithms, primitive
-     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text
-     }:
-     mkDerivation {
-       pname = "scientific";
-       version = "0.3.6.0";
-       sha256 = "1rdwqw2xi1c6305vbxa0sfyl18rjgir7flbdz2pbdvaj3nw44lr4";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq hashable integer-gmp
-         integer-logarithms primitive text
-       ];
-       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_6_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , deepseq, hashable, integer-gmp, integer-logarithms, primitive
      , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
@@ -182654,7 +184542,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
@@ -183357,6 +185244,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sdl2-fps" = callPackage
+    ({ mkDerivation, base, sdl2 }:
+     mkDerivation {
+       pname = "sdl2-fps";
+       version = "0.0.1";
+       sha256 = "0ci8p6qgs9nmpbypvk75ybz5kh36iiqaz4xl4lr2dbaq0y2d6iri";
+       libraryHaskellDepends = [ base sdl2 ];
+       homepage = "https://github.com/jxv/sdl2-fps#readme";
+       description = "Run of the mill, frames per second timer implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sdl2-gfx" = callPackage
     ({ mkDerivation, base, bytestring, lifted-base, linear
      , monad-control, SDL2, sdl2, SDL2_gfx, template-haskell, text
@@ -183419,6 +185318,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2_mixer;};
 
+  "sdl2-sprite" = callPackage
+    ({ mkDerivation, base, optparse-simple, sdl2, sdl2-image, split
+     , text
+     }:
+     mkDerivation {
+       pname = "sdl2-sprite";
+       version = "0.0.1";
+       sha256 = "12xlq32sjvz064fll14ymbxbk52akcp24dm5vfa1x0s41z0x6fnq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base sdl2 sdl2-image ];
+       executableHaskellDepends = [
+         base optparse-simple sdl2 sdl2-image split text
+       ];
+       homepage = "https://github.com/chrisdone/sdl2-sprite#readme";
+       description = "Sprite previewer/animator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sdl2-ttf" = callPackage
     ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
      , template-haskell, text, transformers
@@ -183983,6 +185901,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "self-extract" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, extra, file-embed
+     , path, path-io, process, unix-compat
+     }:
+     mkDerivation {
+       pname = "self-extract";
+       version = "0.2.0.0";
+       sha256 = "1p1z4zy7s7j4sxx45lcspxvxf10v6vx80vgrw52acgbqnfairg7c";
+       libraryHaskellDepends = [
+         base binary bytestring Cabal extra file-embed path path-io process
+         unix-compat
+       ];
+       description = "A Haskell library to make self-extracting executables";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "selfrestart" = callPackage
     ({ mkDerivation, base, directory, executable-path, unix }:
      mkDerivation {
@@ -184961,8 +186895,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-aeson-specs";
-       version = "0.6.1.0";
-       sha256 = "0246bdrcy0rq0jyba2c945hlz8csaff9zakv0g5qpzylsc5dnwmd";
+       version = "0.6.2.0";
+       sha256 = "0q8xihvhzjycvwm8da69zg20fa6jynid0milgdbbsnicwh59cn86";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath hspec
          hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random
@@ -185791,8 +187725,8 @@ self: {
        pname = "servant-iCalendar";
        version = "0.1.0.1";
        sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas";
-       revision = "1";
-       editedCabalFile = "07jib9s2kg6srr1dj3l1bz0sp3fyikkvv7z0v2a62zl1c9z9xapx";
+       revision = "2";
+       editedCabalFile = "0c4d69rm08hpzlagl22qnnq9y85bp3zwix5h2hazr1m4na09hj1l";
        libraryHaskellDepends = [
          base data-default http-media iCalendar servant
        ];
@@ -185855,8 +187789,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-kotlin";
-       version = "0.1.1.0";
-       sha256 = "14z1vf4mj041ydps7nyfs0bmdpq0vb18xfscsq3i1f5hfr9swj50";
+       version = "0.1.1.1";
+       sha256 = "1spd6phk4n5llgbmydbdqyhlyx6bxr5rhx0rp2z4pnn1kn2qa3ry";
        libraryHaskellDepends = [
          base containers directory formatting lens servant servant-foreign
          text time wl-pprint-text
@@ -186180,27 +188114,27 @@ self: {
      }) {};
 
   "servant-quickcheck" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring
-     , case-insensitive, clock, data-default-class, hspec, hspec-core
-     , hspec-discover, http-client, http-media, http-types, mtl, pretty
-     , process, QuickCheck, quickcheck-io, servant, servant-blaze
-     , servant-client, servant-server, split, string-conversions
-     , temporary, text, time, transformers, warp
+    ({ mkDerivation, aeson, base, base-compat-batteries, blaze-html
+     , bytestring, case-insensitive, clock, data-default-class, hspec
+     , hspec-core, hspec-discover, http-client, http-media, http-types
+     , mtl, pretty, process, QuickCheck, quickcheck-io, servant
+     , servant-blaze, servant-client, servant-server, split
+     , string-conversions, temporary, text, time, transformers, warp
      }:
      mkDerivation {
        pname = "servant-quickcheck";
-       version = "0.0.7.0";
-       sha256 = "1a0ipg1zds393ywjb1f5yphb23ccb39gv8rc6qv5b7y523cgwri2";
+       version = "0.0.7.2";
+       sha256 = "0zsf68c44yijmgkcd2qmcwz9p0kiix6dzhk3g4ifz60s6kv3jfbh";
        libraryHaskellDepends = [
-         aeson base base-compat bytestring case-insensitive clock
+         aeson base base-compat-batteries bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
          pretty process QuickCheck servant servant-client servant-server
          split string-conversions temporary text time warp
        ];
        testHaskellDepends = [
-         aeson base base-compat blaze-html bytestring hspec hspec-core
-         http-client QuickCheck quickcheck-io servant servant-blaze
-         servant-client servant-server text transformers warp
+         aeson base base-compat-batteries blaze-html bytestring hspec
+         hspec-core http-client QuickCheck quickcheck-io servant
+         servant-blaze servant-client servant-server text transformers warp
        ];
        testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
@@ -186546,6 +188480,8 @@ self: {
        pname = "servant-swagger-ui-core";
        version = "0.3";
        sha256 = "1ji54q9x787dr5l81qn0shw2n3b8k9aglli03gxfbvs0l7ga5xrd";
+       revision = "1";
+       editedCabalFile = "1dh2ra39x2syzg4lw1cklr7hgr52gp72f4iy5zw4zwgy27hbq48v";
        libraryHaskellDepends = [
          base blaze-markup bytestring http-media servant servant-blaze
          servant-server swagger2 text transformers transformers-compat
@@ -186669,8 +188605,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9";
-       revision = "18";
-       editedCabalFile = "038paj9z77rx6jc06vg5f4f9gvwaq73ggw7ppgrw6vwhsl4nd84q";
+       revision = "19";
+       editedCabalFile = "1hlfly2j0c3c4sbzbkbzvwgvfnngkmx0r67ddv4ccg2if6pc5nqv";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -187702,15 +189638,16 @@ self: {
 
   "shake-ats" = callPackage
     ({ mkDerivation, base, binary, dependency, directory, hashable
-     , hs2ats, language-ats, lens, shake, shake-ext, text
+     , hs2ats, language-ats, microlens, microlens-th, shake, shake-ext
+     , text
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.8.0.4";
-       sha256 = "036clj4q6rwgzjc3abirir5yqrn78vnj7c5w8p9b82jkrlka8w6g";
+       version = "1.8.0.5";
+       sha256 = "0hznrllvlw3ypd3ljlx6wlr3d7hkm8g2mrwpfscgvf4hk0lyj1hd";
        libraryHaskellDepends = [
-         base binary dependency directory hashable hs2ats language-ats lens
-         shake shake-ext text
+         base binary dependency directory hashable hs2ats language-ats
+         microlens microlens-th shake shake-ext text
        ];
        homepage = "https://github.com/vmchale/shake-ats#readme";
        description = "Utilities for building ATS projects with shake";
@@ -188074,6 +190011,78 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "shapes" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , either, ghc-prim, hspec, lens, linear, mtl, QuickCheck
+     , shapes-math, transformers, vector, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "shapes";
+       version = "0.1.0.0";
+       sha256 = "0kfhw97y5a0vs75w0as6jwm0zxlkwkxar2a0afqrxlcplgwxvnpi";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers deepseq either ghc-prim lens linear mtl
+         shapes-math transformers vector vector-th-unbox
+       ];
+       executableHaskellDepends = [
+         array base containers criterion deepseq either ghc-prim lens linear
+         mtl shapes-math transformers vector vector-th-unbox
+       ];
+       testHaskellDepends = [
+         array base containers deepseq either ghc-prim hspec lens linear mtl
+         QuickCheck shapes-math transformers vector vector-th-unbox
+       ];
+       homepage = "https://github.com/ublubu/shapes#readme";
+       description = "physics engine and other tools for 2D shapes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "shapes-demo" = callPackage
+    ({ mkDerivation, array, base, containers, either, ghc-prim, lens
+     , linear, monad-extras, mtl, sdl2, shapes, StateVar, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "shapes-demo";
+       version = "0.1.0.0";
+       sha256 = "0ks0wnp2g1fdqwka03rw71dkpxvb89fvilx2avrxsh2cg1g1lari";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base containers either ghc-prim lens linear monad-extras mtl
+         sdl2 shapes StateVar text transformers vector
+       ];
+       homepage = "https://github.com/ublubu/shapes#readme";
+       description = "demos for the 'shapes' package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "shapes-math" = callPackage
+    ({ mkDerivation, base, criterion, ghc-prim, hspec, linear
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "shapes-math";
+       version = "0.1.0.0";
+       sha256 = "13i5njr93kcwgra8wcj0hvj50ksqrcs2d4y7xb2hhj06c7r3w0xz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base ghc-prim QuickCheck template-haskell
+       ];
+       executableHaskellDepends = [
+         base criterion ghc-prim linear QuickCheck template-haskell
+       ];
+       testHaskellDepends = [
+         base ghc-prim hspec linear QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/ublubu/shapes#readme";
+       description = "faster vector/matrix math using unboxed numbers and Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sharc-timbre" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -188394,6 +190403,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shelly_1_8_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
+     , HUnit, lifted-async, lifted-base, monad-control, mtl, process
+     , system-fileio, system-filepath, text, time, transformers
+     , transformers-base, unix-compat
+     }:
+     mkDerivation {
+       pname = "shelly";
+       version = "1.8.0";
+       sha256 = "1y08pdw49yk4hbipgfwjab0wa85ng0mkypch5l0p53frykjm2zvk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions lifted-async lifted-base monad-control mtl process
+         system-fileio system-filepath text time transformers
+         transformers-base unix-compat
+       ];
+       testHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions filepath hspec hspec-contrib HUnit lifted-async
+         lifted-base monad-control mtl process system-fileio system-filepath
+         text time transformers transformers-base unix-compat
+       ];
+       homepage = "https://github.com/yesodweb/Shelly.hs";
+       description = "shell-like (systems) programming in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shelly-extra" = callPackage
     ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
      , shelly, text
@@ -189409,6 +191449,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-log_0_9_4" = callPackage
+    ({ mkDerivation, async, base, base-unicode-symbols, containers
+     , data-default, deepseq, directory, exceptions, filepath, hformat
+     , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore
+     , text, time, transformers
+     }:
+     mkDerivation {
+       pname = "simple-log";
+       version = "0.9.4";
+       sha256 = "0chp90h9112sxa7ds0ldzdp59i6b1vy7chkqcb6d5mb9faq6vjqi";
+       libraryHaskellDepends = [
+         async base base-unicode-symbols containers data-default deepseq
+         directory exceptions filepath hformat microlens microlens-platform
+         mmorph mtl SafeSemaphore text time transformers
+       ];
+       testHaskellDepends = [ base hspec microlens-platform text ];
+       homepage = "http://github.com/mvoidex/simple-log";
+       description = "Simple log for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-log-syslog" = callPackage
     ({ mkDerivation, base, hsyslog, simple-log, text }:
      mkDerivation {
@@ -189819,8 +191881,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-vec3";
-       version = "0.4.0.2";
-       sha256 = "0zqy3ffndyvz97wfs0ha0d5j6045gfdh0p6rmz6dv87j9mqmfpl0";
+       version = "0.4.0.6";
+       sha256 = "1ijwh5xsqiaykm8y39jz4vnzvcbdq2za77ahkb6l7nqfc5ryv5z1";
        libraryHaskellDepends = [ base QuickCheck vector ];
        testHaskellDepends = [
          base doctest doctest-driver-gen tasty tasty-quickcheck
@@ -190368,10 +192430,8 @@ self: {
      }:
      mkDerivation {
        pname = "size-based";
-       version = "0.1.0.0";
-       sha256 = "1h791s39nr057w5f2fr4v7p1czw9jm0dk5qrhr26qyw97j4ysngx";
-       revision = "2";
-       editedCabalFile = "1p4iglrrl5s47cxn520saiszw5wwr4x1kn9xbgn7awz29mv7pmd2";
+       version = "0.1.1.0";
+       sha256 = "1z6w3qdx34c6y4gbs0b9zshn5al55lxzc7mfyywm91vcwi361xki";
        libraryHaskellDepends = [
          base dictionary-sharing template-haskell testing-type-modifiers
        ];
@@ -190406,8 +192466,8 @@ self: {
      }:
      mkDerivation {
        pname = "sized-grid";
-       version = "0.1.0.0";
-       sha256 = "1dj5sgmr8114i5ldpdmybwbwg5gkbm30kbk2196pq65jjcvjinxx";
+       version = "0.1.1.0";
+       sha256 = "0qbn160pq5yz1916iir1s9hy1h4pkar8z50gh7i8v7j4nwhgiisk";
        libraryHaskellDepends = [
          adjunctions aeson base comonad constraints distributive
          generics-sop lens mtl random vector vector-space
@@ -190889,8 +192949,8 @@ self: {
      }:
      mkDerivation {
        pname = "slate";
-       version = "0.10.0.0";
-       sha256 = "0f21bmv0dckdim27mm5m7vphci45h6fjbxyzpahai2nlydilhnc6";
+       version = "0.11.0.0";
+       sha256 = "0y6l3cjlh0hkc3nch7fwvxpv2i5r9qv6r1kdi3savi0vp0dvgdy8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -191140,6 +193200,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smallcheck_1_1_4" = callPackage
+    ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
+     mkDerivation {
+       pname = "smallcheck";
+       version = "1.1.4";
+       sha256 = "0x2p9rfsx0hvcmsq7v1m5qdgs9mvf4zrcpz4wywn4q8mr8hb416y";
+       libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
+       homepage = "https://github.com/feuerbach/smallcheck";
+       description = "A property-based testing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smallcheck-laws" = callPackage
     ({ mkDerivation, base, smallcheck, smallcheck-series }:
      mkDerivation {
@@ -194102,8 +196175,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparrow";
-       version = "0.0.1.6";
-       sha256 = "10kj0ir2i72q20jbp39n5v700pivbapkyvarql9hg5sci9s73g4s";
+       version = "0.0.2.0";
+       sha256 = "061bjgrvvvv2n6bhn0lz6sd5c7mc63nb2b83rbpgdx3am68mk9gf";
        libraryHaskellDepends = [
          aeson aeson-attoparsec async attoparsec attoparsec-uri base
          bytestring deepseq exceptions extractable-singleton hashable
@@ -194822,6 +196895,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "splitmix_0_0_1" = callPackage
+    ({ mkDerivation, async, base, base-compat-batteries, bytestring
+     , containers, criterion, deepseq, process, random, tf-random, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "splitmix";
+       version = "0.0.1";
+       sha256 = "0bvpx3hnyhz449s2c2mi5h78024yysnqldfwp7m0qr21m41q0v1a";
+       libraryHaskellDepends = [ base deepseq random time ];
+       testHaskellDepends = [
+         async base base-compat-batteries bytestring deepseq process random
+         tf-random vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion random tf-random
+       ];
+       description = "Fast Splittable PRNG";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "splitter" = callPackage
     ({ mkDerivation, base, directory, filepath, parsec, range }:
      mkDerivation {
@@ -195871,8 +197966,8 @@ self: {
        pname = "stack";
        version = "1.7.1";
        sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r";
-       revision = "1";
-       editedCabalFile = "12ym80mwlvg3zwbjhmby4k467hxa0yip0314w658ivn0sq6vgycw";
+       revision = "3";
+       editedCabalFile = "0ni953da0qiscnvbx70pd89myy2qq3chgkghmw6wg9xhzcz7nwgp";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -197135,14 +199230,14 @@ self: {
      }) {};
 
   "status-notifier-item" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dbus, filepath
-     , hslogger, lens, mtl, network, optparse-applicative, spool
-     , template-haskell, transformers, vector
+    ({ mkDerivation, base, bytestring, containers, dbus, dbus-hslogger
+     , filepath, hslogger, lens, mtl, network, optparse-applicative
+     , spool, template-haskell, transformers, vector
      }:
      mkDerivation {
        pname = "status-notifier-item";
-       version = "0.2.1.0";
-       sha256 = "1w81n87x70bqpskcp0nai9l8ry6hk518myn1cymi695x94vv9m6d";
+       version = "0.2.2.0";
+       sha256 = "19v7n1hv9ldrcv8h5wcv7lvshwzry0zm9qhvzspb5zvdawgy32zh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -197150,7 +199245,7 @@ self: {
          spool template-haskell transformers vector
        ];
        executableHaskellDepends = [
-         base dbus hslogger optparse-applicative
+         base dbus dbus-hslogger hslogger optparse-applicative
        ];
        homepage = "https://github.com/IvanMalison/status-notifier-item#readme";
        description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification";
@@ -198095,15 +200190,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_21_0" = callPackage
+  "stratosphere_0_22_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.21.0";
-       sha256 = "14bahvq1yz51dwa6ljyj4l3aw3sv2njin00k01bvbizsqnbl8j8k";
+       version = "0.22.3";
+       sha256 = "1s6zc9d1kmgqicjk2d0mqqysg3jcva0d2fcygb2zxpdbiifrfz26";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -198333,6 +200428,8 @@ self: {
        pname = "streaming-attoparsec";
        version = "1.0.0";
        sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z";
+       revision = "1";
+       editedCabalFile = "0ssikp3ckvlgh9px4v6ppjlyi7ch319j0l3s9a5z07j6fg3j4wkp";
        libraryHaskellDepends = [
          attoparsec base bytestring streaming streaming-bytestring
        ];
@@ -198549,10 +200646,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-eversion";
-       version = "0.3.1.1";
-       sha256 = "13fsl7mckinymkvysmzcnc4vpyapdiwb2k57yhq15x5y6b6scxs2";
-       revision = "1";
-       editedCabalFile = "0abjya3b9fgnk9njyrf4hpar0ldji43m1d3mdh2ax5v54k81ishs";
+       version = "0.4.0.0";
+       sha256 = "19zaf8z13sdp0ri9y3p7izd29lik2x279kgj9v4sfzsslwr2wllc";
        libraryHaskellDepends = [
          base foldl pipes streaming transformers
        ];
@@ -198768,6 +200863,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streamly_0_2_0" = callPackage
+    ({ mkDerivation, atomic-primops, base, containers, deepseq
+     , exceptions, gauge, hspec, lifted-base, lockfree-queue
+     , monad-control, mtl, QuickCheck, random, stm, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "streamly";
+       version = "0.2.0";
+       sha256 = "1vbzyvmdzhjxpjd4pq4lkn6y0s2yxiziypp4vf9pvwmy1bq5dk0f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         atomic-primops base containers exceptions lifted-base
+         lockfree-queue monad-control mtl stm transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec mtl QuickCheck random transformers
+       ];
+       benchmarkHaskellDepends = [ base deepseq gauge random ];
+       homepage = "https://github.com/composewell/streamly";
+       description = "Beautiful Streaming, Concurrent and Reactive Composition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streamproc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -199919,6 +202040,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "subsample" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers
+     , optparse-generic, random-fu, text, vector
+     }:
+     mkDerivation {
+       pname = "subsample";
+       version = "0.1.0.0";
+       sha256 = "1ahl7vjsg0by3q9zfkfqslvpq3p9v5754iippi2f5z8rax1s7di0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers random-fu text vector ];
+       executableHaskellDepends = [
+         base bytestring cassava containers optparse-generic text vector
+       ];
+       homepage = "http://github.com/GregorySchwartz/subsample#readme";
+       description = "Subsample data";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "substring-parser" = callPackage
     ({ mkDerivation, attoparsec, base, dlist, hspec, NoTrace
      , QuickCheck, text
@@ -200560,14 +202700,12 @@ self: {
      }:
      mkDerivation {
        pname = "svg-builder";
-       version = "0.1.0.2";
-       sha256 = "0m7fpxh2viafcfm04xzy64jakx5c0p5wcam3bdwxgmj3r3q0qjc1";
-       revision = "1";
-       editedCabalFile = "1h3bzkimiydj5j2rh7cyp5bhphvy6hglpkidhlfwy520sqsw3zvx";
+       version = "0.1.1";
+       sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g";
        libraryHaskellDepends = [
          base blaze-builder bytestring hashable text unordered-containers
        ];
-       homepage = "http://github.com/jeffreyrosenbluth/svg-builder.git";
+       homepage = "https://github.com/diagrams/svg-builder.git";
        description = "DSL for building SVG";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200748,8 +202886,8 @@ self: {
      }:
      mkDerivation {
        pname = "swagger-petstore";
-       version = "0.0.1.8";
-       sha256 = "1rslv21lg7jfc6vb8yyb6kkg3cma2300h4hld3m8zwfxgzcq79h7";
+       version = "0.0.2.0";
+       sha256 = "10sd2agpmj4iiza850w6klqh5jv873kfmvp5qimsqcfaxdwszc5i";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          deepseq exceptions http-api-data http-client http-client-tls
@@ -200761,8 +202899,8 @@ self: {
          aeson base bytestring containers hspec iso8601-time mtl QuickCheck
          semigroups text time transformers unordered-containers vector
        ];
-       homepage = "https://github.com/swagger-api/swagger-codegen#readme";
-       description = "Auto-generated swagger-petstore API Client";
+       homepage = "https://openapi-generator.tech";
+       description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -203426,6 +205564,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty_1_1_0_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
+     , optparse-applicative, stm, tagged, unbounded-delays, unix
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "1.1.0.1";
+       sha256 = "09mbqjak66wynacddn399hh9dqcmgxg4gdn2492g538dj55lmjdw";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers mtl optparse-applicative
+         stm tagged unbounded-delays unix
+       ];
+       homepage = "https://github.com/feuerbach/tasty";
+       description = "Modern and extensible testing framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-ant-xml" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
@@ -203444,6 +205600,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-ant-xml_1_1_4" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
+     , xml
+     }:
+     mkDerivation {
+       pname = "tasty-ant-xml";
+       version = "1.1.4";
+       sha256 = "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8";
+       libraryHaskellDepends = [
+         base containers directory filepath generic-deriving ghc-prim mtl
+         stm tagged tasty transformers xml
+       ];
+       homepage = "http://github.com/ocharles/tasty-ant-xml";
+       description = "Render tasty output to XML for Jenkins";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-auto" = callPackage
     ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
      , tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -203478,12 +205653,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-dejafu_1_2_0_0" = callPackage
+  "tasty-dejafu_1_2_0_2" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "1.2.0.0";
-       sha256 = "0dhrcra1vzrw7xxnph28iz3c9pkmkhza0m9xjb9qxc75p2f684p3";
+       version = "1.2.0.2";
+       sha256 = "145w018mv8928g9bbp5pjwzciyfspxxqdg5grzq0mlpydkpmmgr5";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
@@ -203615,8 +205790,8 @@ self: {
        pname = "tasty-hedgehog";
        version = "0.2.0.0";
        sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
-       revision = "3";
-       editedCabalFile = "1r1sbcz12j9kmbdfr7mjc6z22c3737jc7mf0kdk1v6a3zr6n1js9";
+       revision = "4";
+       editedCabalFile = "04d7lhn0dlqna0pqz7wxmz2y6vq7qar2m2g432z38cvm5na9w4y0";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
@@ -203859,6 +206034,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-rerun_1_1_12" = callPackage
+    ({ mkDerivation, base, containers, mtl, optparse-applicative
+     , reducers, split, stm, tagged, tasty, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-rerun";
+       version = "1.1.12";
+       sha256 = "05lp4zy6lwd916snq6hs43848n62j9vdfl3s8sfivqydrax0vvd8";
+       libraryHaskellDepends = [
+         base containers mtl optparse-applicative reducers split stm tagged
+         tasty transformers
+       ];
+       homepage = "http://github.com/ocharles/tasty-rerun";
+       description = "Run tests by filtering the test tree depending on the result of previous test runs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-silver" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
@@ -203913,6 +206106,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-stats_0_2_0_4" = callPackage
+    ({ mkDerivation, base, containers, directory, process, stm, tagged
+     , tasty, time
+     }:
+     mkDerivation {
+       pname = "tasty-stats";
+       version = "0.2.0.4";
+       sha256 = "0z244l1yl1m77i4nvs9db2v6a2ydgcpgyc78hzgfyin7as002kd6";
+       libraryHaskellDepends = [
+         base containers directory process stm tagged tasty time
+       ];
+       homepage = "https://github.com/minad/tasty-stats#readme";
+       description = "Collect statistics of your Tasty testsuite";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-tap" = callPackage
     ({ mkDerivation, base, containers, directory, stm, tasty
      , tasty-golden, tasty-hunit
@@ -205770,6 +207980,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "testing-feat_1_0_1_0" = callPackage
+    ({ mkDerivation, base, QuickCheck, size-based
+     , testing-type-modifiers
+     }:
+     mkDerivation {
+       pname = "testing-feat";
+       version = "1.0.1.0";
+       sha256 = "0f3b4q97nwgk6gdcg0475r7g15hbghdp8vh7iiw6lrp87v7w00b3";
+       libraryHaskellDepends = [
+         base QuickCheck size-based testing-type-modifiers
+       ];
+       homepage = "https://github.com/JonasDuregard/testing-feat";
+       description = "Functional Enumeration of Algebraic Types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "testing-type-modifiers" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -205926,6 +208153,30 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "texmath_0_11" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.11";
+       sha256 = "1sssa9ld13bhs4b6cpv5mwf18bjajr8fgw32g4wp2smgv9p2jv9f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, temporary, test-framework
@@ -206776,6 +209027,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-utf8" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq
+     , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
+     , quickcheck-unicode, random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "text-utf8";
+       version = "1.2.3.0";
+       sha256 = "17xgi57wnjq06k0zllyj0k7jqfxridhczc1dzrg65vdrmzf8x31a";
+       libraryHaskellDepends = [
+         array base binary bytestring deepseq ghc-prim integer-gmp
+       ];
+       testHaskellDepends = [
+         array base binary bytestring deepseq directory ghc-prim HUnit
+         integer-gmp QuickCheck quickcheck-unicode random test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/text-utf8";
+       description = "An efficient packed UTF-8 backed Unicode text type";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "text-utils" = callPackage
     ({ mkDerivation, base, HTF, text }:
      mkDerivation {
@@ -207358,6 +209632,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-lift_0_7_10" = callPackage
+    ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
+     }:
+     mkDerivation {
+       pname = "th-lift";
+       version = "0.7.10";
+       sha256 = "13c89mr9g4jwrmqxx882ygr1lkvj1chw29p80qv2f3g5wnhlgkmr";
+       libraryHaskellDepends = [
+         base ghc-prim template-haskell th-abstraction
+       ];
+       testHaskellDepends = [ base ghc-prim template-haskell ];
+       homepage = "http://github.com/mboes/th-lift";
+       description = "Derive Template Haskell's Lift class for datatypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-lift-instances" = callPackage
     ({ mkDerivation, base, bytestring, containers, QuickCheck
      , template-haskell, text, th-lift, vector
@@ -210129,14 +212420,39 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "tomland" = callPackage
+    ({ mkDerivation, base, hashable, hedgehog, megaparsec, mtl
+     , parser-combinators, tasty, tasty-hedgehog, tasty-hspec, text
+     , time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "tomland";
+       version = "0.0.0";
+       sha256 = "1z6xlaw7fvl95h5nhd1r87bn8y3xv5gmfwfvryaj7hn06ghw13z2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base hashable megaparsec mtl parser-combinators text time
+         unordered-containers
+       ];
+       executableHaskellDepends = [ base text time unordered-containers ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-hedgehog tasty-hspec text
+         unordered-containers
+       ];
+       homepage = "https://github.com/kowainik/tomland";
+       description = "TOML parser";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "tomlcheck" = callPackage
     ({ mkDerivation, base, htoml-megaparsec, megaparsec
      , optparse-generic, text
      }:
      mkDerivation {
        pname = "tomlcheck";
-       version = "0.1.0.23";
-       sha256 = "0m58rrjrrd2n1w313806s9gyj840nzsm7vwdz40639mr3a6vaifg";
+       version = "0.1.0.29";
+       sha256 = "1blq3yjzd39fjpavjl5k3567algdl424l0al0rvr25xd239kvwzg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -210901,12 +213217,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "transformers-compat_0_6_1_6" = callPackage
+  "transformers-compat_0_6_2" = callPackage
     ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
        pname = "transformers-compat";
-       version = "0.6.1.6";
-       sha256 = "0db1l90pp4f1b829b3gv6xxklc8cnhkqq383rzd7r9b4hyjdvpmx";
+       version = "0.6.2";
+       sha256 = "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        homepage = "http://github.com/ekmett/transformers-compat/";
        description = "A small compatibility shim for the transformers library";
@@ -210993,14 +213309,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "transformers-either_0_1_0" = callPackage
+  "transformers-either_0_1_1" = callPackage
     ({ mkDerivation, base, exceptions, text, transformers }:
      mkDerivation {
        pname = "transformers-either";
-       version = "0.1.0";
-       sha256 = "18a99isv93yf65b6j4863j23ss9j1mp1f815sblhgs2xaywswhvm";
-       revision = "1";
-       editedCabalFile = "1bhkkh73irjql1jhxdcrv1igmf0hqpnw2p0w1s6fwhiidx64kvy9";
+       version = "0.1.1";
+       sha256 = "1hjkiz3dhk4dp8a4lgpyns4nd867lg7ydq4r4zf57w4i6ys7j4l7";
        libraryHaskellDepends = [ base exceptions text transformers ];
        homepage = "http://github.com/tmcgilchrist/transformers-either/";
        description = "An Either monad transformer";
@@ -212871,8 +215185,8 @@ self: {
      }:
      mkDerivation {
        pname = "twilio";
-       version = "0.2.0.0";
-       sha256 = "0shjhdb3iabbs7hy89hv3fawzxilc7djgpacgydnzl2290dm17yl";
+       version = "0.2.0.1";
+       sha256 = "0qj2v4m30ik0qk2m9wghkgbhklql4jnyb0cnyfpip4yn1lczp34s";
        libraryHaskellDepends = [
          aeson base binary bytestring containers deepseq errors exceptions
          free hashable http-client http-client-tls http-types mtl
@@ -214850,8 +217164,8 @@ self: {
      }:
      mkDerivation {
        pname = "unbound-generics";
-       version = "0.3.2";
-       sha256 = "1g691ijcn7yxmn7w0zmd4h9w8nr578jifg3yhlyckka2jm97f20g";
+       version = "0.3.3";
+       sha256 = "06md35jmm8xas8dywxxc62nq4d6gi66m7bm4h3920jpvknqwbvbz";
        libraryHaskellDepends = [
          ansi-wl-pprint base containers contravariant deepseq exceptions mtl
          profunctors template-haskell transformers transformers-compat
@@ -217280,8 +219594,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "util";
-       version = "0.1.10.0";
-       sha256 = "1cp7vxhg6m02j7zj7z6zss38rsykrk596qakzczsxjx7yraxwdxb";
+       version = "0.1.10.1";
+       sha256 = "1z3k6x6ap1hjp53w9dnqx8d7pwpbgsabj3dlxcdg5pvr6m3ns184";
        libraryHaskellDepends = [ base ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -217528,8 +219842,8 @@ self: {
        pname = "uuid";
        version = "1.3.13";
        sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z";
-       revision = "1";
-       editedCabalFile = "0yp01hzsw07d9ismqqkkzwqllfnyyhzhjmwhbhgmkb6v7y7iqrbm";
+       revision = "2";
+       editedCabalFile = "0m185q62jkfb5jsv358nxbnrkv8y8hd0qqvgvh22wvc5g9ipz0r9";
        libraryHaskellDepends = [
          base binary bytestring cryptohash-md5 cryptohash-sha1 entropy
          network-info random text time uuid-types
@@ -218037,12 +220351,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-bytestring_0_3_0_0" = callPackage
+  "validity-bytestring_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, validity }:
      mkDerivation {
        pname = "validity-bytestring";
-       version = "0.3.0.0";
-       sha256 = "1yxrpwxqn0262262j27sf1nb6iw6fnirypivnmpw0ghml28w7aym";
+       version = "0.3.0.1";
+       sha256 = "1jp1d72qr9axngzgq18k0kvvmc2x8yndpnh9g52zcmm66nkhn2d9";
        libraryHaskellDepends = [ base bytestring validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for bytestring";
@@ -218062,12 +220376,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-containers_0_3_0_0" = callPackage
+  "validity-containers_0_3_0_1" = callPackage
     ({ mkDerivation, base, containers, validity }:
      mkDerivation {
        pname = "validity-containers";
-       version = "0.3.0.0";
-       sha256 = "1jh2f46x5gwhb5i5bmqn1vdn27way0nk7q2gphyjb62zrg3d3zq5";
+       version = "0.3.0.1";
+       sha256 = "0ksqyr335f0d686j0slpzyph7663xiyv86rblgiaqjjwbj9y1jqf";
        libraryHaskellDepends = [ base containers validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for containers";
@@ -218087,14 +220401,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-path_0_3_0_0" = callPackage
+  "validity-path_0_3_0_1" = callPackage
     ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
      , validity
      }:
      mkDerivation {
        pname = "validity-path";
-       version = "0.3.0.0";
-       sha256 = "1ijrzfk9jhlxxcdjqdq4cqz7ir7k7z9zrbamb18zai99hb6gg066";
+       version = "0.3.0.1";
+       sha256 = "1mfd062p9wh63qnz4a06rj7179lyllfc97g60cmpnjspmcdgy1ky";
        libraryHaskellDepends = [ base filepath path validity ];
        testHaskellDepends = [
          base filepath genvalidity-hspec hspec path validity
@@ -218117,12 +220431,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-scientific_0_2_0_0" = callPackage
+  "validity-scientific_0_2_0_1" = callPackage
     ({ mkDerivation, base, scientific, validity }:
      mkDerivation {
        pname = "validity-scientific";
-       version = "0.2.0.0";
-       sha256 = "0l4mzrhn6yhqd6kz7rwfvrqxk0dhwvfkh40pfjyzbkg5mvd1drhh";
+       version = "0.2.0.1";
+       sha256 = "1iphzdh9vqa51im1mx3sg7gpqczm39bcdc6li84lssyflg20kraw";
        libraryHaskellDepends = [ base scientific validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for scientific";
@@ -218142,12 +220456,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-text_0_3_0_0" = callPackage
+  "validity-text_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, text, validity }:
      mkDerivation {
        pname = "validity-text";
-       version = "0.3.0.0";
-       sha256 = "190gkwa3b4rnhmah9idivvrv0val4crv8y3qy9s0aa44kpcj2b8m";
+       version = "0.3.0.1";
+       sha256 = "0ccy6b21lxgqp9q2cmddip1r0axwh6ny4c2vrw1a16712yrhrcdf";
        libraryHaskellDepends = [ base bytestring text validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for text";
@@ -218167,12 +220481,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-time_0_2_0_0" = callPackage
+  "validity-time_0_2_0_1" = callPackage
     ({ mkDerivation, base, time, validity }:
      mkDerivation {
        pname = "validity-time";
-       version = "0.2.0.0";
-       sha256 = "0rp1y2xq3h18ji3vaiv3w76kkdyql5y8xxxz730za6mrf1ffbnk4";
+       version = "0.2.0.1";
+       sha256 = "1m8wsm97s7cwax183qsbmr8p010k9czigwlqbqr6qha3bk83n4bf";
        libraryHaskellDepends = [ base time validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for time";
@@ -218194,12 +220508,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-unordered-containers_0_2_0_0" = callPackage
+  "validity-unordered-containers_0_2_0_1" = callPackage
     ({ mkDerivation, base, hashable, unordered-containers, validity }:
      mkDerivation {
        pname = "validity-unordered-containers";
-       version = "0.2.0.0";
-       sha256 = "08jw6acvi016lxkw6rzxfxfcx56nwfi6ka52flkq2ks8038y3syy";
+       version = "0.2.0.1";
+       sha256 = "11pwrd1jbxdffw1lqq6zxgpgzvxrg4y01wnrn5bzwksiqzach742";
        libraryHaskellDepends = [
          base hashable unordered-containers validity
        ];
@@ -218221,12 +220535,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-uuid_0_1_0_0" = callPackage
+  "validity-uuid_0_1_0_1" = callPackage
     ({ mkDerivation, base, uuid, validity }:
      mkDerivation {
        pname = "validity-uuid";
-       version = "0.1.0.0";
-       sha256 = "129h7cjgixq6l29n3y66zcx5ynfnxz3prqkgf2028f6w4mhd0154";
+       version = "0.1.0.1";
+       sha256 = "15lk4hig0j6xhz1b7m2hwpvyfwhlrvncgwb1830lpmgvvg18qb9n";
        libraryHaskellDepends = [ base uuid validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for uuid";
@@ -218246,12 +220560,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-vector_0_2_0_0" = callPackage
+  "validity-vector_0_2_0_1" = callPackage
     ({ mkDerivation, base, hashable, validity, vector }:
      mkDerivation {
        pname = "validity-vector";
-       version = "0.2.0.0";
-       sha256 = "0kyyrcwxial9csyx40vrl0frz5yrmzqhjpy1cz8afsc7r4ph12yi";
+       version = "0.2.0.1";
+       sha256 = "0ljihk6qdb52c44hf39wigf3b0f0xs1z7adgxg4fqfxq8zq2a3k4";
        libraryHaskellDepends = [ base hashable validity vector ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for vector";
@@ -219063,14 +221377,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector-sized_1_0_1_0" = callPackage
+  "vector-sized_1_0_2_0" = callPackage
     ({ mkDerivation, adjunctions, base, deepseq, distributive
      , finite-typelits, indexed-list-literals, primitive, vector
      }:
      mkDerivation {
        pname = "vector-sized";
-       version = "1.0.1.0";
-       sha256 = "0p3bwqdz3k1a3ya7bj80d6crpbsk62wcvl6rkpkr0snqh4zq87zl";
+       version = "1.0.2.0";
+       sha256 = "0ac9bx5pcf9hbm1i9ibw3x52j0a92j8y7svm4b3d65p85mxqhc69";
        libraryHaskellDepends = [
          adjunctions base deepseq distributive finite-typelits
          indexed-list-literals primitive vector
@@ -219334,6 +221648,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "verifiable-expressions" = callPackage
+    ({ mkDerivation, base, containers, lens, mtl, sbv, transformers
+     , union, vinyl
+     }:
+     mkDerivation {
+       pname = "verifiable-expressions";
+       version = "0.4.0";
+       sha256 = "0s0wqhss8155xy2gkdwylvp61cn0ra5245fa5l2k9rvqr8xxrfkd";
+       libraryHaskellDepends = [
+         base containers lens mtl sbv transformers union vinyl
+       ];
+       description = "An intermediate language for Hoare logic style verification";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "verify" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, containers, either
      , hspec, jwt, QuickCheck, text, text-conversions, time
@@ -221692,8 +224021,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.10.1";
-       sha256 = "1ahlvyplg1mh3w2yxag0nk67w13k70rff77b96grgr48a8b9b82g";
+       version = "0.10.2";
+       sha256 = "0nhimzkws5v7qpfv305lp41qm61q0xxny5vvs0d26jarnmar9crq";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive containers
          cookie data-default-class filepath http-types mime-types
@@ -221773,6 +224102,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "wai-session_0_3_3" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring
+     , bytestring-builder, containers, cookie, entropy, http-types
+     , StateVar, time, transformers, vault, wai
+     }:
+     mkDerivation {
+       pname = "wai-session";
+       version = "0.3.3";
+       sha256 = "0lq0gqndb9simd1zkz355m604dwrpcdwxcl3bgagi6kb8h12fffj";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring bytestring-builder containers cookie
+         entropy http-types StateVar time transformers vault wai
+       ];
+       homepage = "https://github.com/singpolyma/wai-session";
+       description = "Flexible session middleware for WAI";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-session-alt" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, cookie
      , http-types, time, vault, wai-transformers
@@ -222854,8 +225202,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.7.1.0";
-       sha256 = "0ckxnnp5aqcd13p5gnk1nx7ysws6x7nmfklxqllilpzdh5ibyj59";
+       version = "0.7.2.0";
+       sha256 = "15d0l5cvrncwmy27qk7y7f54snw1fjcsll52sdlmk3v2mpf6nppn";
        libraryHaskellDepends = [
          aeson async base basement bytestring cereal cryptonite data-default
          exceptions generics-sop http-client machines memory mtl parsec
@@ -223292,8 +225640,8 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.12.4.0";
-       sha256 = "1sq488nm8bjrg1q9vypag9pd8vljfibx3kacgkcfi1zqmr14x8x3";
+       version = "0.12.4.1";
+       sha256 = "1qr9sjjnllf6y2k5knyrck9nnh3s7z6nid8a0z5vsvmmvr37fa4j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -223434,6 +225782,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "websockets-snap_0_10_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
+     , mtl, snap-core, snap-server, websockets
+     }:
+     mkDerivation {
+       pname = "websockets-snap";
+       version = "0.10.3.0";
+       sha256 = "1r1v6ypnaap99vy2gh3lmghqv2y3zaaq0wiv4d2bn49179c40jmk";
+       libraryHaskellDepends = [
+         base bytestring bytestring-builder io-streams mtl snap-core
+         snap-server websockets
+       ];
+       description = "Snap integration for the websockets library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "webwire" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
      , bytestring, case-insensitive, containers, cookie, cprng-aes
@@ -223524,6 +225889,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weigh_0_0_12" = callPackage
+    ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
+     mkDerivation {
+       pname = "weigh";
+       version = "0.0.12";
+       sha256 = "0zw2a997gxgdzqmd7j730kxgynzmjvvlkw84dajmfzf1v9pbij7x";
+       libraryHaskellDepends = [
+         base deepseq mtl process split temporary
+       ];
+       testHaskellDepends = [ base deepseq ];
+       homepage = "https://github.com/fpco/weigh#readme";
+       description = "Measure allocations of a Haskell functions/values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "weighted" = callPackage
     ({ mkDerivation, base, mtl, semiring-num, transformers }:
      mkDerivation {
@@ -224201,6 +226582,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wizard" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "wizard";
+       version = "0.1.0.0";
+       sha256 = "0j485hbk42ipmc14ydickfm268b7z183rs37ih3j99lbzrdm1s8l";
+       libraryHaskellDepends = [ base transformers ];
+       homepage = "https://github.com/chessai/wizard.git";
+       description = "the fantastical wizard monoid";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wizards" = callPackage
     ({ mkDerivation, base, containers, control-monad-free, haskeline
      , mtl, transformers
@@ -224456,8 +226849,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.44";
-       sha256 = "096j1f0xzjrnk8z7niyx19w05nx5222rgfbhgx8df8jwhfz0ymw7";
+       version = "0.3.45";
+       sha256 = "0l3jp2qqscy2fq5fvaq83hsh68f1d5xg97k2dhyc01zc6fd5jqi8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -224485,6 +226878,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "word" = callPackage
+    ({ mkDerivation, base, Fin, natural-induction, peano, smallcheck
+     , tasty, tasty-smallcheck, transformers
+     }:
+     mkDerivation {
+       pname = "word";
+       version = "0.1.0.1";
+       sha256 = "1k7hz3w8isbdmj0f2klyj4drrk31lbs3fzdnin7pas7l0ai286qf";
+       libraryHaskellDepends = [
+         base Fin natural-induction peano transformers
+       ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       description = "Words of arbitrary size";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "word-trie" = callPackage
     ({ mkDerivation, base, binary, containers, hspec, QuickCheck }:
      mkDerivation {
@@ -224595,10 +227004,8 @@ self: {
      }:
      mkDerivation {
        pname = "wordchoice";
-       version = "0.1.2.6";
-       sha256 = "16x595vv9fbq6j634a8wqnd1agmzbv09372sc99lq1a997crmq2w";
-       revision = "1";
-       editedCabalFile = "1igc5fc91ilva7yqhcmdsd6yq6q974ybb2hwk856cpqpmas0402j";
+       version = "0.1.2.7";
+       sha256 = "06xz5xk14fiy1z4j6q7lbjwj13m4hy22pzrcdwk6c078w85rp4yd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -226013,10 +228420,10 @@ self: {
      }:
      mkDerivation {
        pname = "xeno";
-       version = "0.3.3";
-       sha256 = "034d38kcgpil1xf32cl131jh7b0x8awhxwv1nnc790x5wn876c0x";
+       version = "0.3.4";
+       sha256 = "1srlyg0wc2mwsa84isv0brcbwsrw6i7jbi0b2mjhnhd6d7cmcajs";
        libraryHaskellDepends = [
-         array base bytestring deepseq mtl mutable-containers vector
+         array base bytestring deepseq hspec mtl mutable-containers vector
        ];
        testHaskellDepends = [ base bytestring hexml hspec ];
        benchmarkHaskellDepends = [
@@ -228121,37 +230528,6 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, 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.29";
-       sha256 = "0x0gs80cq83i65b7g1xg6dvggkxlxhn1qs3py63c4wsjsplmyphs";
-       revision = "1";
-       editedCabalFile = "0hxmf36ydqr0gdwiagp57df7fxwhfy99r6s7mj861m8rflha0dks";
-       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 ];
-       testHaskellDepends = [
-         aeson 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_30" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , conduit, containers, directory, filepath, hspec, HUnit, libyaml
      , mockery, resourcet, scientific, semigroups, template-haskell
@@ -228178,7 +230554,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
@@ -228505,19 +230880,20 @@ self: {
 
   "yarn-lock" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, either
-     , megaparsec, neat-interpolation, protolude, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-th, text
+     , megaparsec, neat-interpolation, protolude, quickcheck-instances
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-th, text
      }:
      mkDerivation {
        pname = "yarn-lock";
-       version = "0.4.0";
-       sha256 = "1s95xdwshsvplv1406a4bn1v8xjhppfmhzf4302s9h41ai7b6wni";
+       version = "0.4.1";
+       sha256 = "1jhw8ss2psap2shl8spwqbdvxchmvfxb354asvdjjgld608xz8wk";
        libraryHaskellDepends = [
          base containers either megaparsec protolude text
        ];
        testHaskellDepends = [
          ansi-wl-pprint base containers either megaparsec neat-interpolation
-         protolude tasty tasty-hunit tasty-quickcheck tasty-th text
+         protolude quickcheck-instances tasty tasty-hunit tasty-quickcheck
+         tasty-th text
        ];
        homepage = "https://github.com/Profpatsch/yarn-lock#readme";
        description = "Represent and parse yarn.lock files";
@@ -229297,6 +231673,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-bin_1_6_0_3" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
+     , bytestring, Cabal, conduit, conduit-extra, containers
+     , data-default-class, directory, file-embed, filepath, fsnotify
+     , http-client, http-client-tls, http-reverse-proxy, http-types
+     , network, optparse-applicative, parsec, process, project-template
+     , resourcet, say, shakespeare, split, stm, streaming-commons, tar
+     , template-haskell, text, time, transformers, transformers-compat
+     , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp
+     , warp-tls, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "yesod-bin";
+       version = "1.6.0.3";
+       sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base base64-bytestring blaze-builder bytestring Cabal
+         conduit conduit-extra containers data-default-class directory
+         file-embed filepath fsnotify http-client http-client-tls
+         http-reverse-proxy http-types network optparse-applicative parsec
+         process project-template resourcet say shakespeare split stm
+         streaming-commons tar template-haskell text time transformers
+         transformers-compat unix-compat unliftio unordered-containers wai
+         wai-extra warp warp-tls yaml zlib
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "The yesod helper executable";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-bootstrap" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types
      , shakespeare, text, transformers, yesod-core, yesod-elements
@@ -229440,46 +231849,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, byteable, bytestring, case-insensitive, cereal
-     , clientsession, conduit, conduit-extra, containers, cookie
-     , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec
-     , hspec-expectations, http-types, HUnit, monad-logger, mtl, network
-     , old-locale, parsec, path-pieces, primitive, QuickCheck, random
-     , resourcet, safe, semigroups, shakespeare, streaming-commons
-     , template-haskell, text, time, transformers, unix-compat, unliftio
-     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
-     , word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.6.4";
-       sha256 = "09r714ibpml8mqbqhnckync5a0kb7fyz079m9lapmvhq1yvl4zld";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup byteable bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq deepseq-generics directory fast-logger
-         http-types monad-logger mtl old-locale parsec path-pieces primitive
-         random resourcet safe semigroups shakespeare template-haskell text
-         time transformers unix-compat unliftio unordered-containers vector
-         wai wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base bytestring clientsession conduit conduit-extra
-         containers cookie hspec hspec-expectations http-types HUnit network
-         path-pieces QuickCheck random resourcet shakespeare
-         streaming-commons template-haskell text transformers unliftio wai
-         wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text transformers
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_5" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, byteable, bytestring, case-insensitive, cereal
      , clientsession, conduit, conduit-extra, containers, cookie
@@ -229517,7 +231886,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
@@ -231804,10 +234172,8 @@ self: {
      }:
      mkDerivation {
        pname = "z3";
-       version = "4.3";
-       sha256 = "1c29zzc6y7l169hdj9278z95530h6hc161fxgfn4zlxs3k5611d1";
-       revision = "1";
-       editedCabalFile = "0spg0sqqra4h5k5zagmmhh0sh10p3bzrhgrfspcd3i5c7yymwagb";
+       version = "4.3.1";
+       sha256 = "0fsddp5267bpmccg2hhra4z8isqmrdgcp0i0amrxsacgyqa4iqbv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl ];
@@ -232178,8 +234544,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter";
-       version = "0.0.1.7";
-       sha256 = "1gdrnxa23lk885ldbn72n136acjfv8l0bnpf5v0lnypzl1hwp4rk";
+       version = "0.0.1.8";
+       sha256 = "1vzl6gl2lism0nv5n9hs5mmprfkxp0ajr0ysrn21xwajbbnakcw2";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions filepath
          optparse-applicative path path-io process safe stm validity
-- 
GitLab


From d83d20c11b426297784b7bc19c2b13254c67ebf6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 15:27:40 +0200
Subject: [PATCH 0990/1085] haskell-pandoc: update override for ghc-8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 12fd5974830..25ac8b2269f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -451,7 +451,7 @@ self: super: {
   hpack = self.hpack_0_28_2;
   hspec-smallcheck = self.hspec-smallcheck_0_5_2;
   matrix = self.matrix_0_3_6_1;
-  pandoc = self.pandoc_2_2;
+  pandoc = self.pandoc_2_2_1;
   pandoc-types = self.pandoc-types_1_17_4_2;
   wl-pprint-text = self.wl-pprint-text_1_2_0_0;
   base-compat = self.base-compat_0_10_1;
-- 
GitLab


From 5b2490d53eb0d2b7b4182bf8153a35ca5cba6922 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 15:29:18 +0200
Subject: [PATCH 0991/1085] all-cabal-hashes: update to latest version

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 1ef00de5b83..46ce08fe8cf 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a2febcad5a83b15dea74462890e3c48c13f55f1.tar.gz";
-  sha256 = "1z6mfk49hsxvcpv183wayirspx78xd1l0w42wf8mfyf0jh8grfff";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/7988bc2977184737900cc54b2dda27af6921f5ee.tar.gz";
+  sha256 = "1zagnnab5z3zymniw5rrdahlxrfpnyf30iysa1lylgwlscnzfv0l";
 }
-- 
GitLab


From b558e437533a7177f0fce894fc9f66b738a12d0f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 19:22:19 +0200
Subject: [PATCH 0992/1085] haskell-hspec: use version 2.5.1 for ghc-8.4.x

---
 .../configuration-ghc-8.4.x.nix               | 40 ++-----------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 25ac8b2269f..011f307e8a8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -73,41 +73,6 @@ self: super: {
     doHaddock       = false;
   });
 
-  ## Needs bump to a versioned attribute
-  hspec = overrideCabal super.hspec_2_5_0 (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## hspec-core ==2.4.4, hspec-discover ==2.4.4
-    ##
-    ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘stringbuilder-0.5.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## infinite recursion encountered, at undefined position
-    ## test suite causes an infinite loop
-    doCheck         = false;
-  });
-
-  ## Needs bump to a versioned attribute
-  hspec-core = overrideCabal super.hspec-core_2_5_0 (drv: {
-    ##     • No instance for (Semigroup Summary)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid Summary’
-    ##
-    ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-core-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘silently-1.2.5’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘temporary-1.2.1.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘base-compat-0.9.3’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘propagatedBuildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## infinite recursion encountered, at undefined position
-    doCheck         = false;
-  });
-
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## hspec-discover ==2.4.8
-  hspec-discover = super.hspec-discover_2_5_0;
-
-  # https://github.com/jcristovao/enclosed-exceptions/issues/12
-  enclosed-exceptions = dontCheck super.enclosed-exceptions;
-
   ## On Hackage:
 
   ## Upstreamed, awaiting a Hackage release
@@ -444,17 +409,20 @@ self: super: {
   });
 
   # Older versions don't compile.
+  base-compat = self.base-compat_0_10_1;
   brick = self.brick_0_37;
   dhall = self.dhall_1_13_0;
   dhall_1_13_0 = doJailbreak super.dhall_1_13_0;  # support ansi-terminal 0.8.x
   HaTeX = self.HaTeX_3_19_0_0;
   hpack = self.hpack_0_28_2;
+  hspec = dontCheck super.hspec_2_5_1;
+  hspec-core = dontCheck super.hspec-core_2_5_1;
+  hspec-discover = self.hspec-discover_2_5_1;
   hspec-smallcheck = self.hspec-smallcheck_0_5_2;
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_2_1;
   pandoc-types = self.pandoc-types_1_17_4_2;
   wl-pprint-text = self.wl-pprint-text_1_2_0_0;
-  base-compat = self.base-compat_0_10_1;
 
   # https://github.com/xmonad/xmonad/issues/155
   xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch
-- 
GitLab


From c2dd77c440b565dc2a5b4bdd4fdb2280fc2f4b45 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 19:25:34 +0200
Subject: [PATCH 0993/1085] haskell-vector-sized: update override for the
 latest version

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8278b4bdc5e..f3798308204 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1036,8 +1036,8 @@ self: super: {
   vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
 
   # Builds only with the latest version of indexed-list-literals.
-  vector-sized_1_0_1_0 = super.vector-sized_1_0_1_0.override {
-    indexed-list-literals = self.indexed-list-literals_0_2_0_0;
+  vector-sized_1_0_2_0 = super.vector-sized_1_0_2_0.override {
+    indexed-list-literals = self.indexed-list-literals_0_2_1_1;
   };
 
   # https://github.com/dmwit/encoding/pull/3
-- 
GitLab


From 49fc5f004495a89e6b089fd6fa4dc566c7051530 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 19:27:59 +0200
Subject: [PATCH 0994/1085] git-annex: update sha256 hash for the 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 f3798308204..2fc5c20c337 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -82,7 +82,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "05rygb8jm4nh7ggzihz6664hcgwkbqspi8gbpkpf7l7wwvzdm1rd";
+      sha256 = "1w0gzqk70ymlpvh9zqkg1cd3ipaw4n85k4zsf49xl6kjp4vbcmwj";
     };
   })).overrideScope (self: super: {
     aws = dontCheck (self.aws_0_18);
-- 
GitLab


From 2fe842a20001aa2b02325b0f78a2be5f6bd88d90 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Thu, 17 May 2018 10:36:56 -0700
Subject: [PATCH 0995/1085] fix ghc bootstrap on non-nixos nonstd-storepath

Something goes amiss in the configurePhase and binaries start picking up
system binaries and everything falls apart. Patch the configure script
to use a bourne shell out of the store, and things are happier.

Closes https://github.com/NixOS/nixpkgs/pull/40691.
---
 pkgs/development/compilers/ghc/7.10.3-binary.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix
index cb9f78aa081..48e2ca0a585 100644
--- a/pkgs/development/compilers/ghc/7.10.3-binary.nix
+++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix
@@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
     # Some scripts used during the build need to have their shebangs patched
     ''
       patchShebangs ghc-${version}/utils/
+      patchShebangs ghc-${version}/configure
     '' +
 
     # Strip is harmful, see also below. It's important that this happens
-- 
GitLab


From 456d0e280e0cbc517a89a396420fb024f48ed425 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 19 May 2018 17:40:04 -0300
Subject: [PATCH 0996/1085] xorg: fix missing gbm dependency for amdgpu driver

---
 pkgs/servers/x11/xorg/default.nix                    | 4 ++--
 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f5d7f54eb5c..adb5da606df 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1839,9 +1839,9 @@ let
       sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    buildInputs = [ fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
-  }) // {inherit fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  }) // {inherit fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videoark = (mkDerivation "xf86videoark" {
     name = "xf86-video-ark-0.7.5";
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9f21d3c2024..dfde730fbea 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -35,6 +35,7 @@ $pcMap{"dbus-1"} = "dbus";
 $pcMap{"uuid"} = "libuuid";
 $pcMap{"libudev"} = "udev";
 $pcMap{"gl"} = "libGL";
+$pcMap{"gbm"} = "mesa_noglu";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "renderproto";
 $pcMap{"\$DRI3PROTO"} = "dri3proto";
-- 
GitLab


From 0d319657efdbefa967df77a10057bbd346ea0bdd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Sat, 19 May 2018 23:01:40 +0200
Subject: [PATCH 0997/1085] ocamlPackages.earley: init at 1.0.2 (#40755)

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

diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix
new file mode 100644
index 00000000000..576d9b2528f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/earley/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "earley is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "ocaml${ocaml.version}-earley-${version}";
+  src = fetchFromGitHub {
+    owner = "rlepigre";
+    repo = "ocaml-earley";
+    rev = "ocaml-earley_${version}";
+    sha256 = "110njakmx1hyq42hyr6gx6qhaxly860whfhd6r0vks4yfp68qvcx";
+  };
+
+  buildInputs = [ which ocaml findlib ocamlbuild ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "Parser combinators based on Earley Algorithm";
+    license = stdenv.lib.licenses.cecill-b;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    inherit (src.meta) homepage;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index bce2662abfd..e46888992f7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -215,6 +215,8 @@ let
 
     dtoa = callPackage ../development/ocaml-modules/dtoa { };
 
+    earley = callPackage ../development/ocaml-modules/earley { };
+
     easy-format = callPackage ../development/ocaml-modules/easy-format { };
 
     eliom = callPackage ../development/ocaml-modules/eliom { };
-- 
GitLab


From bf049151a753956610be837b9c24215204b7ab92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 19 May 2018 18:19:22 -0300
Subject: [PATCH 0998/1085] materia-theme: 20180321 -> 20180519 (#40790)

- Update to version 20180519

- Do not unset the environment variable 'name' anymore before running
install.sh. It has been renamed to '_name' in upstream.
---
 pkgs/misc/themes/materia-theme/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index 4b6d364a856..8f2cdb0fcff 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "materia-theme-${version}";
-  version = "20180321";
+  version = "20180519";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "materia-theme";
     rev = "v${version}";
-    sha256 = "1nj9ylg9g74smd2kdyzlamdw9cg0f3jz77vn5898drjyscw5qpp6";
+    sha256 = "0javva2a3kmwb7xss2zmbpc988gagrkjgxncy7i1jifyvbnamf70";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 bc ];
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
       -e "s|if .*which gnome-shell.*;|if true;|" \
       -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|"
     mkdir -p $out/share/themes
-    # name is used internally by the package installation script
-    name= ./install.sh --dest $out/share/themes
+    ./install.sh --dest $out/share/themes
     rm $out/share/themes/*/COPYING
   '';
 
-- 
GitLab


From bf629981a6ed0b69091df0dc40f9bb994c24b73a Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 19 May 2018 23:26:06 +0200
Subject: [PATCH 0999/1085] nms: init at 0.3.3 (#40707)

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

diff --git a/pkgs/tools/misc/nms/default.nix b/pkgs/tools/misc/nms/default.nix
new file mode 100644
index 00000000000..3037262322f
--- /dev/null
+++ b/pkgs/tools/misc/nms/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "nms-${version}";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "bartobri";
+    repo = "no-more-secrets";
+    rev = "v${version}";
+    sha256 = "1zfv4qabikf8w9winsr4brxrdvs3f0d7xvydksyx8bydadsm2v2h";
+  };
+
+  buildFlags = [ "nms" "sneakers" ];
+  installFlags = [ "prefix=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/bartobri/no-more-secrets";
+    description = ''
+      A command line tool that recreates the famous data decryption
+      effect seen in the 1992 movie Sneakers.
+    '';
+    license = licenses.gpl3;
+    maintainers = [ maintainers.infinisil ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd2bf75a309..8ac26897741 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4019,6 +4019,8 @@ with pkgs;
 
   nitrogen = callPackage ../tools/X11/nitrogen {};
 
+  nms = callPackage ../tools/misc/nms { };
+
   notify-desktop = callPackage ../tools/misc/notify-desktop {};
 
   nkf = callPackage ../tools/text/nkf {};
-- 
GitLab


From 548417c209d1e1531b1811d813c243c8cc8af259 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Sat, 19 May 2018 23:26:54 +0200
Subject: [PATCH 1000/1085] riot-web: 0.14.2 -> 0.15.3 (#40792)

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

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 4946c065492..512c31e3d04 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.14.2";
+  version = "0.15.3";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1qma49a6lvr9anrry3vbhjhvy06bgapknnvbdljnbb3l9c99nmxi";
+    sha256 = "0vh2zjg0vaczh5mfyykb2kk9d8mi07dkr8zy60bpqf0y1lfamv0a";
   };
 
   installPhase = ''
-- 
GitLab


From c8a8ecb5b38865ca3d703993e953ea50e36ede6d Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 19 May 2018 23:33:09 +0200
Subject: [PATCH 1001/1085] blockhash: init at 0.3 (#40737)

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

diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix
new file mode 100644
index 00000000000..c48b85cedb2
--- /dev/null
+++ b/pkgs/tools/graphics/blockhash/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, python, pkgconfig, imagemagick }:
+
+stdenv.mkDerivation rec {
+  name = "blockhash-${version}";
+  version = "0.3";
+
+  src = fetchFromGitHub {
+    owner = "commonsmachinery";
+    repo = "blockhash";
+    rev = "v${version}";
+    sha256 = "15iwljpkykn2711jhls7cwkb23gk6iawlvvk4prl972wic2wlxcj";
+  };
+
+  nativeBuildInputs = [ python pkgconfig ];
+  buildInputs = [ imagemagick ];
+
+  configurePhase = "python waf configure --prefix=$out";
+  buildPhase = "python waf";
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = "http://blockhash.io/";
+    description = ''
+      This is a perceptual image hash calculation tool based on algorithm
+      descibed in Block Mean Value Based Image Perceptual Hashing by Bian Yang,
+      Fan Gu and Xiamu Niu.
+    '';
+    license = licenses.mit;
+    maintainers = [ maintainers.infinisil ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ac26897741..1f8357ea9b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -844,6 +844,8 @@ with pkgs;
 
   blink = callPackage ../applications/networking/instant-messengers/blink { };
 
+  blockhash = callPackage ../tools/graphics/blockhash { };
+
   bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
 
   libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { };
-- 
GitLab


From b998139b85a7db6f35b2ccdf4d091d889649ebc8 Mon Sep 17 00:00:00 2001
From: averelld <averelld@users.noreply.github.com>
Date: Sat, 19 May 2018 23:46:26 +0200
Subject: [PATCH 1002/1085] x2goclient: 4.1.0.0 -> 4.1.1.1 (#40793)

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

diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 904a6812c48..b470c6b39d3 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "x2goclient-${version}";
-  version = "4.1.0.0";
+  version = "4.1.1.1";
 
   src = fetchurl {
     url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
-    sha256 = "0sibrj4qppww7mirdixrqrknkyq3g97s64186h88j8k66sy1anab";
+    sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3";
   };
 
   buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ];
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
      substituteInPlace Makefile \
+       --replace "SHELL=/bin/bash" "SHELL=$SHELL" \
        --replace "lrelease-qt4" "${qt4}/bin/lrelease" \
        --replace "qmake-qt4" "${qt4}/bin/qmake" \
        --replace "-o root -g root" ""
-- 
GitLab


From 6e222ef4967616ea1f8ef5048a36b51cb242cbea Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 19 May 2018 18:25:57 -0400
Subject: [PATCH 1003/1085] tmon: fix missing libgcc_s.so required by pthreads

---
 pkgs/os-specific/linux/tmon/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix
index 01c84a1d1fa..690eb8b2eab 100644
--- a/pkgs/os-specific/linux/tmon/default.nix
+++ b/pkgs/os-specific/linux/tmon/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation {
   '';
 
   makeFlags = kernel.makeFlags ++ [ "INSTALL_ROOT=\"$(out)\"" "BINDIR=bin" ];
+  NIX_CFLAGS_LINK = "-lgcc_s";
 
   enableParallelBuilding = true;
 
-- 
GitLab


From f4ec18aaaca9e46b4f304d2a7f5f06bd6222c0e5 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sun, 20 May 2018 01:01:42 +0200
Subject: [PATCH 1004/1085] nixos/cjdns: fix service for i686 (#40740)

service failed to start because of MemoryDenyWriteExecute = true,
which seems not to work on i686
---
 nixos/modules/services/networking/cjdns.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 12c2677c336..39b62bdc709 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -260,7 +260,8 @@ in
         RestartSec = 1;
         CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID";
         ProtectSystem = true;
-        MemoryDenyWriteExecute = true;
+        # Doesn't work on i686, causing service to fail
+        MemoryDenyWriteExecute = !pkgs.stdenv.isi686;
         ProtectHome = true;
         PrivateTmp = true;
       };
-- 
GitLab


From 8dbd8f4d69fc8ed993f6e7798616df4c4dd96765 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 20 May 2018 02:24:12 +0200
Subject: [PATCH 1005/1085] nixos/dnscrypt-proxy: fix apparmor profile and test

Test failed because of an incomplete apparmor profile.
- fix apparmor profile
- improve test timing, prevent non-deterministic failure
---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 4 ++++
 nixos/tests/dnscrypt-proxy.nix                       | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 857657eea4d..6f5e7d8d456 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -192,6 +192,7 @@ in
     security.apparmor.profiles = singleton (pkgs.writeText "apparmor-dnscrypt-proxy" ''
       ${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy {
         /dev/null rw,
+        /dev/random r,
         /dev/urandom r,
 
         /etc/passwd r,
@@ -211,6 +212,9 @@ in
         ${getLib pkgs.gcc.cc}/lib/libssp.so.* mr,
         ${getLib pkgs.libsodium}/lib/libsodium.so.* mr,
         ${getLib pkgs.systemd}/lib/libsystemd.so.* mr,
+        ${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so.* mr,
+        ${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so.* mr,
+        ${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so.* mr,
         ${getLib pkgs.xz}/lib/liblzma.so.* mr,
         ${getLib pkgs.libgcrypt}/lib/libgcrypt.so.* mr,
         ${getLib pkgs.libgpgerror}/lib/libgpg-error.so.* mr,
diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix
index 84562336825..1fcf3903b13 100644
--- a/nixos/tests/dnscrypt-proxy.nix
+++ b/nixos/tests/dnscrypt-proxy.nix
@@ -26,7 +26,8 @@ import ./make-test.nix ({ pkgs, ... }: {
     $client->waitForUnit("dnsmasq");
 
     # The daemon is socket activated; sending a single ping should activate it.
+    $client->fail("systemctl is-active dnscrypt-proxy");
     $client->execute("${pkgs.iputils}/bin/ping -c1 example.com");
-    $client->succeed("systemctl is-active dnscrypt-proxy");
+    $client->waitUntilSucceeds("systemctl is-active dnscrypt-proxy");
   '';
 })
-- 
GitLab


From 3575b82e679c0e1f466c2f721c00432a7e694dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 20 May 2018 04:03:09 +0200
Subject: [PATCH 1006/1085] gitAndTools.git-dit: Fix darwin build

---
 .../version-management/git-and-tools/default.nix         | 4 +++-
 .../version-management/git-and-tools/git-dit/default.nix | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 13b861d0a9e..99b6b531370 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -67,7 +67,9 @@ rec {
 
   git-crypt = callPackage ./git-crypt { };
 
-  git-dit = callPackage ./git-dit { };
+  git-dit = callPackage ./git-dit {
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+  };
 
   git-extras = callPackage ./git-extras { };
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 41096441b8e..654576a29e8 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -8,6 +8,10 @@
 , perl
 , pkgconfig
 , rustPlatform
+, curl
+, libiconv
+, CoreFoundation
+, Security
 }:
 
 with rustPlatform;
@@ -35,6 +39,11 @@ buildRustPackage rec {
     openssl
     libssh
     zlib
+  ] ++ stdenv.lib.optionals (stdenv.isDarwin) [
+    curl
+    libiconv
+    CoreFoundation
+    Security
   ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From e166aee826f7f58b53a583837e2399811ff61eaa Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 15 May 2018 20:55:59 +0200
Subject: [PATCH 1007/1085] nixos/gitea: Allow customizing derivation to use

---
 nixos/modules/services/misc/gitea.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 63e976ae566..9f7e1ea8c49 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   cfg = config.services.gitea;
+  gitea = cfg.package;
   pg = config.services.postgresql;
   usePostgresql = cfg.database.type == "postgres";
   configFile = pkgs.writeText "app.ini" ''
@@ -57,6 +58,13 @@ in
         description = "Enable Gitea Service.";
       };
 
+      package = mkOption {
+        default = pkgs.gitea;
+        type = types.package;
+        defaultText = "pkgs.gitea";
+        description = "gitea derivation to use";
+      };
+
       useWizard = mkOption {
         default = false;
         type = types.bool;
@@ -203,7 +211,7 @@ in
 
       staticRootPath = mkOption {
         type = types.str;
-        default = "${pkgs.gitea.data}";
+        default = "${gitea.data}";
         example = "/var/lib/gitea/data";
         description = "Upper level of template and static files path.";
       };
@@ -223,7 +231,7 @@ in
       description = "gitea";
       after = [ "network.target" "postgresql.service" ];
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.gitea.bin ];
+      path = [ gitea.bin ];
 
       preStart = let
         runConfig = "${cfg.stateDir}/custom/conf/app.ini";
@@ -253,7 +261,7 @@ in
         HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*")
         if [ "$HOOKS" ]
         then
-          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${pkgs.gitea.bin}/bin/gitea,g' $HOOKS
+          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS
           sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS
           sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS
           sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS
@@ -261,7 +269,7 @@ in
         if [ ! -d ${cfg.stateDir}/conf/locale ]
         then
           mkdir -p ${cfg.stateDir}/conf
-          cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale
+          cp -r ${gitea.out}/locale ${cfg.stateDir}/conf/locale
         fi
       '' + optionalString (usePostgresql && cfg.database.createDatabase) ''
         if ! test -e "${cfg.stateDir}/db-created"; then
@@ -288,7 +296,7 @@ in
         User = cfg.user;
         WorkingDirectory = cfg.stateDir;
         PermissionsStartOnly = true;
-        ExecStart = "${pkgs.gitea.bin}/bin/gitea web";
+        ExecStart = "${gitea.bin}/bin/gitea web";
         Restart = "always";
       };
 
-- 
GitLab


From ce42182d13db1721d49709779ea6b3f8a93280fd Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 15 May 2018 21:17:51 +0200
Subject: [PATCH 1008/1085] nixos/gitea: Add options to enable a timer with
 optional interval

This will run gitea dump and create a backup file for gitea every so
often as the interval is defined to do.
---
 nixos/modules/services/misc/gitea.nix | 51 +++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 9f7e1ea8c49..2d0f66de037 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -164,6 +164,30 @@ in
         };
       };
 
+      dump = {
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Enable a timer that runs gitea dump to generate backup-files of the
+            current gitea database and repositories.
+          '';
+        };
+
+        interval = mkOption {
+          type = types.str;
+          default = "04:31";
+          example = "hourly";
+          description = ''
+            Run a gitea dump at this interval. Runs by default at 04:31 every day.
+
+            The format is described in
+            <citerefentry><refentrytitle>systemd.time</refentrytitle>
+            <manvolnum>7</manvolnum></citerefentry>.
+          '';
+        };
+      };
+
       appName = mkOption {
         type = types.str;
         default = "gitea: Gitea Service";
@@ -326,5 +350,32 @@ in
         name = "gitea-database-password";
         text = cfg.database.password;
       })));
+
+    systemd.services.gitea-dump = {
+       description = "gitea dump";
+       after = [ "gitea.service" ];
+       wantedBy = [ "default.target" ];
+       path = [ gitea.bin ];
+
+       environment = {
+         USER = cfg.user;
+         HOME = cfg.stateDir;
+         GITEA_WORK_DIR = cfg.stateDir;
+       };
+
+       serviceConfig = {
+         Type = "oneshot";
+         User = cfg.user;
+         ExecStart = "${gitea.bin}/bin/gitea dump";
+         WorkingDirectory = cfg.stateDir;
+       };
+    };
+
+    systemd.timers.gitea-dump = {
+      description = "Update timer for gitea-dump";
+      partOf = [ "gitea-dump.service" ];
+      wantedBy = [ "timers.target" ];
+      timerConfig.OnCalendar = cfg.dump.interval;
+    };
   };
 }
-- 
GitLab


From c0e2f7bbbe8344ce6abb19b74f69336426c024e6 Mon Sep 17 00:00:00 2001
From: P-E-Meunier <pe@pijul.org>
Date: Sun, 20 May 2018 11:28:19 +0100
Subject: [PATCH 1009/1085] buildRustCrate: add extraLinkFlags parameter

This is useful when build scripts do not apply linking flags
---
 pkgs/build-support/rust/build-rust-crate.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index e0aec6e0e18..5c738dd7f0b 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -47,7 +47,7 @@ let makeDeps = dependencies:
     '';
 
     configureCrate =
-      { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member }:
+      { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member, extraLinkFlags }:
       let version_ = lib.splitString "-" crateVersion;
           versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
           version = lib.splitString "." (lib.head version_);
@@ -79,6 +79,8 @@ let makeDeps = dependencies:
 
       mkdir -p target/{deps,lib,build,buildDeps}
       chmod uga+w target -R
+      echo ${extraLinkFlags} > target/link
+      echo ${extraLinkFlags} > target/link.final
       for i in ${completeDepsDir}; do
         symlink_dependency $i target/deps
       done
@@ -421,9 +423,11 @@ stdenv.mkDerivation (rec {
       if lib.attrByPath ["plugin"] false crate then "dylib" else
       (crate.type or "lib");
     colors = lib.attrByPath [ "colors" ] "always" crate;
+    extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
     configurePhase = configureCrate {
       inherit crateName dependencies buildDependencies completeDeps completeBuildDeps
               crateFeatures libName build workspace_member release libPath crateVersion
+              extraLinkFlags
               crateAuthors verbose colors;
     };
     extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];
-- 
GitLab


From aa1d7961e74ee5b1743b1973c7e52128adf50fbe Mon Sep 17 00:00:00 2001
From: P-E-Meunier <pe@pijul.org>
Date: Sun, 20 May 2018 11:28:35 +0100
Subject: [PATCH 1010/1085] curl-sys: fix linking against zlib

---
 pkgs/build-support/rust/default-crate-overrides.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index 971c4d0f5e2..d82a9204230 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -19,8 +19,9 @@ in
     crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
   };
   curl-sys = attrs: {
-    buildInputs = [ pkgconfig zlib ];
-    propagatedBuiltInputs = [ curl ];
+    buildInputs = [ pkgconfig zlib curl ];
+    propagatedBuildInputs = [ curl zlib ];
+    extraLinkFlags = ["-L${zlib.out}/lib"];
   };
   libgit2-sys = attrs: {
     LIBGIT2_SYS_USE_PKG_CONFIG = true;
-- 
GitLab


From 15449600541f9a2d07ba3bcd78662737a0a56afd Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sun, 20 May 2018 19:17:01 +0800
Subject: [PATCH 1011/1085] firefox-devedition-bin: 61.0b5 -> 61.0b6

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index da5dae5f3f2..968b65e7247 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b5";
+  version = "61.0b6";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ach/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ach/firefox-61.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "1170b5bd72dbeb60e71b6c7fc3b5865e10d32286a6f8be3e5befc46f45a978b00490731b59c4e54c7a53d2bc9efdc739a17e6605444cdc67eff13f2cacd84137";
+      sha512 = "704a4bb25d1cc2386a63c4883fd43c7a1720387f85f73b9cd4ad32cb41238d4289685ed6d62777b5748f7e18960dca73d7d204d73a335c542ad6363fc2b0f6a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/af/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/af/firefox-61.0b6.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "1cb816e86f02b0e2c0c1a4842b6d1b3cbf3da5b368dca6765555b3553c4b8f669801c93af407b51721216bb0c222da66b2653935246db24573950390672c8ce3";
+      sha512 = "e295c3792c8e179e67e75b0999caffefa4b1abf93f87ef2005299f31188eaf48d75cf2775f39af547ee06b0bb3cc6b472a5bc3dc33e1d2e1b683ac26edaf5a25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/an/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/an/firefox-61.0b6.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "5ed43051b49f887fda9fa8b684bbbfd3cc71112fd3c9c86dd4db476c2e4f667ebf92435ccf5ba8fd9b29591272b609056606df9c88897b3080a1d8e08fdb8ddf";
+      sha512 = "0d358267b73441f5ade02d4e336a08ff5196e353c5c2b4ef0833455d768f3210f7f05a98ba57e279a8fd40cf11183a1f9ab92453ae624aac42242b9cd27c261d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ar/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ar/firefox-61.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "43e25d83401eab86c05da5e6cd9790c3c891c9e3eb584b07738b6cbd151e2552d745b600090f5b3d68812ea67fbeaa9aa64f56aaf97f3676ed68134656fb1bf2";
+      sha512 = "c442173d1a591293dc9716b948b0183bcb935c7a3abc61d4a1f8da2a114e4c9d5e8bf26ed5559e5bab70fc62f5c12d36fd2ee973c0556641788c339c836219e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/as/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/as/firefox-61.0b6.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "b149ac7f1a770a7d850ee2ea4e52b1a38eb540a36340c41eaf83325fe86ea501a5ec97de9e13e194699b41d7cebcf5bee136274bb078ac136d69043d116d58ef";
+      sha512 = "6f1628a9195ab30a6a87275c70a3390d29808242c3916682a9b83fb932687a311a434b67c8c333e1285fed1337ea0c7bdccb047e39cc4c1ae454572ba32ecbf6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ast/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ast/firefox-61.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "7dbc6d9a3df0d735f679492fb278c010da450e7f313550d39622d2480a9a0692c7a4c776c3b36aeccec125cd1c6ea9d7fa3adcf48aaa284f0cf1fca1e2f1e6c6";
+      sha512 = "41c0e5a30ba84746963e2e48c7092cc389617fdef861408d081c6fe75200d14674d7e7ecf1312158f723cb8b860b9e39c9b3fad802eb9692ec00cd8aa818b2f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/az/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/az/firefox-61.0b6.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "62bc34bb261693ff94d5c000b3420dc34cb6cea35a7214789e402851b8ac1b5b8370326168ab54e4c09e2f96f9eee1d9d7971da3b926268676db32318386eb56";
+      sha512 = "2c282319205e9a8d5ad7b74480732680f2addef20840d39bb368be0d47a839fda1d039ad4e7cbdb940b26b1fe2ccb19dbcf9d17527802c8c9e41fcf82dd67943";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/be/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/be/firefox-61.0b6.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "bbbdfd16eaa7bb97dc85495f830833dd9fe6d9411e710e0c9a08b8a7225901e7f9679894df83869d1b80654c6d30e6004c02a6fb7b7b7d2fd706b6b6a0dfb7db";
+      sha512 = "e1c573e1cffd888b2005d667c8423a8cb67ed487bb445b0333e9af9dabd2d8bcbc492d642fd893285464ebf83be6bee2fd4b9260a4cc1e826847d545bef2471a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bg/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bg/firefox-61.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "f099adb83c881eb777c21d8c0ffc01cc8023438f3712836838f5daecc24eaefac791358172a5d532aaab3b436b2958ef194b34c3acba591e9403d34c2b5a6a16";
+      sha512 = "08a3453611833ce773b4cd3a31aec2ec7120eec1e1a87459f165863fcf7ac709e3c0a69a0cb76997650a67a04cae09b2fe7ab2820a338ba040944f81c9417554";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bn-BD/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bn-BD/firefox-61.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "8bab1ef46fa23cc81365c271503d22b09d227056dd318cb7b340c8a5cbe866d8aa241f261a95fffda6bd3cdfc80c5a3bed45435176a1a1b8d427e06e3d1b0e51";
+      sha512 = "3ee61d526e2c76028f808797df0a2fd4e42d856b76e36538abddbbcb7c41949d2146d5c7dba2f5802d143c209ae943ca8d87123ce7bfe7490dd17058c1c32488";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bn-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bn-IN/firefox-61.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "6e7113e561f37ffb33dac74a9511bf634c1bf8a912e3b13a0553a2977d29300b3404345667b995752a82ca785006b460cf9a1088c23e40ceb2516d67c098a615";
+      sha512 = "f5178ef8bd83658f2b097fb0d9b5623ebeae4d715156e355879f70ed13b91e8d20f9ce2bd4fab56455c9e45d18c0f6081b798ce3e31b9a473c40da1366538720";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/br/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/br/firefox-61.0b6.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "cfa60a1fda69464870382ded848f19b4915de27bfee14b34f429094381c7400069c3e6a5651cf8db133487957d0e4d9bf50c253a8a0884452285b5dafcd4cf0b";
+      sha512 = "89c2f4a5b8b18fe7d49333f6367696cf7e937b3e62726753d9339e498d9929969f5c0268fff21738ee20326c89e691c40e95b6d20c4c7b1acfc535d58e681b14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bs/firefox-61.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "e78fd95675dd40877f1767b53e1f05820afc0695e0a30b0e5e344df1d8d5a38dfd3019eea1bbe4f37b09399cd47a5a134f7d984a0a65c35ca93b5ee40fb1058f";
+      sha512 = "213136c869e9a4a475e5af94582190a3e6c25d49fe260a210221571bbd604ada4b60c254dfd673a9aeeb9d048d4ffc5123577f6f7da0b440ba9668282f3d74bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ca/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ca/firefox-61.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "d11928a8807b2d1bf2b03ec7796d9950f5127186b4fdf38d38e6b129488f65b437625a3fe5654c45b134e9585458f72cd7d711c312f0e11acd67c941b3ede92f";
+      sha512 = "981c5d319f67de4c9093c57623d1b5c1e5cbd8f640530c03192fa11db3051ac724e014f139d7bbf96d76440a594ed33e4384b591a882c7da7974105ceef8ba8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cak/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cak/firefox-61.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "233afd0bb1788fa12b7659cfd99556721dea2914afe03d807e9756feff2c4e0749cd8fbdf1989add700b6afbe3c18402c9bfea6343ac7007a19914a2d8cb3c92";
+      sha512 = "96a431cf96e77cb714a31b3b549dc1f7f26416ed0cc32c804f1a139fabce217d904cfb713e7dbf298ff6c42f47c317be943fab26840f9db6a58d675f95466dbc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cs/firefox-61.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "3d4c79999c2aad3a4aa71aecc7f5f6f25879b76d0e19d1f6b94f3d5998b43c89a35dacf8c9d158e6273bee543facd1119d4129c31a8a4df82974b0d6819d94e8";
+      sha512 = "a190976d1e10338ac056a452f132ef042b997ab38e1c9d3c3e36d7ef1de843ea13d59ce28fce89ef25d6a98b3d4c7840fbacd619001e455eb4e3b3812178cc98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cy/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cy/firefox-61.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "2c71544732e5bb89a9296ebcf2f6ac390c9ce438d4ced4f0668ce032e13f2e1fc96d26a8863c7f3979f509171014c600cb8efc9861be35a52084bc9d4463ff0e";
+      sha512 = "2ed8460c1e972535dd0432f25ca83df290d5c9562911df111ecba32e481de72cf30564f653a00b00f8877c6cc5c2c30e6ab874aa5b3dbe6065e4488ed7ba88a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/da/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/da/firefox-61.0b6.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "1dddf978db1709a4f6b1ea71808fad8ffe15efd33eb83865736c9e50bdc4b4f3ff0ef7277408c538babc107d1fdd075cf1563af6c5684f1b98a74a3e5c72a6df";
+      sha512 = "b7c1ccc3a45fd41481af46d6a00ffa7b2cbc2855138d958e65cd95712800d43a5fcf7092de4c79cfa98bec3c64504ea521aebd12b712d0ec71a8d987aab871b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/de/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/de/firefox-61.0b6.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "9ee5faa668ba132eb874f3f0c0e05b0f905027e6dc1acb92d3ed951072d4484424a697c2db4bbc1b44f8815ea1f7ff0b222dc955a837a69163fca0a0c0c192d6";
+      sha512 = "37df705938723ab60166634ca6c781e1b46336e8d076655c2c3fc58d7c1d142ca74b8500bc19ef8b7a2fe84d59f3600371c7e1ea6a445429aebc274177afe601";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/dsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/dsb/firefox-61.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "b36ad6e52f18ac6e28a646b296db2119306dfe64704a2e6a0ebc4480c743017909ce38da8ebe544298db4dc290949d51734bf1641208a84d84d4d4d88f68d2bb";
+      sha512 = "9b1efa7dfce319ddeac50c6dd732203ca5e1dec1cecfb1c2fe817d1711ed4821d8afb84b7ed4d7056a625fa08909884a08740b955cbcca696459b4c5753eaf03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/el/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/el/firefox-61.0b6.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "e8cb2fcd5f3ad44db46235593e1557ddf3a73c1a3440c67e43b68fbf8666cd5673be4ac84ee580088fbab536e301f3e7b6348d20ce6ba216df4bb2c2634ae568";
+      sha512 = "5cc23cefe43ec331472d25b276e2b23043c36ea27b53f574a6d159c896976c8f188933b5dc830fb172b499e9f0d371023c588eb3be72ae4d52cdf6683664101f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-GB/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-GB/firefox-61.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "9028d5fc39cbfc454d12e24164f27e8781801c5ada6806b2c67adc0c9c5540d1930172cda78b25f3c1dcf96a6f53c8934c11ae0b4cd4048ee62f9c4d487e2475";
+      sha512 = "a8df584f07439b1d0e76e9cef7f7017a32531039a9ca57c35a444b06ab67aa6aa7727b42a16b8ab1567dcfc60a75cabcaf96a3dfbfbc2d7f2d338bbf2037b80a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-US/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-US/firefox-61.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "25ba55bc0025c531c1ed596355e5a0906cbd87959ec8b3a598827810cfcf5fb573dd572aae85e08db890ae6c514378fcce98eed1362a8532312f7f26ceb8bc3e";
+      sha512 = "3738b5a31f81615c013bd0b917ab9d31348338e371303794f133297dc17a32fa5be5d1d61a57f3a6b6103fcf8c34614eee3a2bca45114271a7bab7f03ae7665c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-ZA/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-ZA/firefox-61.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "4ae8604917283517e0d7a94f13506c0ab68602674ad3378ff67a0cb78027a78f457225b54951dd11e471d0a4ca67a6beb378d0549f1436e2de59b4a352082c34";
+      sha512 = "e9efda879e66d1ed364075db1ffa11ddc1db4860de17d4c90c5586e33b716541af3e7c4716c98becd01809bab85444e933de877aef7714edf3b4fcad4fa61ed4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/eo/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/eo/firefox-61.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "91eb963b0fd032e02227612d98ec6693bc665d783448163fb5671f4af23c05c5c22199ebefc361f671b880aa23967a48e07164316c97433fb52ad03534363d93";
+      sha512 = "c46aacefe49d734ffb9dd885053c45102b4d8ac89b0babb45ca3bdf555ef854ea41580e59c3a2a3947300d15f273fe3f71aaaf6b05b74c0a67f3a8c1ab820c4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-AR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-AR/firefox-61.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "855bf9dfef4703d7bf4852206cc6103752d537370712db513e40ccc9fa708bd15689ee415da163914d3b5686d2ecc0ba696c9ebaa66ea0a7930401ebd2f373cd";
+      sha512 = "b17c0aff399b62ea56cf5e546ea07637156ca631dde0da47a0a52e55ed8d097d1611c4f1571c232ff256e1092496f601e224ef20e9aa0b03f42643fabb5b7a39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-CL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-CL/firefox-61.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "6a23105b44d81b403ed01d46ced348c5ed5704e517b098404546a5ba33dd68c4dc631146a9e16ee0a55cb7ffd8ff320074657db53641f914193d338eddcaae01";
+      sha512 = "dab6654be6f4f6bbdd199151375b92428f2720ea69a861198d233af27ee1bdb822a5890d0cbb5841456a1db3a8691e85cfad86272b61439dd7c2cdbfb32531ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-ES/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-ES/firefox-61.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "34f7dfa2e7711a8520246efaa3629ffa783f8a3cc67cb19def9465ff4c3a3abcea4d1ce1df2ce9c65feeb050d2a27f21cde9d95a5681b61c006ef21c4d412f39";
+      sha512 = "76bdd88222fa792374cea43ccd8454042937c99738b0ebe79aca175256df29a7a8c235c290a1bb408d603ca57ff2efe13d3571a526d5e5b542ca6f9b7560097b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-MX/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-MX/firefox-61.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "269af8980bfaf7db00aec2d385ec0eb44ba5836de791f698540074565bbf1c9ded54cfbb870014fb418aa3b451ab6fe3636223dae4ccf437a4d68c9bfc8dfb15";
+      sha512 = "0cca4ce5f283ebee0d5c0632cf9c951c1f29eadc84f1cfb91ece7edc47da56412e9918d3636d21c5d78993d8a9382c8691710bf03a68482e792bcebd10713bb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/et/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/et/firefox-61.0b6.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "65a0740c37a2b09650bef4586306bd6139eadb43d4f3743c7ff0c47293e77b7fcf74f596b1982305b926a66277224fac3d1a190afd1bf2146503d3fafc8f3e4e";
+      sha512 = "4c80a265ab9869fc20dd5abb07e301de954f24acb870c994e100db0f27ebf32b0f55ba10e954269cfc67e39fe1bef73575410331a941b4e0cb465e082954fabf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/eu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/eu/firefox-61.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "17886662bb27dc76002702ef99e3923a52f6c0559d8c2341e09105ae6ef55bd3143961964db46f0a5c8738d9625ecddbb3c65bc9ec14f9b669be327dfad5aaa7";
+      sha512 = "4cf191a8511cc954077698ba057f29390cea82fa3bc0a774db8a767a8d9139bd481bb8c37ea8083d1d5da2492c2404de3f837f5508238bf3325c7aadc63815bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fa/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fa/firefox-61.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "82eabf1c23e28c5c9f628a4dc3b6ad73568228422b33665b7fa9b4666a4defb79cd118072e0276a314b4f5580317478e6f2df4a28d3ad8a7f82f87b0b688160f";
+      sha512 = "c86ad85cbff328e4f213e25217348acd4fa45ae531da88d9282f611778d9effea05c25648cdfcd0ce3381d5124ce9f3d7b61c815a4074fddf89c713f9c8a25c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ff/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ff/firefox-61.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "e8563b0d1722fe1323ce27418fe0f3596da9fcfb9cad18fb3c09ab31ea86aceae7f91a64aa0511d98ff883e4bd27304f84570271bda13290b5716cc66761f50f";
+      sha512 = "4b05b4e17c851558c38ddb474021d5f94677c44fdc9c0040e2a575bc44af4952ef5a47af57a00f02026d54e24443c903dc5015d0aceb112e496b77df596b3e66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fi/firefox-61.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "4c439ed929ee67acbc9c58428fce3a47beebbb6ef1e4ccd89609530758f113aaa88e8051503fcf93b665d702a4840ef5924640019443a1ccfa844eef8b2da83f";
+      sha512 = "4c11b960a01d68c7d9c21dc7c76a495e24ef22e1f8e41df8dced33cd02456c8d564b1bddf9b06888f149c882fec1ca1533f9bad3fff0517b4bf6dcfd34fb6f0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fr/firefox-61.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "0184913e520efefea6eced2f54af3ddf0f0f19f419ddd788471c9bda3429d732af3dcc281c45a175fa904581f48c5f70ac0a9fb28d2a412aa4d81aac97255142";
+      sha512 = "88ea1cf62e9c1ca08e63820517ef8ba17c977df901e63a5c8476d0ed178d93d7ba06df55ea405262f117a8814c096897c637728401142a0964756b44ebca981a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fy-NL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fy-NL/firefox-61.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "a6546691dc61bd7023a61c45bdadc3158e6362185b0b3d4ffa20195d1e67d3b48856b557a714c813f1b389176d835683ac52dc1cccb8b08bb04fca014a2e380f";
+      sha512 = "dde3e01be8ad1e3453360771dcfbadbba5d8e171308c217da456cd3e217792089a7f25e7a320d80ea2f81c658191d623bc6bb52ea4c2e177335d478210f168c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ga-IE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ga-IE/firefox-61.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "d4cd72a92c0826788b886135ebc17194ed265cef4cb9e1d288e27638f7467ef34f8f2be6722306472e8bf62e54c11524574f21a7d5ba97e2074daa7257d1b8d6";
+      sha512 = "409fd20d41998df4e86e2a42f2054eea525fcdd47256e97958b8fce4d483ee2e35317c36f91aeaf9f597df0d62cb84204ee1822a099f1ffaa3995dc02d9606c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gd/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gd/firefox-61.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "a7fcc96ac456ca06ba65134fea19469c3e1b725b3bf9683c3d6bd2f9a3aebc5a6d306e5dd15a2e05e58e4b1e06621f20a2e446a3395cdf8f20f1a7a92d1abeb3";
+      sha512 = "1adb25e8e9bb44ec79f030c789bbdadb2c2711c9cf89de6341cc0b7590da0327d865c90fb9633651246431ee8f2b80e90f58f67692595f26cb53c56c6a7a2d50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gl/firefox-61.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "1556d99780c2c9b0f8b99fc37c4299322d518cb22486ed1af7a778a7f3979acfa47aa333a65daf337193691695fc7101503c81327d82a624bcdaeeecb6ae8b6f";
+      sha512 = "cfa3be244a4853dcabe6e34f0fe8dbc2d940ccb89ce92174f6d382574445e1debaf66bda9760752a15f4db74d017c9d277f6a865d32f459c9c9caa9ed908813c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gn/firefox-61.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "31e0e6c4bf116ff1a0c1b5d7c6548ca3d629cc07ffe83c2ac82b7c681321aa57227ca6c89a28b83f4ee96ed9739a47d83a02eb3782cdb14480b382dd46ed073b";
+      sha512 = "09683ea1dba929c74372c15b943c5609015c88a77b578d7f3e68bd9cf94252cc9289280fe8c5d93315551cf662460653d475d64ab7d3c188e4c89b47ffd23c21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gu-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gu-IN/firefox-61.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "f0fe6026339b49d59b8208e6e97d3645be34b90c37152d76645cfbf14a418a97d37bc3cf3fd733a41d085b315d5c975cf88521e7f85407b54ff83e8ecd0ebf8d";
+      sha512 = "ccc6bbb0513f4dd8df91bf09f58bcb2f75de28f0a33da70bc6bc688f409651ab1a34d88f0752eb30afa450cb412e34e015cba8aec7cfbdb62dcb46ed2bcfed10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/he/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/he/firefox-61.0b6.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "32288fd8ead53b0eb74621301d1d0f6ac9c66845b65ecc5258d2f1c7e913e83a25843268e6ded535c81a7b536a3112e58f0c9f70d39b186a6726c119dce6ba8a";
+      sha512 = "d5ae8e88f143ada1ba42a90c0ee2d20655204a6521fcd8e5e286d666e5e7203ccf7c5dde52df5e18ae8fd55def74a4a2a8bdcbe681a7addcdda3bc026117e2ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hi-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hi-IN/firefox-61.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a398763f1d467b6d98b864afa84113ef59ccbaaaeeb7e730f65d8d898a534e910b775cfff1088ddac4cb7c0fc714be2f98c6b7df9e30a751fda1f3727228c51d";
+      sha512 = "8e7d166d15f00b71be942987f964ff03499efd677fafd58d6c607b53fabd866c7666228604c461252a6d30b417d31494625fa829e3947d67069769eb2bff5c1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hr/firefox-61.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "2cc3e64cee65d4ba1d4a4e755430664959bb5726d575062d2147efab9eab7c67797c6236367456e105b227907171bb169952ed18a0f8513677490cf065981e16";
+      sha512 = "2cdc4caa3377dca66e72cb925ceb201c2726e814aa12873d74aa2daba8c5546a649c5c2fa5e953bcf6265d642bd0b7fd5df3e7ad181190bbec0b5a626eb8ff89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hsb/firefox-61.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "774f60494af13245f3642120b7401fa3a9a98dcf53b4482141963f7458e6a1be4097161938a3aa2bb67940f0dd22f4ea447098d907d1dcd55b11bb89a278108e";
+      sha512 = "d7ec91a65762419d7ce8e7d3fdbd19675b19e8441fb36f2927d89eb1e7143a3797846fbca1ebb0a5c78a7fa8401f09a0be445eba159e1ccd722e0a4523201675";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hu/firefox-61.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "dcd4955e1a61bd5e90e7b26dce4daa71545b337245a42b44ec5af9d7a9cd455b4892cf52f219b370a974d5d296f1d93ad7625fff45292fa7711bf36139327799";
+      sha512 = "0cc5216e10d54635b13686bcacb59693150e94b9d2aca544ab077860a1d51554d86dffe38b6430bbc722b66335cbfbef878068e56b2464b5e3f76d96454eda21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hy-AM/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hy-AM/firefox-61.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "105efbb4f846c61777b3717e377167e5e3dddd50804c52694f4641756baa2350f54ea01995deeb0a751b23619c55b1806cade1ba1c3cd7f7cbba23206fa19f7b";
+      sha512 = "05f4b6419eedd96b327d2d50da249a699ca5bbfeb42fc5dc58c20a87e30280f99dbca8aa4eb803306abc7eb02f42a2bdbd2dd96e5553f21e289ce5e9cf83c58b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ia/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ia/firefox-61.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "2ef057899464c031f224b0997138dd1611aa0841f2ef2f611d8e2b9ab3849bf94e287b4ea8e08e905f42a92e15f9023c592a454d56f4ceeb7a8a87ff99c0b0fc";
+      sha512 = "59a093c20ef9afb1a25d0b7453c532558209abcbbdf10dfd20c4dde8a642ca4d7c4cbad912756b44565ab9d85b5bb33750e5d8c4636feea7b8a64576edeb5220";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/id/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/id/firefox-61.0b6.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "9d6fbb4afa5255bb77daf9c99412b8bfe44a9d841eb1940e18611e2480da2f7f4fd18452c49b53880832ea671967699de9a467405cebb17fc268ae3a7aedce6e";
+      sha512 = "676e9384493d7c93a3b87031fee59282c51d0325374e989c7a505f4fff7e8830fd47b972008005566c8bab81b3b1cebc24540b4e886d2d9e23e7999edd8fb373";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/is/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/is/firefox-61.0b6.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "a10300126f8937686d03c4acdc5dccd9570d7de29a25021fdae22d03fb3a87baeec45f35bbb3317888a34f3282e03b2b6ae728743863691f4af691d8071ab567";
+      sha512 = "28bb39d6a8d6dd5748488f950a768e7993758860a6f1ca9e4faac044b3bec6e243fb24bdbeb650139f55105690e50c4415122408e5d3fdf5a491229356c0d726";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/it/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/it/firefox-61.0b6.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "8b948d7c34a13556246a2b4b70383ec847daa70f623e121449e9aa380a709e38ef40e9f864a3cf7613ce549876452c880dd2438d75315a3c8eecc3ee3230862d";
+      sha512 = "24ff512326db7e876b3c809163495414861ccce2498a61c4408e5712b21fb6be140230c2ee3c2c66925dcc2d6a9a554361df298e682c650758e116a6a8cf55db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ja/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ja/firefox-61.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "dcc93cdce7d1d783478f85ccee378638c206221efb5ab5528ac2387d9afcea0a58370bd84668570902e03cb06aafd580cab2121d49167ddcbb6ac5e2803d6cb0";
+      sha512 = "2c8fcdd6232a0b143e353a243df3d204209456f26a36e137801ce6b47b18c71b9b189416f7b6d42b9b728b573c390912b9e4b02a39f97bf48d73aa930035f01e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ka/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ka/firefox-61.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "8de7b0c54d5d05da9598b449015d505813688f1c448a572513411acd9aab4720c03c15d6d342f84255cad7d2edc1891682e0398b9cc165e812704bfe9e07d8fd";
+      sha512 = "72879c15689e0af10799c91bdaea23393830edef94cc6d7c339080a519fce2bcae61d5ca213e3dc1d7d3692f17fa86e009fc7b090af6bfb7b2a91e00853347bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kab/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kab/firefox-61.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "d8fcf05b0072b03336b67df81eeb16442498345e624cdc68fccecec07d89a39df95b832968c1ed0108c0821ec71a89757d62fa9657a451f11fef25b0da90f918";
+      sha512 = "d117382ac21895542da8a3f5cd713715a8ac1f4b24e7ca96c24a79301a9af0be683c7d95f761cc4534a7ce71bb9fab94a766dd0e1f135789e0fd834910a65f06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kk/firefox-61.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "13e135e31e44bd08c784bbe5222f14e220579aeb1981d1d91f0baf67cb32157499c6de4be1ac7086d001ad6b36c6adc44f32f4a9d8f0aab727cea8fd60937e04";
+      sha512 = "32375c57103208e9f62d91c17799692ff5cfa675c338517a18f04aca6fe9846e768f334560591996ec225ede29fe74a8293eb2a61f7ed4ee3bfdb0238cdb354e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/km/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/km/firefox-61.0b6.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "c99b28303f9deb522c9e06e5c858316314638312607b64734ffa681aedba9427c0911810c87f286f1a785b77892e6e38a2a1eeab492458ff8b9a9f87de635577";
+      sha512 = "4ebc73c69b461bd5aeea6016f73cf7be4277e0bf15b21f950e219fd83ceb9deb2d950aec0bbe8dc95799756e892ffc97149116ecf78e6e28aeefbf090a894ee6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kn/firefox-61.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "cef5bd55f8510f3ff865fe8e04bae593badabf59ab9251a336a886b5af9f91a83502bb612efa8b0b295f18ca1b42da75cc3d328bd1916a10478de847591792f1";
+      sha512 = "095187047fb6336cfb2be22d65b65ae6675661a6a806eb24124025af62df741e004c93406e2dd2a130cea1fd9f97168b296329d5803b13e0d9f7a8c1fe032fab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ko/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ko/firefox-61.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "0bc85a9bc5b4284db80cd18d414fbe49dafdefa58f62d7c0b83a06a1e0c6028721f7d2624a1a4d948df16bc316259fd27ac2766a55b1989f37f52f8fc9d8c517";
+      sha512 = "bfaed831a5d4f68318cfef05ef0b19611409c4712fc41d62176684b322811055802103b0c0062e88218d3aff5beeb395b3e0531dd086934bb19aaa662e0360dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lij/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lij/firefox-61.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e35e81dc05f83f371846c9d31bf62b69ebf4ea28c6e2a53821ea6509b4da8d575ea7ed616d546d900c0559d2da7280e51bd7223e790b161787f9ee85e2fc11bd";
+      sha512 = "2cf29ac5eb6923092a42cecdef22d399101eac90bdf0e587d608ad03ad10a840068efd71e93e1b940960c83c901cf21ef8adcc43616a59adca94aa507cf5dff2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lt/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lt/firefox-61.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "9e8ff522b661912c1d6cdc440015dd23ee2768aa159c157f29be574baa8e74760311e623c6e9d3cf4e23363b5f05a5d3ea74743b6f95b256045418c21e904194";
+      sha512 = "3359db005fe95e03b91c313867823dace52fcd3919370cff910802f64083a22faa0e17d68c64432985b5acb086cad50fb7f92f176529d8ed213d5e7290638f23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lv/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lv/firefox-61.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "f6c1dccce1cfdf0b92dfe076e9cb131763ac72bad4d12610e7baa74ac690b25d567c796b8a3509ad7b80b2b44a87bc0ef41e52134d2699573772c851b3f04cfc";
+      sha512 = "2a50c3cd3b0a56c22e07395835dd2d3e89e0adbc43f6db42dc3c837d08c5c5dbad6b3f66a3942c215a7b889046aea7d2143b0afbb2b5ecab62dfb4e9511ddc48";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mai/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mai/firefox-61.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "65db4e9da91fa1033ae5efd14f60ffdaf6b1730e9f51f4bea7142bbe678118db19098d0e967b6ef08b1531056efa584cca6519aa0c5c490008ca740db6a8c50a";
+      sha512 = "57e11ba5a7815dceb0d14fae9b89fe4525e2574fbc7595a3d211b7f85c6dbb5c2cace919a58229168540c68301bcb3778e53699457d81ab5b2be1a920d0b4150";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mk/firefox-61.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "0565dcf2e97431b5ab728f8c73e5b26e9a411f26d712c3bfbf9f61cc7a719b2a38578b13f2ab8ba5d1e054a59b9e1eecbb5a39cd188c772a7d5dc57678b9f334";
+      sha512 = "d61260e8310e4dacc0db02b09dd3e5259120ef6087b718daebe949edd0ca19dc58a2a7fb80d0918026723d07d6ed61fce4f76de2c5b2b6fabff6c0997d3aeaf3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ml/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ml/firefox-61.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "6573ca6f2010c57e9a6aed6d6e14587097329e1ae144b4bdfff0b0e10d0cd7a0bcdeebd702460b9c4555480c81e5244f0eafb8592decc7d92ba8785bb1aa6107";
+      sha512 = "56b89b7da88988d8786b41ed8ca92a88b27f3ef6f1bd11930704b6a1c4b1a385d7ea89c647e9419e18be6e7f312e8141f8a91680f3c318cc3262a24c1564112d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mr/firefox-61.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "c2b613252726a185af0acaa181c455d0e048f3895fc9b4c781f25ffd8496c43d32a3f5618df653f79bbcc403c9bf869df327fa31463515b5fafcdb7463f01e9e";
+      sha512 = "9437e094beb55548663a12ffa9185f6a221b3d181aec779818da786ecb6a2127530b28443e0d27f92512417fe6bb775376291261706932baf4b098d4b2af4a40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ms/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ms/firefox-61.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "517370bf3ce8d0ac8fe765d93b47680c65698c4de87504d391b67b8605dac7f1e55db38facb8dfc4e35187828d41a63ad78b4d2c43cc6f2849c1d5f9fbc4e2ad";
+      sha512 = "6f489ca999a25af54759eeb46cfc47984cf824257256148abb058b442c50c32fa1d2395ca6222ae20ca12f49363f7c99693edbf01247dfafea3be034e19855d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/my/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/my/firefox-61.0b6.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "8c84e5c6e4106ff4118c124226ab0aff24cfcbbc925196b9c9a7b636ba975babd707a14abe2c5e0bb3afdd00d098d75dcb060a448c00f113e4a33c0cb884de66";
+      sha512 = "a367ae72ffb53e3cbd3bcbe648c5eacae9b360bf2f53070343ef72a18af28b858a1f0a65dd0004f71e9daa05705f5d915d9d3ef1ed863470be4d7074ca078ced";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nb-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nb-NO/firefox-61.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "58c2d937db74b8eb0335b9e3dbcf11bf0a1bc8bfe9e5ee55e9e3ec6cd9a7f16b23e48d88824c2dda3d7f1f1175f0036757f0664aee8d60a9aacaa2e559cac616";
+      sha512 = "d18e1ea82f688a95b0c52b88e5cef69d49c0ff57b60a44aa8e2244591bd6e7663a7642246c6f21f53a5a4620e4d01ff86af4ae155b6312aac05e612d5fbe54cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ne-NP/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ne-NP/firefox-61.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "ce54ff7f7a4ecacd7ac73e48fd35e0b39b96a7e85b184f77ff1ad66ee3f6d32407ee58ca882afb2cbf65673d9e868f8a58962602097a40f5b0ecd5ef0a038b04";
+      sha512 = "f27e68805b72906d39016588d4296b6a59089a2f69531efac383219f53fc1e9c8a45e875d9939fb9aefc971ca6f9cacc85b477d9b8e21c5fc9e6a58bdb086088";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nl/firefox-61.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "e3bad92c631d647fe634b468c27ca1e2c81a69d14ffcee3a32d41d2d21d95f7196b2f8c426e51e81ea4f920ee0983290597e0b1edf68e182ccb7d87528da49b5";
+      sha512 = "2f211b812c5325a7a59518fec88f6c497977068600d9492263cb5e0427d2aa58a3eb5423b42747bdc88566df30b8ae68fbbb5accb799893b5f9a939dd8f55047";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nn-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nn-NO/firefox-61.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "470d3662816ee35e6af0237ea6b9105483abf538928ec4cf329e596fb7c7b6e73ac6b7508e53e33cbbeb43bae1b115562d7c8c03721fec6ef0e3036576810963";
+      sha512 = "ca396a60641ef8694ab59753279b5770c264eb2cb25712b939cacb0f1ae6631e36ccb33f714e69dcf18cd935e1e02c6da0b064359461f8c7aa1fb322010cf31c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/oc/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/oc/firefox-61.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "35711515d5fc70e8c6c54d2e5f31b34cbe98f8ef21bd25135f64332edda1e5c336c24403f20b4443999354caacb3066b805d66ac7b7f6165bbf3bd748983702c";
+      sha512 = "0ca1a0febeda1e04ec3384dedffa72f731b18a6fb4b2345169d90f746c3560feaa59808da8ae7afc1ed0f08b3db6c38940df63574e1aa662ad493792bb71ce46";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/or/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/or/firefox-61.0b6.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "21475be0c1992ee07b5a2cbfdcc0cdd25245c995270d93ee08c1f6bd01003809712af71edbe7be7254acc83cb930c0d26aeb49326aefe6041b3aa92169f2db65";
+      sha512 = "b4c640bc03720e2c8147b3ccabd2e0c7b493cf9f06d6a11d2f45812b33c7d066d4788aa90e6b3e2d84b7a7618db5584c97e8097541c45f74e76f9e7a01d1d516";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pa-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pa-IN/firefox-61.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "18b75e3122bc57cd01a98f81d922e325a7d1ebd56b09963a071a14d05ba679d51e251f0d0e11a60c832c21e5022cf3a6e1a5292a525ab53e4c2c5b222a3442ea";
+      sha512 = "f13fc2bd42de9cbaab6a2ada2bcf8c27e277682ac57bead92a69e5c5824525832dd1e2f73aba3b1534110243dd11f9d95e3dead358211bc25e008dd09485f10e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pl/firefox-61.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "687465367d3498bab3cbfe31da5b0b4c31414d75d7af605c9873d8d2522d8502d3dfa271334e5045537b840e452f6dcf65a6f675c653cd07174b1bfdc6a95738";
+      sha512 = "5687c96c22796a75da37efc565a0652a0f1e2f470cc55898c5aba6bd399f4dc8a9097682fea2e2a1037bd6e100f3ad7d869b061a24c78fbd4e5db7eb6d938b4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pt-BR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pt-BR/firefox-61.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "47e5866860fb3bef65399e7e3015d2486bbf427970107c449122b6c613a90af7d989c352937c39766e5839dd6c3fa31bec59e52fa013fa983a64125a03be228c";
+      sha512 = "a5a75325e98a510c506e056f6e1096ad8d0a7f4788ccae27092f407058a17aa15a34eb600820a723b4266cbb0874c90d6c9dae9cdbc414611673c79f65b443cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pt-PT/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pt-PT/firefox-61.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "d33b77c954f66d0c575e7f2cf1c72e0a2da7ad9faca7c8934f96f8c42261f2e2c868378911eb7368ea05dd3a63207eba4cbfa89262943f2e551920608e0fad9f";
+      sha512 = "a79f703d41ca518ecb31d6dfafd776106ec7d3423f9041507770f41018cedfa71fd6315b2144e2bea4c49d83c0bcbe9cd5c57e4afcf30e04884eda252eb067eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/rm/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/rm/firefox-61.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "439df5fc87e7400c428c9e3c221d28b23df23a380ad18f441b4ef97149e473fd63185617769217a0fb20dadc2cb8277a9163b95ce580e5c7ccd308acdad70c71";
+      sha512 = "fe1a0700221b22afc1cbcdf7d726941b80be80d96ded4342cba4c9d54a0c6c8b155a879215e5f83d19471bc306cb2311bb731337ba260d0c7d537f9406ed0da0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ro/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ro/firefox-61.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "035eb9a6dedbaf84d3ac03afb68884a1431c37f0faaff9c02679a3bad24f50e22ae7b8dda1d552c8f50ab267446c32435ba18c06afd8a561ee763aedc323c7fe";
+      sha512 = "6cc3966907c92b9e0fcde5adc6e107782e5857958514206b4c25859491f1d864cc2a1ae747d0fe8ebb7813a929ce73b3e66f18cc139b661eaec2456086aa98d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ru/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ru/firefox-61.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "2de2fa51df5a6bb63124f83b976c9f330122b44b407716f3db83465dcf998c667af33ae86ce63989099e92bd8380cd216f82d1ebcb327a55053e31902d4e0923";
+      sha512 = "18fd6dd3d3af822e71499a6517517b5a0e3a71b92883e37f668c2311e5a4b56bde0ceb2685e947ae2edcd8c481a3c3308cf5d3b5d8f0da92107e074614943a05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/si/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/si/firefox-61.0b6.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "12ef4e53dcdecafef1446cca82ce7446ad9aba0af9a4f8b83155d8f1a4447a3630eaa39900fb52896e12941d2d9d2a699a1b2c848d7a08ccb3c592a8c0eb5beb";
+      sha512 = "8e7ff27ba8b2205691c280e0e61e20dc67a00f37b7c5a40b1619179f1747aa76d37551b4d3d10323d521c815b01082685395dc8d93fcb8fe39de8dc2a12df917";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sk/firefox-61.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "129d2f2b41066cb2a0c476d6f75293ce70cb026d525334ed1218defb0a7dd8c432bef7564b008885a6fee277c3d41ec4015940c740e5018b1ccfefb7ac1df50d";
+      sha512 = "6470e39996855fbc7415b637965ddd954d7e8fe38230c5c9d5c7838f9a945d52f03aafce1015c30ce03b8eb49b6dea2f974068518fdb818213b91100cb98eac8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sl/firefox-61.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "8d0d9a27b5426b4cb6908fbb02c26fac6af6564073d6ceb94fab9f4fda6786f41f0cc8f115be011bf208c3625ed165eedfb69935ac9fe190121f515241fa8a12";
+      sha512 = "b900a63c29c0d8251419eb87b700392ac3504fa49ccc732d181a63cc7b5a3c26f0480b64348823f0e6dec6beab126c3c610351abfcc3af5bed85cd655057cf5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/son/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/son/firefox-61.0b6.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "50c6208d9254cf877644c0b409c699a9b7de393dff480c2b6c16fb342de978222c87e5766960e045d2b860c47058b5fa59a52a3902f55169723783ba0a19a57f";
+      sha512 = "867a9ee9ad08b33936cda12edac4de00e1c5b27534ba65a0f16ceb72b2713b1efcaf31c058abe1a64f296e3af2554a9f4c38337214a4f503552dd3174d6d6513";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sq/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sq/firefox-61.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "ebdf94a268c03eacdfcce2b5521d3e721c3487c1eddc80e2783bc210031a0cef484bee4d0d3622ff636f7524c0e9f294b0fbc0c9d7c6ca9ef9d793291f97e4d9";
+      sha512 = "0d65e598adde1f32a52250701f511993789c5ac9e68448fa5c7041a58714d2684617cdce37f578a5d2a498ea09a35af814d5b06871b0ae9bec8a71bec8bbbb7b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sr/firefox-61.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "579d7bcc6d85b375b9443df06813d908bbe30caf50897d22f958c564acba2aa54cc4b8671097c7d094ef0cebf32f46d88de7ed748590d70063445360b73441fd";
+      sha512 = "a6495f122a2b6f07eefd8e29807155f381d1f89f3506193551fcc5d8e0f9d1943dfb5ca18debb24df965f1d1db856d6aa0dadbe98c2bc02671567573743f66d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sv-SE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sv-SE/firefox-61.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c68d38b7f7e665a53c4d64d92bc88d7dd2254dbd8ad3d52e4dbe463a04186e54f813bb455c9cbc9e6451c8752bcd1fb5ef22cce5189fdf2c238a7713b2553f4a";
+      sha512 = "25a81d4749c1d95e36675ce329f7ff0222a1dc324e69d01681d39e1bc751355e6928b131bc345b50517a45c2dc3a1ed03cc7e9c82d8dc3a169796b31d4470ecc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ta/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ta/firefox-61.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "2159f5a1d5fe6e5adf10dc575fe0540a2036bd26a9c0bbee7f45a0b582bf0ba0515a474f87ac6a7d7f79d743bea37e51cbd2a5c057a3a934d8e480b38c5affc1";
+      sha512 = "ee156726a54ae37f81a1da32e2d67988b4a0afdec52505982d183d6ded497a4257b81388728e733a480726076b7d61fc020bb741d4b640b19b7d24f7b75e86e0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/te/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/te/firefox-61.0b6.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "291546ed7e8bc5d540835f8d149765765f5f4dc77b9f199e630373c1302a03c0772dde530b9ef391ab801e921a1d1e5ff407a233269988076e49dea6cfd0cd8a";
+      sha512 = "213541ef2037daa9a851fd7acd846da7b1a3ea8c162362f770406b653916116dab59bf939e8831a10f76ba6928a1e830258e2091811f66a7c6b9a1e4a360880f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/th/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/th/firefox-61.0b6.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "1b1c562bc9c0474a2d2313fa02716d8582b92af343ac0061d83f5266125533cdb65406e93857bf36bd35c6154bc0ef96ba5d963644df039bdb75722c177b4249";
+      sha512 = "32d550663ea09aef0f40efb1215f1388ecdcb3f7b00e4975cfb8c85912ce3c0b31fdd657672405a95c4dbf75952f14f377e6ce7cff96c5e663d7a1b27323324a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/tr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/tr/firefox-61.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "a0a30765b877d6278d2e00becd63bc29778dc0898edb0f1cd67a6e5e8eab7a840755539ecd7b7c99c6abd0f92ad4ca56356be7b8201d2203e2973025350ab94d";
+      sha512 = "023ddd41d19b74fc03731783ee2af94338576abdc9d5b64ef0a56cf473307241a8f6f89f2a053eb8d8ac003d5d7d70d97edacb47cd22039e9ce5b8472dfa6230";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/uk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/uk/firefox-61.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "95edfd17cc60fc097451742cfbab507ff2456d2621132794b2c4c0997a2bc9dd94138e56bd1ca0f3a43964fa5ff29c2d21aeaee2666ddfc0adae798a84207bff";
+      sha512 = "4e5cdd14e31d280ee1d7b19e0b21571e2ce509f367daa34b83ec903d978ad460b0aab82da748eaaa8e1a01b6a2c5bbdd5c53eef30bf486bf6b5f3228cc4cf5a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ur/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ur/firefox-61.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "58165e2444ae10252d8eb81e55d2845c627315b8b1889255e54d6251edc571cbe42a6616a6991fa9b5cd45383c48db7f83069eb423c6951732ff92aabb3c0033";
+      sha512 = "5800be044bab8e785288f26124b03fcca04b9583c4ac98add9679a57d427a92f3b7d77da045e845da581d9ed03c46217baee12cb9d336634881a5cff2aee169e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/uz/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/uz/firefox-61.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "06e32f99550442c2a42f59423585f9821284f930a252d36c189f857d874cf8d7ec24cc26717509add8402147ed2d7175c937ab48b22e1a6eb748efedbdd29d2b";
+      sha512 = "e62b9ea730f9972b7dbd32351a3b04f42f28cc22fac3021678880e206a0d1e7f0a2300cede9d7f1caf3d36539e40aa6c9f7b801dc89c79860d8253a12e22fc70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/vi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/vi/firefox-61.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "d88507f09710c55280ba4df1226c1d941d35fe29774dc37474a0b5e61d0b296d9c7a357af21a83a4394aa1d86c5bd2bbb320f7628875d9c9e7181086ce301b06";
+      sha512 = "8d629e2507fced857b5845ee1d9a191e2e9a4931d5eaeec4bbf2aa61d242db053753491e9bf196b7a2ac6a9ed85feddbff3044ffa33487109ec7ef4356c4c184";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/xh/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/xh/firefox-61.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c81c4766894a5db74e5bb73525f4b3ad69ac19e25f877f4624197518a3e75396041dcdbf481507a880afe29469e0eda59dd4ae7a3be50cdfc0a3a77b8299c021";
+      sha512 = "5f544dff7a5c450ca05518d41d4da8aad54425118422b59899111018b8e0f74e51b4aaf1b98d0bc7cac433be7b4a45bb6ac60cde1b32bfeb68119b87d929b33f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/zh-CN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/zh-CN/firefox-61.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d58e2348efdc70960ea475533c4dd9b25e581024ebe2810a7c103d2a842568ade2bd4a53e27dbac1f2ff2ef70481b330e59d7647234ccb34480bd812f6552398";
+      sha512 = "fa604356e44f2ebbc2192accd634f4ca17f602ddb5b9581d023c69988752d2f9a1b33173bf84a101f797bf99c8bcf6a7e34c6f53982fad2d419956539cf56363";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/zh-TW/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/zh-TW/firefox-61.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "573669040d33b07afec48131953a368fb9cd661358c06b6ce056514419e6fd51a8ddc4c546f0a40ea816338b6f250ae4841f7f9b7ddf8d3d57e73f34ec55796c";
+      sha512 = "b9c60aa1bd66d9f0f56a260aed3fbeedf2216aaba539246c631f46c5fb3a23a8129360100b37387cc312acfb118d59a4e3bfa17555a57b00f1f233ef97f3bd5b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ach/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ach/firefox-61.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "22c99c2e64ccab01af2723e6edec7a50d7b2b4f9f0f5272d502b6d6e866551e72c570ea140e9283b304d1af4cbc86300a0c7e54478076554df8bcc80c9e33415";
+      sha512 = "e4f149c83e67432aa31d9ab91c50208828069e49df69ea83ee4b3c281bcbfa05dbca71f678725bc41ae044098b9e4d61ca2a13188b06412ea58845739f76403a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/af/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/af/firefox-61.0b6.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "7cd232ab70caf61a9202f2598dd85be49e7039fa1138896a719fcde3f63cd8dc893ea4c0b9bd832cf506ce7b9c235d84fb353ee625ef0c70ca3e26c2c1c69315";
+      sha512 = "6c4fb2984588621effe18a159ec17e1c04a95bda869be2d8498afe07c29e461d0f95c84f2959169b10d728cf3bb62d2c6ea05f794292953ae8c07c831051d1ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/an/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/an/firefox-61.0b6.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "b73b7e75d08e8476b7bceb3f86a0ab7d632e2bbeb3916b13a2502bfc4964ec1f98c6ecc6941a92d19dcfc29987097d69ec27711ad011db5f8205f79120fe7904";
+      sha512 = "18ba0661a6d63004ad92df206aafe3215f50e26e91aebc3b68fea238aef4c0b8756cbef9a6b2078aeb5ca0b38de8a1988ff548f7e3c5d8ac41b85eeaad88a911";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ar/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ar/firefox-61.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "6a8c4ee3f89bccd1fc69e8b896b3a66f9086272deacb0f112a36335a432dd3e0ad6d3017036b931fd7951503b8e00d8f11588fff118d1051702a0477cb360697";
+      sha512 = "53859553180c85021ad156ba21a7a24d4907d4766646689f7f1835e4c3f4f5235cf0148363b0c2478028c3443510ef34fd09b03ec70c21b7328ee5a61f0e1c99";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/as/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/as/firefox-61.0b6.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "6a84acf5496974709c2ef4220cb56d4714d5eb8b4e731de17e4cad9be9ffa2e95d82440e0e79e19dc8abe91e56d67f09c4505f57b62c4870accfe1d4685bd97c";
+      sha512 = "e76e4fa8a48dda9e2305a9e5e774559e46199b2849ddda8e14bfd07af7c5a1281615bdb743e2492ff7efdea66d9b8f2ed2ebfb28920cef7262fff16178f596fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ast/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ast/firefox-61.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "274173672d91953fb715810f314bd8aa5c5b6660e8fdccb91e09d2e3b6ea20d50e2cccce45f201405bbb3b0dd41b1f7ef629c6caf5a59b9fa075e2a5c88f556e";
+      sha512 = "509c28c1cec65d471255c79175a9b79c9967beb0b2b772bf0b3417bbd39b2d4fb8cefac5e06d7658395c2770bd6384ffc85c73e5939901b51c9aa049e7b4c506";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/az/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/az/firefox-61.0b6.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "5d742221592d1183d4f66dffa5d6993eb81e9ae2bc24a664cd41006d07975f7d9bb5f040f7f7ab763059424ec835e6d0def4ac64a468a472ee23c74c883687fe";
+      sha512 = "a481453b0f458fcca2fb622ddcaade281f12c6e89f66f7b6e444c1a63c79265c49b020a67f24d28319d3a46606b49dc6ce8789b638604afdf618e28ad6bfac4c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/be/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/be/firefox-61.0b6.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "f2e9a764a65712a5bbde251050c39d6eea91742afb4eda9de14c9d0834d66ec4db56c801771068f0f67a2a38dd634914cfd83721dd78aa7330e8f6b7089a313d";
+      sha512 = "11aba32937132635c0334f7760c3232181d20f6bf972d665ba59baa5a3d72572693a36067e5513fa89ca2a911f81882e23a854d088369ed4ff6a146c6d743b79";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bg/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bg/firefox-61.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "87e2b22d6c3d8050f65bd740c10d37f30905091f25c9a58f90f221afb2a3063ba0006fcc1f69ee05f168d6bb7c5222f022bfa5efe0827e7aad00568867797322";
+      sha512 = "06cc5f9bf807340548e63fe3b32ea142dff202daeb843d6cd1677c6f61459a9225d8736f0e071b598760e366de50dfea2659ef875fa5ecf4071f92a01587ea29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bn-BD/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bn-BD/firefox-61.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "9687868e5f87282de362e1d2be7b54c150994f33ad92dd5cc4fa0cbec1d817b36777b8f0b95f50c691b20b83f8b5c4252ed40541b4fa6f42a6a10dc8dc1f8b45";
+      sha512 = "8f8973f321231fc8f2a4a1e5dafd7960fb34c3fe3b66d9bccf449a182ac108b29bf1bb2d04fabea44bcb8a9c4ce4ff0b870df2f40a3282e8384e3371ce56f496";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bn-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bn-IN/firefox-61.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "593c1191094b080a76c834f18c63f5f64193aa1d3b48fe5788288214ed98e90e4736f4b8ac413982bd9a793b39e63b515c293abf5822fb9e3b8a4a05515fa667";
+      sha512 = "87bcd40a4093a822346f2d2241eda1877764246171766be07b32be4bcf5b7640e438b19f9b1e2243c2658c7e4f176c28c9ef115d813b5149d384f0e5c966accd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/br/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/br/firefox-61.0b6.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "74681ade8b802805525bf61c27a2b604afb584c0a9eefed283eda67b46b4a2ddc37df527f05d46bdf3b650a092eefb600ceaa683a477fbab80506ca4b1ba48a8";
+      sha512 = "002fa901689602a3adb01070a5ea8f30e306aceb3f3177e52190959d72e2afdc5181fac58254dcab7d77860e46ed0e8d9f56eb74407467d147e29281dcd7ae39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bs/firefox-61.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "fd43952d81b426cbe4151e091b3106b539211f9fecc390037e937388ee28ada5059442698ab93221635d1d1454fa00660b80507d10bb7d0bbbb775f3ccea2957";
+      sha512 = "2a32074a47bf7cb67b1f35b0d20bc253a9f128c6ab6d69329cc64299476a94b20d45c878b48a571b4d37ebc667c7eda5ef91d2a0fcff104f7f08f1a1627d02bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ca/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ca/firefox-61.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "03a312d7f7366d0b94fff50b72aab8a89f5d24e060ef14cc63933b08e0c9d8134bb2679d9d8435ddc18839383edda514dd9be5452742d340938f32267371a08f";
+      sha512 = "7f8e5cf1872945950173d294f49911255d8bee514c5d839841503f0ce38e973ae301d69724831a4841a17c40229885e41471ed7fd0efc89704c197ccfdd7c3de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cak/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cak/firefox-61.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "f25801ceab9845ee8879f793a0c217247556fc965bcd9961de22d19ad4d0054aa7a3aeba28b09be32d0cccea12b799227809fec91f4c9853c7ca63d32b7a7ff2";
+      sha512 = "4284741c8a3505de74cdc7cfe903e696fb4e7ec832b08b9af89a32345d10658030bdb0219252fedb0f04f7939fcef351af9e3816584974e3e26430665767802a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cs/firefox-61.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "274d46dc058e017646bdde4cb5a09e703f390a75cb4a17454fe209e5165cd1ca8758c45857a1c7850e084d0e2110e4be3544667e8276ce153b710465a8a9f188";
+      sha512 = "19eb961a94b11a6cd49072ef0fbd0fbf243a6e66ff2115ca601ebf8b9c09e98c0a3c27086c923bada407509bb7a6e08e1163120a121c88c0ef63c4460d04f547";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cy/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cy/firefox-61.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "3abf6cd33273e42ed501bb913fc6784dbae65e61dee4ce69808bf3f704dc3613f722a4b030a0f9b9cc6a09a673d269238d8c9eec18b23a2b4f8d9a34bf32eddf";
+      sha512 = "537a30a7fb0207c120d42b2f77ab043df3a6ef9454cd93584ff95ddfc084bf69266a9cc2efedd00b69f198eb0832daa30b805a5007d6b64eaa5fa248b4e4435a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/da/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/da/firefox-61.0b6.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "00f0af1239b2de5d4f967d46dcd5dbbbf13dd06b59539a165255cfbd5b8adad19295a2affbcbfc23cd1d8418a4e05f0024bc3f6d5bc6628ed36168b5ebefe5e6";
+      sha512 = "fdfcf95cbcf4f987d1c83e63189c68c856fb9b22c158693fff17038a4883e1080d41af864057c96635b1ce5c7e7260f8e40546b78be420e60a098a79252319d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/de/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/de/firefox-61.0b6.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "e987419db7b28f82a404c80866367704a37580674d012e29c465856aead83cec4eb234d265167c70acffb5411b2766ad64a879c456abb31cd65fc867c339f583";
+      sha512 = "4c0b5adf6e043ad1f1db1fc6dae2dc4bd9b081f890bb560436d16e8766582c44c2eeef2662b7ca4042f082eb7c6ff73d816ac9cc505a2b4e6dd2b960bee65fd9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/dsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/dsb/firefox-61.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "e4c268f4729108302c2d2dfdf338ca30f66bf369e2444b22fb0e5b3f6a4c383d0c2e5b2917d18d661980803e930495d943197cb47aeb729c3f1b6d82be14bfd8";
+      sha512 = "c84be688e42579df606c86ddddca874c5c795dd23897f26a6755f0bd70247f9706acb204fec72529a94a32027307a4f587c8746c8765994179d99db3ef11ff3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/el/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/el/firefox-61.0b6.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "6d4d6bba03f2ff18da53c6f7f2ad9138388a7fed7a02e54bbc8d09be24aa955d5fa1c5890934c768b1a371abcea4772cc455545e9bfd03e63b3b98240f12ee12";
+      sha512 = "39dcd7bc909dad0b661f2e0fb9bf34d24ec96b10e3ffa645ff59cfb431e303223ed0de999184de3ec731a500aabeb869d2c1e12b67868ac1ac71f2451f192cd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-GB/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-GB/firefox-61.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "4a1017f1f69486d56a637ab41c7c49f4f3f42cbbbf2a2da2a57f61f7d87c2ea43e7abbddb0fa21d56bd13d72e99881fae540626a8b7f069a661778edaafe3738";
+      sha512 = "20dd0f2acd16ce48cbbb54944b44e389ab6a3d0d3f37b4cb01ecebb7e6833b5006135c4a20b7f55ca4d8d4d2dddb124b06534aacccf4f2630874d46b3c5fe36c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-US/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-US/firefox-61.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "5eabb44a30500e5f8ee52e4f6ea8d82133c4ccaa5130696cd5af1f1e61efd47a0ce8fbd94e1e9ad87c2c8d3d73b0aee23f0f1cb933ac7c14596dd6b2b7baacb4";
+      sha512 = "c31adc5dbd09f282470d16680f5f80e37ed020d1b77d394e157bdb4a29fece2edfd7dd585e4fa3231a0b2e58247702da270f728875fe9bf886a68d5eb8a48a7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-ZA/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-ZA/firefox-61.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "0018e56ca7e476d7aa8fccc55dfed365ff28592f387630fe4d72828be67da992c23d28206e6399b942987750756ad4ef98600463abfd86442eee3a6caca7a39b";
+      sha512 = "1007c55b9481d35b9611ae42a71ca0135ae65fbd9a13e61cb5a90c4698ed1854fbd4129d14e394cc605362da3b2c22fdaba5229831353831ac21f3390af06376";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/eo/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/eo/firefox-61.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "7ed4a945cc3947de2b31e3045adfa2387e5ac7bc9c6420cee1c8bccab27e05278707b7ef15728ca0e89cfa2ac62fea0a155a0007c8f61178b56e8ad99ac8771b";
+      sha512 = "3cce46878580911ac18633095cdba6b180da1dd34ebd3ea0070be8e1ba3c1200c3cf46a8e00c246c95b4efbc32182f36be12685dd5873f57227e07e6a826af92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-AR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-AR/firefox-61.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "dd45ec9ae649d43f7bc14c564cad8a5cb0c688b18a78296f01e60ddce161e43ee7f9f1d422378e560bd9b8b10d2e061e9e50d3173dc671d775e5fd64d5b977fd";
+      sha512 = "9f973ab872f47ce77130482cb4e9482b16edcc0445ca7f05d6b264eac288263e97326938904b09a43081766efad4c226ef5b5150ce9e4c640ad369f416a8325b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-CL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-CL/firefox-61.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "017d2a07d554fea7dd140d7bf22998b3aa575086fe3145503a178369187c1f3afbd45009f08ba8bb0b0885b645ed0576600393315b02e356151c2c64e96055e1";
+      sha512 = "d681c9d2b0a345f144c4af91b3eca2cf0e23c0fb9eacf942ba459bf1b73e4c70122b20131714a3b92d6404f455877963a80bba3e01d2d674e56fcec8f76d4346";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-ES/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-ES/firefox-61.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "f24185e0ed7eb3f1982be22b74276aac1930af09f30184ab5c6ed3d3b2adae6c4ad05dd4d9ddc8a743c4482f503150f2624531ef1cfb58ae88b10a59773c314e";
+      sha512 = "1d32114be5bd45bd434cbec1a7cca2877aa324d57c02e1541f0eb37d79dd786f7b55fd42b1909e3ea3d6b4a3ea849f671922b8d95bab258b6f948480fe6205b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-MX/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-MX/firefox-61.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "28ce5d1cc9aed67c5ae6735e9712e42bc30233237f0597e12f4ab96c6a8119bd6d710c646b84c830023b41aef8a5bb8694a652b644c7ace78bc55381102b237e";
+      sha512 = "6ded88d5bc40b5878462fbc17a9af5e26a6b3cb05e53ef25050e24f98992e226d33a7855cd34eb1b73770e57cb9ad53bb17b9d711cdab969338c6cbb38837500";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/et/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/et/firefox-61.0b6.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "2d73a733ed3b6c64be8de608a00b11f1ed2e300fedc5111f9a92b1c0fe61b61eb043b6b9c71eb5fc497813d1e4dad4b940c472d119697c6dfbc6106751742834";
+      sha512 = "543eb909ae6fa971023cdbffd2a312f269ceb9fa20868d83a9e63bffc9936705a85919826577ed9a286e89df4a279d8a1b123ce48247443c7fbee96457ee3c7d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/eu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/eu/firefox-61.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "f3621d39d396a32cea4d3fa41c83bddfe0c9d05e3fbd02805f1b87c9bb8ba517934602d06f7cd7c8c80f5ed4aab3df275227766aa939dcb5ab35305eebf1b3f9";
+      sha512 = "84262bbb055a96332f34c6aa26b9bbad69ff9e066cbc60829ccfe5a59f64d6c11838d45ed56aa3a9129c2786abae5e9f5fdc496759d87ba3f98a7e1e7db548d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fa/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fa/firefox-61.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "5cf7ae648c8d6db5d896a76183b9f06275199db489dfea6aa2c28bdd9377b22a5ba4fee0931a2c18c22b94239cda8d972438a63f2f6aba867051f8cb0152965e";
+      sha512 = "71a95fce457d0e7f07159241df7739b5cce62fa29a53729fbf1157bdf3eef85fcb9d277b9cc66cf67d767102e7aa16c6ef1bd371787fed4af29ce620b6b5ece5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ff/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ff/firefox-61.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "301de07712dc015e5b769aed8247461c8e15bd16955621a517206fde83c6c4599ccfb654e729b3a22ae6b51952060cb27db7b315f566b670d8c2bffb514959bb";
+      sha512 = "f12e626f88ed3e726be24322d21f126f3f30cf0acfa5842386f51d5b7cfd222b96978910804f631bb3f5cb4eb27040b01c9326e65f61b6167e49e60d6a40afcc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fi/firefox-61.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "65b8949e7e0ca1ba596c7a40e75c3c463646dd72a044d989e68caa54b8aeab02403870040b7a27ec8811adb62046c3426e38038241293bc5e0308882d20d1077";
+      sha512 = "f5d0a876dd4f6644af01fc53080b6126ff9f128d6ca990d0e125c4ecf04a47c770a87e1fbe6975b3262449f0d066224cf9de1964cde57d0c3d7d50b709131675";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fr/firefox-61.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "b49589dfa85defb758c71f221f309869239039b5c8d30d40a6857d4e92e3113741a8eaf6e55e073f5a9bd212030d6497c05185c220a3249ddc2a4a6c6880e3b2";
+      sha512 = "af9e5e2fc9bb7e84aebe8cc12098a4a3a8cc405172a7ff73cfa3c8772d8a5515dd3c5647d7d51066a0a7612553313c5a05044740f66358452ac0a8c3d6dea227";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fy-NL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fy-NL/firefox-61.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "a17982cc3590d552f907a3f9a5af3e0c3f234b40a1ea285e6805cec57b793645cd79e2c37422a2f83d1e70617a1b5a4f87b5c315d9fbe98293e061b2f836bd06";
+      sha512 = "0851f85849651463b8a841de88e69820f101b468a706e5bb0986debee21f0d7f0abb9f52f7e89c097361a21f6fcddb4d57f17015d41b1350dfb36b00b246888f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ga-IE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ga-IE/firefox-61.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "a9938d962796c573099a721a3fb8a4321378ff532e265bc4ecc3b09fc41268e236e0726e808865f4c655aa7f88f1f04ab1e73930a1a9a4a9d634af1bf8bd55e2";
+      sha512 = "b16ef7812f4f5f0cb4655ebd792ba38ba4858dd93713819a26ee9ad794d8754fe55bf6dae0bb6c371424776f9dad8c13e2449a43a1f14876ed309b2a0f9312fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gd/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gd/firefox-61.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "a0f4a34628d805ce67b858a7f96368637c90c126c52e7fa26e540483ca201ab02d734770006ea1cf2c960f9cf614b9f0a326ea74a77c9e0abe3a23f3d6acbb90";
+      sha512 = "e337b418317b2e7a36d265755564fd6ac6fc227d59b31410b305502d1002b4d8fac06339f2c750bd9b26cc42094c89fc4d92d89c6dcb7992545489777bbc1f29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gl/firefox-61.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "c87b8d03a22ccca2d57339797182ec37adc12b40bf4b83d72120b76792cf28d373f0948fcf0a06c2e983255951a026f207be8153169d4d61f493dab8b25242e9";
+      sha512 = "b83ef927a63ea25990f0a6690eba195360369e751ae0db446ec093e51a5a7c187c3ff902e3deddaee9b395359db4a7edec431565af167fddfd931d97e8078752";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gn/firefox-61.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "20d20ed92b7fb5fa440b39c449000b391ba85bb3a4e98164c0529c150535cc992fdc7d3f6e8585d7404976e0a1204aa62e43fcad190c3999608dc6c5e9233497";
+      sha512 = "af8447042c0500fa5fb6f16f10a0550bc70fae412b5f4eb8e39fe8eceff10b22cc0b11357612ac1c06cc81fde74d9ebd2b6335c7c84c0c88e82bc6671257e8bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gu-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gu-IN/firefox-61.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "c97905b3a5e3ec660b75348c2f9406053be2536600ce25bb43bea507aeab7a3780c8d2d972de05c17f605ce3a728d6197e1f762773d8141576c1e3e367f44250";
+      sha512 = "e59c323f6e4336b198f4785c1bd3d8a48577eb2c202a63c264b604ff16c2017ce43a9b05f7c0698995e9dd83278e817a056a14a5f6242065c2d50e545dd99c10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/he/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/he/firefox-61.0b6.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "4a89765b60bc1c82d06f503e62274b266520bd1ecd1d3599074351aa825a4280a43ee05b8cabda9c6ff44451b09e02006e717eb5791942ac9989d1be79041655";
+      sha512 = "691faefa9a8f7ede8be09126174d8170c62c7cb670ac9373575726ea4eaaf64cfafc04312ca21e334f095b226d5d1f1dec860f6cf2e4a482adbfc22970c033ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hi-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hi-IN/firefox-61.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "af73da40aedacc3aef9685f5916651564a6e329e4e1a97eb968373307d9f4a7d8ce81f72b770166395305e5dbe9043478d6164f89f40383b89e10dc3a2c5a107";
+      sha512 = "b65f1b2ddadeab279afe964da9097211b4cc5956ceab77cc48cea5ecf6815de03ba8e89f39b5c3ba4f7915c7150b8d1951c7fccdbd7f7db71a53b732aeff7182";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hr/firefox-61.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "ea63038ec96426dccd9b8ebe13ff632794b3a320888b3f6f152a06a3c9e4fdabcf6f600351e5012b90ec924ff4dd9826dada493d0adbce4195ec9995a333a2e4";
+      sha512 = "4eb20efa50dd34e23b08f1bd25335cb296c8d5c4ed176e7882da4e466563e31a4cc1a0c0ad0950a7a892b28000811c70c7158a7e3da26c02d05129ef13fa0566";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hsb/firefox-61.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "797d27215aa0e77a40b582bb7f2f45a1411d8d4159bd61a55fa72023c27f514d916f2b1fd5a2b89c240c1ee0142f54cd2934e4cd641f616d2efb6ec5ae31b98b";
+      sha512 = "4dab2d22e41590494366c582ffe8e80a2a635dd1b7d57416e51cf0c723cbc1d40c6964a30572283aa7c6d6312c54cb97a6610877eea1b4bc989ec871316cb93b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hu/firefox-61.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "d3295470724ae625f603db98d305dc67964154e86e7b28d80bcc688ce87525bfe33ce3d60f315f48f70c09c1d1301656a46ac2acc8b312a430f625af9e2417b7";
+      sha512 = "f321afa413c878e4ed9b80c1e7b356a70125ae3799b2b47df32a011e60908f86a27572639df10d4826922b73b6515f463a1e5e0b3d60f8c20afb8d23c18ccf88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hy-AM/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hy-AM/firefox-61.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "d9d9094f4cbb2f5659b598e332256bf77ae64cc162bbb8e8998e2d723ea8f2d65e3632b60a358e9f2e753cbf877edc59fd21ec3d3d99608bfd9090d24957d641";
+      sha512 = "d177a9a730911104761d6a7968aeb1cab62347438c5ed30099fb1fa9c9701b87562f081128062b3051ea6cc0495a58e4a8fd9b8c82d4ed7108d0bfd73da2fec1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ia/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ia/firefox-61.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "c9c38f5bad724e4436519f01f0e25c715e7e107792ce9794fc9bcf7e9bbd687331efe004b10f18cc942f668504a43bf52ac2005d2bb663b28c99943dae8dcd01";
+      sha512 = "15e665808dfbf076932d17196e93f7db271d8f948ecb060a5f41934d59d75d6e7beae2b5abbc4cd5ba86e59e493c8f41f6a316f4be6603c0ab009714fe073391";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/id/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/id/firefox-61.0b6.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "2b23f50006b2bbc66e79851b91dc62c948b75a00651d294afba17cf124f612c3bb2d39e9f8a56a74db7a8d22b8487ca7b600a453949973e1776be50152d5fd21";
+      sha512 = "ddc63cd63501e93c12fb687804a2d8ff7b5a4e996456e33a2d9b3531e72d9c85cd7db328ba3f7195ae5ce2b565d40fb4a6f2778ea7f6161596c3e21f5491eb13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/is/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/is/firefox-61.0b6.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "237882a2ec8d52a77fe533866171578780f74edcf790fa4515fe98c804491f86f76b99c645854778868e9ea58ac3b2cf75d504479d0c24fe24911c795e6e5a71";
+      sha512 = "1dcebfad1e5d987626e2941eed30b5ac84dc304231b76963c062561b1784dbd6f42bc7d01c2008b32cee7868158b786cf30dae7c5c8da1a6d8a176e9a16af591";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/it/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/it/firefox-61.0b6.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "d4e20f24409f05b541d5dd556b1270d609050b650ce708e2ed33e826ddea1c13103b2983bbec34ce51c52b7f2471e3c451775d6520da34d17b2274ef1db07fca";
+      sha512 = "aef13bc353d294944df1bae358572c9a7922e8ed41a8225d987ec6b4997aa317351a7684cbba482ff1928b63d3238ee85d07198bb8cc6dbc1a2e3b0fb9c29a57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ja/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ja/firefox-61.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f3c4726995f3daecfa23ea19623e9cc9c9fd3d90049176f16f4d68a2a17e6890448432c827fd6c1b9dea09787983cfb3e9d89683a05923e6b4b23b3c67fb0693";
+      sha512 = "5f84a47f2a22cfe759fe42b832bdec237b7cbbbcf26024a1508dc1a893172246a52e4f165d57bd082ff6780f00ff2a82fe574e4d521b29d98f0dfcc47ac152a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ka/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ka/firefox-61.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "5e6941c9a3a2582010b95c45dd7b49b6dcaab47e54e5ca67e7b3956729c5ad5978dd3d4ba4cd28dedc9d89592ca95b895377803836214730e9f1f9e5b4da92d4";
+      sha512 = "303b4320405c301245095f0308e9b3757a502161bd43f3f6c5ea9255656dc1f394322718535887f5b3038dc0d6390483e74a6c5ff45fc28296dee3d83afc9425";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kab/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kab/firefox-61.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "1a6126090610f906731f13dba405f167935a94e9583ffba4f08242b3882961ebb91de720a23b39ec3d84be5213893a9b82e2e9ca91c6cd70466ac7ef1bd600e3";
+      sha512 = "0e9eacf033d76e672f460b7b133ce5025fda39aa4102e55199f67691bc9acf121c78c5251b9ed1e7ab49d93b83e4bdbab6bad671f39c22a490103266d09b667a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kk/firefox-61.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "bc638ded0b4b14c0b347cb5c24f0988ce697ab29ef08f59633123ca38b056c4f7bb0421a6045835ec0875e663b9730d17cc7f7ddd8bcdc98f5a60cda61461ed3";
+      sha512 = "9b2ced81ea8deb62c0fb2a6fd3e660362ab64ae2ee706c06b6af0eb33f25df4bbe6386019cfd94f240ca4fba6e30d5ed51ad4c5b319afd76a2e5a62d6f0f023d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/km/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/km/firefox-61.0b6.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "fde6511fad810cb5d71fd1fd0864ac7a40dbf4535416ff127f7b12799ee9e220e3afc93fbabebaf8d6cbe939e54692ed3edc5a381fbb9a693c393dbc8f970e90";
+      sha512 = "1c4d3718362aff114193e92284c981a9bae5acbf956aeaf96d0ec23a3d469ddd064f5d7ee4bbe8c661bd644875f08159656e7d44949c59f91ce1a88e9404ffa5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kn/firefox-61.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "0b93c21e1d0c99b89393f8fd155d62a4c72a8c1ae488fcc081fa0895fe91ff056e44e2405e45f4a7139e9cba79c5cd6ce855f614f40457bc9adc6d592dff6936";
+      sha512 = "bcdfd59b76db31c01ee7a69551dc5c025858daf3f71a593f1e8959c8af20227ce3240234aa94f7bd53e753bfea796a29b7f82c924396a130cd895c134ec0dd31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ko/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ko/firefox-61.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "cc33a59bd8b5e4d07204fe2dba1135c02cca9ba60ba6439879b5dd1d7b32a21e9d5809e57345a649ba5b964567c3d30648508c1292a84dc381e747ad475d0058";
+      sha512 = "207d4701dd75d5b88bf06567b13934f59de38b631683275ad7fb2bacc4c0aac62ee5acdb1520c7c4e2671b33b06fad119ebbc02d04e583bcfa732969839455c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lij/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lij/firefox-61.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "6c9b8db39a70abc07296597818a60d4a576d2bd9c0231817e85fa17737d541434cdb838a97011608165c1da759d5b9d295eebc4a790564ba37b56c201996db3c";
+      sha512 = "01a29678e43e8dc04c0a0340c6fd7c723584a398e797472932792b24911d2009e0a952f4031a3f11ce7c803b4c59b8d8b934d60ef3373204019c4bccd4d44639";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lt/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lt/firefox-61.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "ac1017981cb75d361d1f8c7cc823fca38303c39afbefb3ff87d48d95baff2cf0a4dbc9863dbd55fadce85949e52e7e61889c05cad874686ddc073ed6e5acc228";
+      sha512 = "8037052b3fc838001f3159dd64254cf36426f9d11417dbe032926c263648dc9b53f451d9add606e6ceca0ae4599ee1949d92ba8f908fe16cbfad1e1a72b60279";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lv/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lv/firefox-61.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "f5f1f97758f00c25f39f73b8e52a8c006fe653ceee232ca27a3e69d3b2abdf6316c237b1944d26dd39b51300aa72cc20c4b3d304aa6f1446a96b6165cf4f8757";
+      sha512 = "c5b2f583b8fd0cb8fad8057107663e875ccf84d53e81b2cdc32492924feb33cee1cef726e7455f316144e6cad8341e4b8b74b49ebab26de22b88a4833ea25724";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mai/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mai/firefox-61.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "9b1f37e9d97126cf3ab5500c6cf15bb161a286e0d878fe58014a7b5024942b944c9282b9b9e9c3587170a12d7ef69095e21d1db729c2b96db29c97b9dbfe9a42";
+      sha512 = "f2adaab166d20ee7b88fad7a3b9f1fbff7dbec6da77d48a44dbd4e1c74413db847cdf9b234f73fbf8cfb50426f0cb67cd7d9ea26c36566154428ec5b28770435";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mk/firefox-61.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "14937d2fad302f93b0011037c12298c7319a1020f5e54a7c54f8ca2278c5a1d6517fe0732292fa0b84edbd1af089c67f41d6651ca918c677d814ab537bf52126";
+      sha512 = "25f088cfc5d1fd4e52db26fc530e239765f6c25329b34fb61c54a4b7966ada5b83e476edc5d57edb9167584709d32dfb6c5f04a45262d4003f6ac3f6f5e5d345";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ml/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ml/firefox-61.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "61db659af8241ae107265708a50683aabc1a920a35e6f32bdc5559de0e0aa5409f577b4ae5d49577ce37290ad5ff3f281f3b8bb5c775c834acbb364d499e5be6";
+      sha512 = "202e9eb99e73e0eb78bb04f3b4ef677533e78f9b0713a7697b8b0e98c3da5401b3dbb240b5165df35ce31e4c809b45ddf99ad986b953a590dfe77a8e103e6da9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mr/firefox-61.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "2bdbdcba25483797d31778851b9e611ffa15c0f2744a56a8e3447607bb83be8fe179dfa7b3a7d24f017fe34f9f38dd8d8b3d41a1cd783c34b9ae1c4929571ef4";
+      sha512 = "bb3a223835f8a5c0248d0b2372361763dce8cd2980ce32d7f9f89c48ad45708ba7687ed7a525778e39fc139a39558269101bdcce6cef6a3476ab7470b38d52a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ms/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ms/firefox-61.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "19a4552318668d0e11892ac4b4fa371c82e72d0742ff26b63a9c6eef0949af261c352777feea41dd6c17e168f868652e75c4f56a9947dee11886d264a402ea06";
+      sha512 = "0d804e8567ea16f8935d4c2eb0b9c72d7d701b10b2ade4a08559ed300799d2cc904a40e38b4d4200d4392b646c319cb2421981e1f238b7ec1d44e161239f3e8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/my/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/my/firefox-61.0b6.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "51cdc0570513a3856c4e13f30dffbe7a55c30dd6a88d47528637c1159520180aa6516136c1f066f37bb06f79f8326ded3b3cad23b0f244bbae11476d68b3dddf";
+      sha512 = "7d764f40f4695ab30fe8fc8d8fa6d90a4db123994d2599ea81a771962832e03976361c06c6013f65f858f323605ea812d3aee1946ba02b6be11148a0f7fd3761";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nb-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nb-NO/firefox-61.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "afc8732c67674956ecf9e0678d9459ad7328611d3f60b222871444c7f0a55989757f6eb230157c2bddd5833bd99b7fac3200a8a233ffba392f1d028f3d52b5b0";
+      sha512 = "1eedc5f92c9d776306e33f5faf984256a9a7b6f00c88d5e844a1acef9ac340bcf48c8016b1b398e85f40a7c6e211aac3cc31ce00a6f583a0b07a1cd1f3c9a9a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ne-NP/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ne-NP/firefox-61.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "4b7acb27a1dbb9982c624f3bb5b9d97add88fda23155ce4a8d0f6436e68a9073ea3df571f61e186a473c3c6d90e0af1f43d23a2708d04192f206d3f9d9c726dc";
+      sha512 = "90107ec2d734c3bead2ac24e0033e2f26ad11dca5f43c59bfe75ca44a33943f76346ac0497659891ca4aaaa10052bb157068a23f2e50fb7680c7f42fd258abaf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nl/firefox-61.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "4797e5748f46f9c8939e225011fc42a9ef800cb1b1e26a875d59212d7617aa83d9add3222f51736c3be8bf5cdfa2668c16a89997f07e135438bbee936cabc1c5";
+      sha512 = "472877591d3f8ab1d1dbfa6132e8a6e909a62cdf5def3cc196870f0614aa0c02df9fed0138fff0b8eee05e594c887bc02a24880b11bd57c23dea5b0b0983b29b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nn-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nn-NO/firefox-61.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "dafcb551c537397bb2d9198e1f24bd5ea21e727c6e35467782ba9b1a4a7dda6adf8fe5cb1f7f42d7da701bf3f5999244de5d3dec2cd16331277ce0c0eb0d93d5";
+      sha512 = "8abd3ab256491fa5033d5935fc0591dfaa2e9d49e6e988cc5a574533950c2f2f46739346766c2121b89755c073d9bb555832af47f177c43f39fd527ea559a66a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/oc/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/oc/firefox-61.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "447e74560fa96521663fbfde6b4f7b398a1ea13a2c2432afcaadae3bb84256a38d09d4af43bb2666f80dafe3df0cdfc1d8470efd2de7f8d5d0928cc286f4c86a";
+      sha512 = "266267334b93f63a5c70298700f0b7ba65dba2c32694a5dcce0a330d5eb6e8c023c25beb0ed20eb883da71e4488bf5e7ddfedeede9d69c4135f5ad9462a1aa45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/or/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/or/firefox-61.0b6.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "6aa674a480e6d742c3309649d464845d6bd5654115b7171bb0cc5f48da05b85e9176c6ad20f58cc263fdd29e9406e3090b3061f702421c2563f8addce47827b6";
+      sha512 = "f8f23c2d0377b837c4f4ba35bb10ef8c4cd27a298d9a5ab3c9f1d05ec5bfa1aa05a1417a1e887d79e9dc7f51e6efc535784cef78021e8985d8e52f04d32e0493";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pa-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pa-IN/firefox-61.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "ebecec7d84d7ef6e84d2ad4377cd7d0a6b4ad12187655ac026df6691824b3ad1e5ae2d463939bc8c774b2d7d17eff00783083cca68436a3fa8cecd18920290a8";
+      sha512 = "228602ac0dfdd72dbb896390bb825611c81c91e004b82b97bff767b7b2915b44a379392cb4ae7fe3b5b2e1213b4a6ba4dac1877f1fd059358fe8c96d483e3218";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pl/firefox-61.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "46a8745147751200c6b13e10c1f41db9391cf066ae3475e0bee0de11639f624322a087ee73ae6c19c2236c91034f1bcade605ec7628e24c6104e83465a97baab";
+      sha512 = "ca99753782f7d750bcc657fbcf36a4d7897a33554e93ad10192a7381b490d420b23dd2c7d0faef8e85e9cf305dbe58e6d1c777ee37a40b998549d348260fe5d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pt-BR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pt-BR/firefox-61.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "6b27353e212369d04c96d83f1b62118c08cf918060ba9d46809c1f3cd1141e7cb7e7e6662216fcc29f9917e6c24914462bb1406623a312d07fb48016fc705410";
+      sha512 = "86d35e76f7d67c0a89feef879b470443eb86b7199189066850d71a47785cfe5783a0b65684f811c9750e1f1cca894a3e6fc0abfc9fe3c68849695a8b2329d22c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pt-PT/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pt-PT/firefox-61.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "5c7d44900276a10edc396a9829cd5ae581b9705627a8962ee9597a3b3bf57efb15caf054d7ed3bf6953c0f064a9ab29d1787304523be1c4c1ca33a307ba4a1e4";
+      sha512 = "5f8449b99cd446a75c2a2615fb9cec10fec2da30b72daf321baa50a177bcac90eef050798f0b1f99cd55967b2e7c350aa63cd9ce807d111816dfed1479296349";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/rm/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/rm/firefox-61.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "3d5e35caa8c65d8c6c9d88d0219d146d354089a5482f94c86a0a1a8a753010ddf1617df93d53a9eb476c285f7424b17b0cf8544fc6d969f3d7a26cefe858c8bf";
+      sha512 = "e3b40576f6cf2de97ba0051c8d9f215ce054dd07dcd5b8987543036ad002e01f3da3179fb54708de0999308604877feeae5bfb2298686629ccc7069e024e85cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ro/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ro/firefox-61.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "f0ef50ea1caed890483c5a3496f4ca6986ef4ac526620c110187ee40766f6e1cf59d718d0745fc35c392d37ff1928a22f243a4d5842e81a34b84a63c53da6d38";
+      sha512 = "d4b92a8e92b4a0a731c22a01ee9b544a66393011cbc424bb9b46b935e80c82bcb3cd402a747a369673e97771a5c005ae0df300d358c531d2cc7cc9a8dda77bb8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ru/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ru/firefox-61.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "e96f335f5142a708b55ffbe4327fad650560f66ca96c260bab97a02e5c6ec38dcd6bce61b37447a8d1029284024cc9a6798df35554474dc38ad59f29fa85224d";
+      sha512 = "b683ef089694cd799c47b7d5f2380ca866d7d6f52e58d9eaf6fe317e83bc4b1e7a0399f3031d6cffa138c5f3aa9bf5eb295ec656d2bf6f0cf106acf8fb5f5e77";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/si/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/si/firefox-61.0b6.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "80fe13bb2d037f3082ff02dfa764f565213c3b0d5a98617b6a290de54dc655ed8838522653bacbbf926e0daa34e5ccbd60198779996c771ced10030c46da1dc9";
+      sha512 = "91f436012f1acd2745a30be41dd7e8515f4205dcb51d8e02f7b54a9cd54998e1934787b1734abe3bb111c8d5ee6c7f732e3dd7d8090655d37152f5d2704fedd1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sk/firefox-61.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "1612da9f841cebea951f1ae8b2f80c897eba920fd900748608495ab154e9443671df9969bad9923715e41c544e8ef63be3e998c4ee879fb58355234612ffbdfc";
+      sha512 = "f98dc5fd438ffa539bacb7aa277e9e0f1cf6945b9dc93b5e077c59f65ccee21f90eca04cec9e6ea784a9197c2891fac681ecd0b361e110422405b04b9d76bb34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sl/firefox-61.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "548058d77bc9d1076c1eb21f0a01be7fe028debc78ae083ff502c213bfe7776e4ac8480de6cf7338b80dbf38c475cd367564f1dfaa5fa8cddb5cdae0db2c7e22";
+      sha512 = "632d543561f33ccc79ce762ee5c93c4371d39867d2941d596d5025c0e307a676edf9ad65b3d1370d5689c7a1d54d36c1c470764d38b948e84137ea1f37ee2910";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/son/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/son/firefox-61.0b6.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "7c0bf8c58d1c924245693cc02ddad3b886e94af1dabbdb3ae9344700de612018a75f233003dd2df698b2aca99b9ec4632e65d16c68980955540185842c9b8af2";
+      sha512 = "737b83ead2f9654c7afa632e534254816e7c00bd8b9220097eb63eb7b21472824670efe26e2e3a4a365d3720c0a74f96f16c38b6543c68165ed46ff479a22cd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sq/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sq/firefox-61.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "c287e9cf132ec16e3e8427854941ee89ead1a29a8a68a92a7aa35b615fd2b526db825a3c66dc86f30dca5d149c2a5afc7c254af64225ae7145718602dddd631f";
+      sha512 = "f71ca5f154f30252d682b32eaba396fe7419a374737f6ab8c64cf9ab9c65dd8582068cd8ac1abb6aa2b687528b5e95019ebb0e18c60550dea519ab104d3e3c69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sr/firefox-61.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "b06eccd2835a050c560f56dbf94d41f455b62a8407c5196cca44d7c9237cb451c42a4ef266e5e9348965b01768f314ec7bc2f437ed896e23100caba6f409ecf7";
+      sha512 = "7761d0b4e39a402cd48797bef220450438c4a0bee9987526ed8fb1e68c2dbbc05a3668ef76a7c5f20accc8079e8154f7e3ecdb824d8db6a299b032256f0826f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sv-SE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sv-SE/firefox-61.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "5747c1a9a1476ee6f6febb645b5140b60e5190eaea606a1edd8421cc1b66f6c98b710a447c6a8ed1b6730b5ce8dec47b69bf28810e17ce8b080624848618add0";
+      sha512 = "ca621f2849ac5c83a4de77b037b34f00a60b2dc1155dfad571296b56ff130c6a003a4c28c7749b3476cee04e1635892766abe7577901ebd7b1ca1a9089398634";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ta/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ta/firefox-61.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ec71cc4c702bd454ebab8028ed810fa51889d01f1b0d34729fbab44ce5489bea031f3c5f6ac5392954343ce050a96681d043406f29c10d317b976b5e3d0cd8c4";
+      sha512 = "4ea40fa5510ad66bdeda6120dae1af500e79d05ac970f5d67de6c94af5f9250e6f86dda427eb1e43b6fa544e33c33564fd970488836eb4d715f1af717f28302a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/te/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/te/firefox-61.0b6.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "147654e7bb5df1f62c9bc117d2badf0e3a92612b79bb660ca09658146644baac275a7d3f6f643f751bb585bef867b9ed23ceef55d72e2d02f1ff4f44e076e0e5";
+      sha512 = "cd9f467df91afb7fc193b97dfdc845ff958d0db05cf483ab48876316df6f024e49cdcb136e5731ec0171234bfaeac7e4facf50dd949e59996e45a442fa1bcd51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/th/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/th/firefox-61.0b6.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "baa454a5c4d8d7994a49c8cefd015052b0f3af6f55e15a721ac00e8e7108f83fa78e5e1e5c90576f0bc508574e2ccbf3c72524192a310b29e30a430e5928b8a3";
+      sha512 = "07cbd77ab9c33057d06340a056ecd34197f9e037527005f046a9b6cfdbd8347f04d6b4ec7b81774f0402ea642be955a2800ae65c7eb8c542a1313136ef44564c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/tr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/tr/firefox-61.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "fdb5eacc20856b0735ba8e9f2ff47eee70e6c203b53bbc38cf65a4949ad939cc70ab640392bed4c6964bc4acc25c0351b4d9e2ee2b2d72f6b2ff3247eaa8e2de";
+      sha512 = "602fd5c1cd41c9f27eb8a0371b882fe3061125b80173f681640acf07678f00971c4000f8ab4aee3fc62313e4ff5a4ee4ba19fd44043d4fa2cad99f8998033b9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/uk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/uk/firefox-61.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "7da1522c7af4e9db8f3fc7a7a2fa30ac12a06c8c20d7d53e0a0097ceaced9124d861d688b6ef26e8f808ba672bfe12b2ad3e4ee5921a0771d0348bf99a5bd1b0";
+      sha512 = "91891ab6d431f3eaeacd2e33d8efb9069f3671196e613e2ea0bf35838f256e3d9e333b25842090b708e09d531e13e2a234577af6c566af815ed8c5d6e7133c25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ur/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ur/firefox-61.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "a146f736849969e36b72f69661da5d50cc3ecc79542ddf84e09a12d9877b6d654734a22d28a2320b0e27c4443f05186bab2549f55e582eb6f2279bb1922f3979";
+      sha512 = "3f1a0fb3a98f6382415b24d9812dfa6a1d716716d1f5bd9094cd9b0fcc794cee2a14d19dc117e7acbab1c9743205a4e2d21964c79aa42649f27c65a08d47df37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/uz/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/uz/firefox-61.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "62bebbf542d9b2fc62cf0c9e4abca1a216c222ca97bf59d1c5639a04cdb13a230e80a1762af6f682e0bdc7042685b9104702810c2199bb4ff092e0a63b81535f";
+      sha512 = "868d98dc2aca742ad59e0d1510e39f6dfb571f5a5155ba2d515731bb067eb0f41730be49556d93ab957e71d3a1d1694a7da20f30f208b4125be1fc3491becff1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/vi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/vi/firefox-61.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b3c4477e89ce0fffaa2f7f6d9d0b64d5ee6856e4a40183f07f87ec10393f73041d2c6d87a3460dd399f8bc96e11ca6264af0599e869b5d87da0e1415d5853b08";
+      sha512 = "db4e378e90c86828f080283ca009e8ed9d3376ad95955847b4aac5defa0f02552d80e78c368d56582c42c1c067027d9f1e9a817ab633a0dea426b84523844d58";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/xh/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/xh/firefox-61.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "0b0faf13210802a911f899a0b5df4ca67bda2eb98a8c37b43f0cf9f9ec5fe9c7798f375c6369c5507e23e45f772c7f610d048348ecb18e5519f5796342bdb46a";
+      sha512 = "1e1935d239adabc17e1a0d57c614615aa78154d2fd68a876787f5f3f0ca02ea090ffe1b1803d9528fe8579de988cdd78812b3251f48aa1fff8cc69bb1ed46cbe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/zh-CN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/zh-CN/firefox-61.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "53ad88363b5c884a7660cbe0aca223e2baf9f3fac49b6d4928d7744be2e70d4feb1dd4321283c76fb4375c9b74bd5ec73511b43c165f2a3d032185d25b92456c";
+      sha512 = "6ab2ecf874d56fbc6ef6d1a4be74615c39e22da1836f4b20f65132c92789e14d221b589702aeedfe9f0274bbf86350b33b69a6af0dfd53505104e9b95f17c746";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/zh-TW/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/zh-TW/firefox-61.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "8c1551b2bbd07e046ebed7604c0e64d5764af28f94a628b6cba3c68d0258db3f26810d8eb9755013724530a5656e29e05f012fc3c0477977dea079e02a755cbb";
+      sha512 = "e7b7479f4be29ba7517da68cd88aa3e9f35031c84b0aa5cbdfdb025682ced06d16f7af5dfc402d5bd4f23230e6f211b98720fb5c7b99a8edcf04b43fac3f4214";
     }
     ];
 }
-- 
GitLab


From 68cdc9c09e38e704a3bed720fc182f1907035375 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sun, 20 May 2018 19:17:09 +0800
Subject: [PATCH 1012/1085] firefox-beta-bin: 61.0b5 -> 61.0b6

---
 .../browsers/firefox-bin/beta_sources.nix     | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 60a7e77efc0..47f3ac7446d 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b5";
+  version = "61.0b6";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ach/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ach/firefox-61.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "720e57f7ce1dec861b50fa556f6d8569ccb8bd1752b9e25acd1001d772f13c8931e4e922736577af029ab774ccffc6accbda1eb4ff8cb16864808037cc6b4700";
+      sha512 = "0b1df338f80f20b8d42b9bb541ba877e783c4a23589a68f9f1817d26201b84f3387eb01980add5d4efd8ba984e3e742e7b2dd049a45a7555f01fc81ab2cd429f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/af/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/af/firefox-61.0b6.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "a2302f2f3f604ea3f41f6a2819ea6277b10dbb4d81eaacb754506c8938fbf5de518d5e35004137cfe7cf00d36be3d7081bd7414041266555c06e7ea23f17cd6e";
+      sha512 = "7c5cf4743a057ed08d5e998311f8c5995eff36e23a047ac580a16dbdc09f92c503e7751580d2c28dd80629c3430f227992ccd8144901addbd6c1fe42264f04b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/an/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/an/firefox-61.0b6.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "0b3fb243cbe4d1fd08eb293bc1abeb1ee87674f7e7a189514a988d8bd2d733e51b29537cbaf1bc48f3665d06004740a9f4eebc395e4ca3a4a60b3e464e2b9e93";
+      sha512 = "2e8783230b827a9c5e1c10ceec0f4a7c0cb5089814482f7700c700b18825a42df23433b6dd0c21608e4ca273d2dd0d1987722e470ae3915857338bedf252eab3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ar/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ar/firefox-61.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "47a80e63a76a15a689615c5fcdd9f4580854de0645dca2fb234f2f7737dcb8047e557ed64142aec6a8e153668f213f0fb28866b122aacc3e7376c6f1929797f5";
+      sha512 = "95b2c08a8f8656348328c539df04bc048aabf2148a10bde67c2672d837d5983b2f370fcb47f865fb744a7e2e592d60acce159e280321c065fa224fb0d4ba2583";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/as/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/as/firefox-61.0b6.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "22aae0b42b265b5be89b2d1557725f4b19c3be5f8cb5fd0d65c1325400073a7606bbbd4e3f57851d4c8d433af61ecca81bf19c25b9974b04e3422ed8187d7313";
+      sha512 = "4b1d0917208a0c7ff11535054a6aed42766a8daf92a044d061e370b127c86d4f65ccb88f371b6529762906af5174e0852663b4070e95842e238090b52e42e693";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ast/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ast/firefox-61.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "3d406553eb53c75a61bae3b62377c5d15b42b64a64e84068217a38785b39785927edd4f1363c5318a07dcded215494b1622e37ba96732c001258260733b2308e";
+      sha512 = "f74c8fea0b1d35fce816db8a4735feddffedcf428b712da2c3044dc060c0b474d909a230350f1277f03adf836d04fc18b32f173e0970d30638890b5d59db5170";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/az/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/az/firefox-61.0b6.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "0764176093cc608f6e0b9c521e50a4b0fd8894ac642ce3d14df884c0460d6df2f8fb2a9d61cebda475b9d7000e22bba87a677abdffbf13d0ad0b89a4f004ff8c";
+      sha512 = "59b418da3bde6836bcf69cf7efdd8f11752faffee2e37fceba16016864e476220e98215eae485d9624bef07b40cdfd242efa42dba97ec3f4536c5f9305c9e4ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/be/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/be/firefox-61.0b6.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "a282df1a9cf4ad2fa061eacb2ca49d91d599c6d98b13f7fe066649d6060b92a8a15c5a823f6a1d945dfe4c4ab1a2facf19b4acddbe614a0bed5f704aa717bf84";
+      sha512 = "115928b1c7281c8e3924053cdef5137398ad75903121ff5158827a1c133573bd2ead4095d9f5a1ca13a20b2423493d76e2ae24c10ec4ed35944f678f0a282f43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bg/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bg/firefox-61.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "7b3f4ed2c2c29c9e804291930c1af962edc842f567b2ff1c17aee04c9e209e3cedb2e462d8bd56f16bc2d9536e30495d74368f1c89a63235bf5db7c4bb44352f";
+      sha512 = "31b5a82661e47dc2aec8991ac34a0d265be74a9598fa3405d90b96b1b642819796de21cccaef44c11256d1c84b1bdbe83b35d820eaa9107ba53a7b55534e5d37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bn-BD/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bn-BD/firefox-61.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "92881d1c03a35dcbefaf5f66185225f30c83bbf95eabc5c6219dd957747abbdbc8bee28a65eadc474df54063f2a85bc1fc7f00db0de92fa2de38221ceb504562";
+      sha512 = "95edc99dc2466159ec195f1669ff161200b2ab95a6f3aac748990b9ed03b08b51dbfc65381359ba8b4d82a73bd5de73dd29e3e096e92e20c401ec2e698d8c46d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bn-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bn-IN/firefox-61.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "73565490419a39038efda09122f88b1de5f4aa3eb716ad7e984b8c0b86ae4c02901c4f9f10782bb8ce63af90dece08aabe3fe8a98b04367dbda46f5ab53311e0";
+      sha512 = "22ab9a5c9c7e207e5944bae42448e5fcab9c0266b4007af487671e52b6151a6e256449f59bcb43428f536fe520447cbf8e23e3ab998ce6f1bc9deab88bb4fd98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/br/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/br/firefox-61.0b6.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "6c4df94f9cc3b8997678c68ecd2b2ade8707ab6da388748604ad31bbe2af04a8b49f9a6d826036949252d50d7e188ffa30bec3d8a5d12f12dad992af1846fd09";
+      sha512 = "ae5462ef188b7e9cdc79b879a84dd1993961ca14d88e6b06732725098ee97e0855636638ed1df9e4cb02844372aebab85c42d86ce89149ba629f2b2f8b1b99ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bs/firefox-61.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "fc4ba1fe9a8b439c40c99b68dd4bace3008ba13482f8ffe821942aeb513b2975e1c83fd267d980e93e1cee8b3662d13f444f46c1bc4c54088c45ce2fca9c3918";
+      sha512 = "f99a2d3fd40182745c8e1c50ccb104084be8c567717c5b66bcbfb2fe1b8b4447f5467b4e60c87af58c82d49655cb79a05ad78ac86701a4ecf18beb39ce666598";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ca/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ca/firefox-61.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "c74ee9c4de09a65d33b1e2e3d21e5901d884f981a0d90c81e4715214886d80ceb219bf96c4c9a9e19e6b278df89c31b3232846a5d0f5539b5c1234a312414469";
+      sha512 = "497ee03f14cf80e9e34f54d64acc1889ab4bf510019c47b1508fc3ab72cd284c009d8d0739b2d3bba7d7cecf41ed67925641d81a34de867e8cb9262e3e12944d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cak/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cak/firefox-61.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "59b5a2602bc0fad1b77578179d73acf00473dc1426cbede4b4b42973ea62399b3ae637c728443786fbc78ff3a15cdecf003764ee57f23642167825a3b4e38ab4";
+      sha512 = "41ba583d7dc03a87123b0246f1d3ae2698af85969f362e73e3530b1704795a6566bc688e8387a5427a9d6321d30c06fba45f560c19ab05277755c802d4a12174";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cs/firefox-61.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "b583fd92f83bc2320b69b1a8ffa880c289128c31475d69924e6690bf8bd3c4aa3833883a3e012eccab850125751681c1aabb9f3c574d9b49815757e6d0a29aab";
+      sha512 = "88fdd62fc0ce35959f23fcdd9c1daaf25860e91618946d222a94cd1586c833761871014973d0a9320c9612455d007cfd4f0e01e2a0cad11401e0738e101c61cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cy/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cy/firefox-61.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "df9487ecf368f8198910df6514ba4c2000a3ad2aebaef3c442621008c8a89a356d38e3afde11471c426cba24b422db1104214b58b92ea9cfc040f30e817f68b5";
+      sha512 = "c5eb2ce849ef8058a068c34936f35cfde321b53d416d255df2d0f1813f26a6c57abdb718d4162325b869a9155b360d0c5fc32abc391bde3cede2c0ec8173abe4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/da/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/da/firefox-61.0b6.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "117f836242eabd1a393b3b5cc0530d6c0f522fc16a4703b52d3e24f45796a0573baf05add71080e1b96481b253bab07aad3a41166653eb0e83d46447fa85d8df";
+      sha512 = "6aa5790414c918b6f97b1b99d6d5cfa59ff4d619d0d8fc38d95de201f82897fa5d02bca3be86fd535ee2eaace5cc5f458a6289d416dbc2266c61ff2eebc84004";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/de/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/de/firefox-61.0b6.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "fc77f7d86d72c58ee87a05d25e96268d6c582321bf9d11d85f2cc6a471c43e2a83f6f76a3c846b27d096d9dc0de661b0d2289972a39c6853b45a3d761bfc40e7";
+      sha512 = "62e54d82a20c33e551d7fef97ae615833937515f362c5c74a2ac9f88e254f8f217f38717cdbb9fd827f882b2e2a75ece61c2217b62d593fb9e93e8fdf05786c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/dsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/dsb/firefox-61.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "99a01ad4a11bfaa0972014a1a7541bed757229d8df052f91a6935f8b048fadf015ba0db0f1bf1e0bb7e8437eb5fee692990ed84362ff95513865134fcf12eb9c";
+      sha512 = "0d8d7a77589be0eb1c14d9434acf5700aa1f4fb9349d1b20899774f5a65b8a7a32ff393ddc4caa42d6cb6ea8c063d8eb4650024dc7c2858feeb6b01f613bca60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/el/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/el/firefox-61.0b6.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "f0a9e8887a498e100ffedacc6bb5a988dfbec5fc06317e8c95462da20caa744c7ad120ad03637dc8392aae6c6e730879eddfa76dfc04107b15740cdeffa70677";
+      sha512 = "c1aada0c4ef3484285c233d5210097e26fd549f40addfdc2d953111b2c4d0e2f320ea3347d391a1a582d78fb798ab1809111c13e4187eec9741e49a034e5172d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-GB/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-GB/firefox-61.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "8f7849f2b3500b54ee876a4ded2376ec665e036e705297a0b6eea43c70fb3db3ef0a89b112a80814e3eecd770b34fd119786ec0d34ea850003fadd38299a8560";
+      sha512 = "f38b473313bd012cf4ed3b8ff327a59d10127816623ddcdf63083cc4132996300810a2c760eb2a8c2cb5d8519648a17b74790062ecd266e8e3e74619c781cf3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-US/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-US/firefox-61.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "de807109ef44c58e43c74fdcbe22553fe1760b38b1107ca99261e21b43da526bb875871dcbc27f8b9811c8ef4f742523526f09a4649ca0d1c7f10f69048ff997";
+      sha512 = "abf8f44cb3c2713e1fb0e9abe41a45e67c270e653f5cf34e07f9692862f87d51140bc56ad757c6f4a440b0f03ed09f0b6105a13cc3b5fa97dda6f0302dd37889";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-ZA/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-ZA/firefox-61.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "46a14786b361f0d8250634c4267835aad3f7737b0451b336065674c00392b0208d31f6a0d6d62adcd2073002cf75d7caa286be3509f3f5f3100111c23673fd1e";
+      sha512 = "4c953abd9000e7165ba5402ac52319862c228a2d58ce422295166a8e10100731a9a8887d989c2eacac416cfc655e18ec8c6ff49d6f34345fcae32eac7347e9ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/eo/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/eo/firefox-61.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "ab59244973e42a3551de4e6dcc31122f9b03537d4202a4d7645a598166e2847a43b2e902a70876e19bf4a4a083658c86dd5903cd3bc10aa0c777e20f55d1c796";
+      sha512 = "a104015a1517025a186d25aeb62aada054d53fc4a84836a0292be13f158bec83adb33cd52576e4562a871330c8d42d12a451d6472d77edcc46b074f336480180";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-AR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-AR/firefox-61.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ef48f5124704f10b03b442222765461c1cbda38422476c09787ab194e850576ebbdff741ac179f0c6ca8d0ff8e8d23a631eaef70ffdda09e9f8aab21aa557f78";
+      sha512 = "aa8955c97e9cf58d1e39798da746616e33d7dc9c1447c1c1fa222d0906d891fc6b44ce0cc8d29408a12b24f0829ccb39d01a4a8895b1c0117b86adb8411cabbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-CL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-CL/firefox-61.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "f15d84b35ad9eabe6a5cfbf4dbe1cd3bb57f4f2662b455c9ca7b69dcc410cce688ffd040cd783b65d429118a56714e0e475f68c25ebb6963ae1f0edd5493e846";
+      sha512 = "e3ef1125278d00395357d1b15c081938c618ef8f281021d26dfa973ea6b9ad0cd2b170416739a501b9e07ae51e8b33b5ff501f62573bef3471cc34fe5419cf8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-ES/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-ES/firefox-61.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "0b518e998dc2f584ce1ad652737c3331495efb831c4fd336a6c374f36e5d06711bfa7dd476b674df3cb4a91e25759bba09def752d9dc97acb65adf2112f23910";
+      sha512 = "c8ab8eab63c349e8849039307b86e7ae745319bf06c9c1553864eea078be2f4bf9f241872224e2aca2077c7d279daedc70d75da2214adf6503515accf4f091cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-MX/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-MX/firefox-61.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "f72d7622734489ba3fae9b578ef0f9f3fe84a7ccb673f2d8e3177998978e6e1b28ec89fd18aaacd914865302c00c6ebe991cea72392fc23ccab7350e23234c7f";
+      sha512 = "3fc3ae2234cd2059a7a2b33069e3e0e15d8ccaf8fb64ce504a74c414c4054904ead632d5b9fbdc20768eb9d73082da0db8234c7216b788fc704d8a8e7bb6d621";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/et/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/et/firefox-61.0b6.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "c57d5587879869e2f264e82753b9b53090ec530a98104024dd57fb3af06350121a547140e6ce4b06d397331e201329c2cf582b119dfcc56cf70acbcb47429673";
+      sha512 = "7dea5c3f7f66f549e3365bd1f2b63f12dc8e36e5272b184c49f5ba38dc93d838a361c84e25cd03faa50ae08233b49ee3389ba961ca2352a74fc879a4e39320bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/eu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/eu/firefox-61.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "471089facb9eb7b0878dad4845d79b1e2d6c9fc918ebeba770320bedf443e40e7382bc876f1664609c4a9a9888c39ef9d7ce9f3dadbf50f9868cbf17b0d7ed64";
+      sha512 = "de4775a4ee4269bcf1b1c8efc4fdf9fa3f987b84d899dbac36c25ada1813a35ed4f1a7e20bf11f7933156711405847bc5ae333770eff8a02623b1ee5457632a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fa/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fa/firefox-61.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "3c0a7a84b1585e9a1e27e0db10826aa37258180733c0bc1316f6b37e997eeba5edf7d8a400cd86b2cd82c2c31dfa36d5e44e5214bbe0f40fc250c59bdbc0d7eb";
+      sha512 = "00242ae07a7ca996157abdbc859539441d2067b90c1854a316e4d6b81f4245aa3a93078bad667073e5d1164e690bddecb03074b4ee9b9fd6f2366d141cc6c4fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ff/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ff/firefox-61.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "6afd3a5d162dbf2fa21ac75792de481aad75a82f1f1c6b6cd82456ea8456c0eace20227e4f54133a5a96f8c1619d92113b2006f17f49f8ef9fbcb9564122df33";
+      sha512 = "4e4de19fcd2a13a84820f8a69d591a3453ed8ec3ad27709528ee1ad0ad9961ea7a1f13a4633cf3ece10b927e0307b1916cd5a05d756f6b01d45bb1e9dc6cac1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fi/firefox-61.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "f7288a081aebd8e79ebfd2a3baaacb237eb9fa0b4a9a6314f6758af1c557b09105be188bef7a40b27389d1dc2bf60ee984d991f9caa77292ae0c7c100887c448";
+      sha512 = "19af4c8cc8b453f883585ade2216b2c875085b7ccc0dde80e4014fa5fac5d9e4cc712b48d82b5124359f0fb2c8b0dcd23cdff29855ee2669da76aceff0464c77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fr/firefox-61.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "591fcd8f2480ab578a530358241e0d9a624610199d315d7c215f7320980d29dd28ba4e8c35c40196ff284ad19269b5053133c9eb860cd2def922c277085d4f57";
+      sha512 = "fe5690978749cc755657baa6d0a729802ca16f0a0e2c3ac31e78f34bbb256ed081d18054fcd94b3aa5286e91098e5386fd96317f2ff70e7cc3b63984dcc97993";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fy-NL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fy-NL/firefox-61.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "1738b3175e9fb7fa67aaee3d1fde9525e85e2604777b82f0f35b48ddcf08f4dacc0f0698641c6ef05c4bf156c5d785223e5ed20b0b4ceff84860f46d4fc65a38";
+      sha512 = "67e7af73ac99ac2b895d46976b5f94f0f8c6d0b89eadc284b995013a44f93baf7cf132fa0f66db7e6248c04538469d55f32220964931e1dc50ab480120e75f1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ga-IE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ga-IE/firefox-61.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "ff6c3c96853229a582253c6bee51bd041bb0d5090b260902955b8a9db40cc22aebd930230cafa3633d2b7137e8601e107dc276b5bca03bf26b205534caee0118";
+      sha512 = "8b6b5fdd5d662f7794ae84847addd576ea74dbfe2ffad011df0b73ed1a58186138818e8d05833b01f58e408928b53140a8127b0fb35c7b35847f93e4b610b26f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gd/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gd/firefox-61.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "52df8410c5c9d0b1bfb763610a7d5e3e8d3db41e16285ee5b02be9994f88deb30648c209d29a1c63eb9539220ddfa99023bb31475fad40fe8f347bf41c71f2ad";
+      sha512 = "4c481d6b0dd51b391820ea937394c1527abc82107bfda98ef67952880702d317372d1369ce6f767f54dfcc4e3249bc190d23d8214148174370293125ae031cb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gl/firefox-61.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "dbb9000ecb87fc7d56d639ae6d7b92d1f78d3143edba153f363bf49869696cbaa24b1aabe081b48a5d324d9e7c783deaafaf5ec7d58fa99e4d1c0c3fa530675e";
+      sha512 = "aca1e148b4a4d5a7266d7d5eedb4a761b1e0c047eac2738a7bc28e45a083f59331c7d743bc97d92765140d41b06d3bed820bda668aaf7f8f8393a8c074269a3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gn/firefox-61.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "bef3b0648e7e2057fbcea9966e55353eedcc0f6e7de658fd5b472573a0014eeb387c4e625d95ec75ed289b809fbca8a47d79d464655eda8c0e9745f28be91daa";
+      sha512 = "2043c6cd6d0de32bfc3fae90c5e311fcafe665c7c8036fba9d2265c6de54c0ea9c9238f61a03649c542f534782c12da475d8e3b32cb66c910ecce0ee9ede3762";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gu-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gu-IN/firefox-61.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "e3d966d378a2c66ccf223b9f12191f963c8b8d795d05d854c9739d4e4418b95125bd5d8d97d783bcef432c55b17bf500a5b3fc391758eaace12d186a89e09df7";
+      sha512 = "5237ecf68ff48ec33302459801d5fe1163980b525cc3fedb634831dfbf915b86df075e69cc86bf7c8f75d23c75e6b6c6b11cc7967494e99283714b421202cec5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/he/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/he/firefox-61.0b6.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "3eac4e2e2153a3d1d2eb9aee9a0f7b8ddeb9bfa8dfaad3ba42a84f117d875a37cd9b67e7342f8894c35463f1b882ff24aed5e154cb7c8cde291632e6e66d02fe";
+      sha512 = "278d86a5e44e74adef879f291427a5027ec8b4f90b55a108347b56ed340dd0bc12905acf903430bdee40ac1d0d75685c98efa2d6c26fe976f20548c6ca3ec8ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hi-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hi-IN/firefox-61.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "eddee4cbb273883aba916588af0aa7205c27edccafa190532fcf6695f592eb824c92bbdcea22b9e0a2ef98fe4ec188b9a5afe8fc87212b3b10d638d6d435df71";
+      sha512 = "e94e4c9afaace5231fb0817887c9fda25ea08547f262337ef7b335a58ea16478f213e737a1379b1d8be5411f9036f787b8e3cdfde67fadd6623edc7444832c68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hr/firefox-61.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "606aa417c0dc7c4953f1c91b9e52c506f971c155491a766b12f3fd7780ac8df4da4a23759f2a203e0a8dbb25a99778def10edf4e3755dffa66bc489d55a413e6";
+      sha512 = "1cda9bf9a20e69a988519fa06e6bab8384f33389ee1e725b561335f9544d3d107ab43789700d88f606c3f92747857ec46510cb1942b644cf3daf40201381c275";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hsb/firefox-61.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b5f7668047c61d84a0d027e6750983be66889fa1da4dfa471ba79bf61e706341e877bf0333130332a6afada025c4d84d76500d2ef644847e6eb1984f10dd7a7e";
+      sha512 = "a92604b7cb484d425d4bb40feab69b75034002c4a38d4191768d025d07ab91ed6fce1b2c4edcf0db3ce0a8c3c5bca378def024f8f960d14c08662d16176895af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hu/firefox-61.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "1439004f92d61e0fcb9c8d4cb356b3c30c82375f17852bce49e63fc9d5b939ae69e9fe415b6323901460c77aaf98106d534c7d8fcda5dcd07b9d25512586e06f";
+      sha512 = "ad8e9acddc4b9ded3464f6b25391094a31036fb1133f9a1c31380d6f2f45ed222cd640f15f07a0159bd508208e58c70d493f73541575361482e91e243bd405a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hy-AM/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hy-AM/firefox-61.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "5df1b2406e7bc3b5ae971b69a67f95bbd76d81047678799648de1facae89bd83cbf00ff53217b1e9dddfa127351c440d6def5a509f39e58d9aa08b1d6c0c8234";
+      sha512 = "8871693fa031d1616dd036566c89d8ef8f0e6f14982b915697596159212f111cb285c45e9d0a27ea85cdd68c202e258e03da8d1e7d7d5d299fce5639202e6b91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ia/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ia/firefox-61.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "35d537fc26a8e51125c52eeba7bf7ae15aa9cece05e35f60937851fde672746fc6c8440c50c554e6b6606b76b8262024da20e9b1909dd69d99518a71e7d505c0";
+      sha512 = "d2186919c346e057cf1df9a0068799200e849f9435f710c78ee396cbb5190e7993a2975d011840ab3ab4405bb9ab367184d896417abe217227acd8dfe8f21dc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/id/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/id/firefox-61.0b6.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "6ec504f45a0653d9e51019e7bb095ba1d8b8c677cde65a68ae9f09dd165a124073f243e86b89e90c674ba91c19851500653b044a00c6c1ef761fac4456dfe75a";
+      sha512 = "fb9a961533da35e0a06ecedbda83e62aa1ec1aaa743ae683f7bde43f83b0631b15498c0e5fdb900f6fa8cd840d0a688317fe6577a435f0a4d445954f3be93d3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/is/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/is/firefox-61.0b6.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "24ef8c4de57aab0638a1d8841cab8335bada9025e051d10ba2e5c4a9985d459848d1d1fa6265b5914b1c5081377ab52c7a49c291388674d184a54162bbe73e5b";
+      sha512 = "95adff7893359d470c0ef92773419f66692b89c883dd244c014049e6869472b2711ffd40f1967588d17f763a2148463883357c084a72b9a52410068e9a4e2ef2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/it/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/it/firefox-61.0b6.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "016566868c55c5df99debd049540f72d51c7ae944cf70c597d166080452147869b586c872d694b370244941dc1b3668f7ecec164fca73d884d650b852b6f15e9";
+      sha512 = "fb73b5466b8a09dbc17e5b8bd4bb204fe449e5d49e5be2979eab0ced8f65d37db52a1c5acde742063322e214724f37ae36d236967fcce41d58037bf3fc9aeb33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ja/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ja/firefox-61.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "cd5e821c5f4bbdabb0f08e77eb5968e8ccb53dc720f4f66022f2ada325278fdc6e9f13d3b5bd830dd7867d3032c85ad869ecc25ba4eb8bdc027c8dd45713194e";
+      sha512 = "1578a5e7738cc2d85195e2474272ed68b6930020dd34e6ddb6ac00db682f138f8163a1fe0c5b2d179f3b5ae1781edab94dee4f6eae660c7b7a44123fa0a18202";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ka/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ka/firefox-61.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "21b472b694fcb31284bdbd1d1b3e531761db82e8fd5f406ca62251f9cf53e5f64fef659d5eb0372bf545560d4671d814895a4e4befe4313580e1a52714101d1c";
+      sha512 = "c2548b1f0636928f594c228af277cae652f8436c22ac7cbb53da103ccf03b074f55427c366b4e6ee5799dd3b19e057694658051861cd5d29b2162e3101fcbb3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kab/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kab/firefox-61.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "6a638a21a3c410811366070d32cfb4119bbf16d887383562736cf96be17bc08944dc062767ae56f7b6bcf7d4c96b97383defec4b5726879edb5be770c5053a42";
+      sha512 = "04c08d0d88ff6b43bf5ba0825f68d1563dd3ca05f8ea7c4143d9a6a9b78a9d53f65cbd15330dc755587b4511f998a86bfa97b6903f6a5b2215f882ecee1a8969";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kk/firefox-61.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "5b4e620e01362d763d3d7a98eb5559ccdbdc78e11e0792b64f29dd0b0799aeb78b9404d008c1ed7489f56ad553e249ed1d6649588dce0d7b6161506a743b48d6";
+      sha512 = "1eff82dfa45d685882364e10b4ddb869dbe6b3316ffb89961ed458e0e64023d546f2a6ae22a10480d27f941e059151592f3e1af79c946d639b68edc62b506ac5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/km/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/km/firefox-61.0b6.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "7dda622c7a6fd69b43cb1895c6faed9a2fef75c0cde3680c445d5b86b8d97947770e4eebad44324d71384ba2b407a10db045d4d108e412ca92f6a223a433980c";
+      sha512 = "18623bd96501846a497f56813ae415f5858150b85a3a95c5c7d4cf3e645444aca6de32eb4a6624833a0f3677f11c0b3d4219114c8ce90a4087bc1da41eb9c59a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kn/firefox-61.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "93f68424ec2de8a7e6c319e1d243d09c4e313f59e5e102c68b06e21832a88bd32dc56f48119c1a6b92774fbf42b920f9245a12650826fbb9549c77409f9e3b5a";
+      sha512 = "a859aa4c4c6b57ff2717104ad3add8ca04c7183db7ec94791c832ebf78f20fcebfe176a4d9a4cbc53e67a3f153350d91bb18d10299d3af0a590aa43766e37889";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ko/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ko/firefox-61.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "b4172a12cc3c785055f574463478e00d74aa3e0fb25389c8a4a67ff4966bfd74e4282e7d6c94c357895cf16265115651743302b28332fa8ef117bfd50778a3cd";
+      sha512 = "11c9ab7ad6e433e6e699a0aab1071cbc7b8f4e9a86452737b79a438c6440ce24e6f46b741c3c9785afa36ba85ba157c61d0a8377dc4de5be2e7b5872f4752fd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lij/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lij/firefox-61.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "b7303e3bf959f9eaaa06f3742eba9e039b46a4d00480651519d54a3df1b919e576c301e193f016d84f5b53eb03e57f58cd22f3648f289d4628ef8c7f547d8ff3";
+      sha512 = "1eb96774418cedd2200bdab29b2496059e3a99390a4ebd9a6ab0cc862748a7c5d53a895e999adada1be40631a083ec96181397401cf38a642686f5eafaad240c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lt/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lt/firefox-61.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "4e14b4b1617361769e1e8a8a621cba4bd7a7044f6a7e4c2ed28369b79cbc5473a438d68ffecbf42a6a62e33aff6cef0b8dafb135cca5d65d07d6f0028a362c8a";
+      sha512 = "fbbbbb31452bed65635e3b76aa2a83338cee8a84eb372ce26b36824c207a02f646a8f7ff3b8efe83916857c579c65ba66a4bf8bb63e1df2a7d248af4788f8649";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lv/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lv/firefox-61.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "0f85c67e06eca79e14e9aa41fc25d6e8371289b97d39a1e2b3b6a0b9c73398503f70e5a0cac1b02d9fe12daf805e35c433c78962ee52ea03d151b1d1b7254dd2";
+      sha512 = "1f9bcb234b11fd5bc4558cd18f263964379c50459e2667894f797a488fdd474b2b86db9e332c8121a78ea7fca97f0b6aac9e0cd71756df4197291439ba8beb5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mai/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mai/firefox-61.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "9a36f85dab0ace56a361bcb0bc00241aa3087028f4ba8b91b64e76963e8979a9bf4c526d922449e39f4f0a574d0f9d7d29cf033bc2832c88be76ece443fda6da";
+      sha512 = "babad97e5f7430701b38d8b592b11e3e31c6cd5877531a612d41e8b33221c9747a0b462fe938e0a724d460a60ffd4ae42107a78cbd184aa5b22a3b1fc86fb449";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mk/firefox-61.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "2523ae24ccceb2a884d71238b406aee20a359a881039e0e864b49358f2673f44663e105efea7ff094656e54e334c1d9b37d9834a841ca3b938ba4b2abf14bcc4";
+      sha512 = "9a3e12e9c3e871204de6ec6470c7daf9460a0a412799f5451a78001ee8af0bed3f1ac96b52dadbdb5ef63fd1355baae0adb06115bcf826d0720dd816f755f01d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ml/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ml/firefox-61.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "bc07ff82e6e2521c40db7391cad7b1246bbc8b99b45653cca2e76d8ac44dd341f66cb0d28b93e0a454ae78177b0f85b56b5cba3bf43a2a147178706544435874";
+      sha512 = "3f83993c15aefc974c246e00f750bd94d286f50393d2b3bfd6f3fb3a5f6c98f09265386d419cc1fc9c2ec62542fc1410eb8fb0ec66fa53cc9087ace482288389";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mr/firefox-61.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "aec0eabf17162f0750ad54003bab89f5ca9d4d059b88d99c2c07877decc64256a411b561daccc0eab5fce16a642daf9a6f86cd1a2f50a0d68c140f44ca941404";
+      sha512 = "e730a4555cb72bf9e7fcbfdc7f8732f9f62ba0339c53f7c5efb4752a1d344ebc535dd4fb36147ad724a4dbc8dd7ec5aea63de72102c28d3e5f3741428884be53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ms/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ms/firefox-61.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "ffd034a7fcf7ff9fdd03539f84792aa5f3ff23276f846498aeca15b55fa2d30791e4ee66eb0f0867db2cc3f869d306a36cbe8501957a224de4b17b9c4a0dbfa4";
+      sha512 = "93b41b7e5dfb769a61bc9051d4a86c94101d44ff905d16c6a4764b67813c047e57ce21d33c3e39732c9ce904f3fb1c3cb9d0e167c7531c99bfd525f3a2af65e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/my/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/my/firefox-61.0b6.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "7916547a252d0e3e0161b6c0128003407718a2d88748ea33933edaed37de07baceba825cbe64aa9d78d13c5a303cb870a0d282e05b6fee3370ab209e27329354";
+      sha512 = "6cd4725b388550bc37b661e900dff1535db40f264884666e497ba480d88e1cf28ae1b2ee67b806d95c4fbad53dd3978f468688e6dc86b2de7a52cd1fbc9c0682";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nb-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nb-NO/firefox-61.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "bebc0324bb9134644dcecac3519dff56ae0f394bb36cd6030641d2482c18f08b825eb2c197f9a87748b8217c0b43323bec3056f7aeb1633aa46d0d049d3c8528";
+      sha512 = "2caea694cc0c5b2405c8e135895a13daa454008f1731ffbe88051c738a9529c627f4ada3b4ada588a0ebc7f10b2bdebe8d021a32aed646e233a050d36ab0c016";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ne-NP/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ne-NP/firefox-61.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "842c6f1251e7478b285263e8d46f36dc6bb9d5216725cb1447b0272ac439c284a72b1316095f35bb10445617c15047c5fee84a3763ae03120658c613ed5b4ff0";
+      sha512 = "9dc52ab05a4845b2f8cec4761fbfbab0e6872c233058ee2950d96e3b88e2f21cd155477e0bdea127c0c07cc2506f2b90015a2605f10d6dd38ccc6a3ea3f0e5c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nl/firefox-61.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "672d5083ddca12a22a3fd639610312c13330b5cd6c09a99bab1442ddd58c86552064a4d555eb7331c658fcff9408bc62617f80e7797c4c502251791585b2035c";
+      sha512 = "88bfa07f5275f7985fc42cd42802c6c1b077c0dafa445a29f0a5346185a39aee380781b6112da52d79fde13eea4116763a2ba0d54a957b6d7b7e7363330de68b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nn-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nn-NO/firefox-61.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "ccedbb3b1d4eace21851c3490c3779eb29162cfbfd2aec987497ea949dc564a6b516c16ad08c31fd5c05147939ac329f8853bfdcc6af17259a905a18af9f4867";
+      sha512 = "70ffe5242dd0173a384f59395151cbebf1113088d0880d4c4b9107317fe4135dd36a49884d986c44ee4f52536eddd35646e956afcff871a8250260ebde75c852";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/oc/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/oc/firefox-61.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "872532c28868e681fc230582828d6ff19beba70ff29b71aaad85ce19422d68c85560def8cbee5cdbea6b8360cef5827a84b1116e1fc309d94a16c6c2fe9872a8";
+      sha512 = "9215eba4cc0dcfd27c4bdc2c8f89f71504d50a9636c240e275ca87c08238d09dae6a012bd055242d3785f04aa8a6d08a7acbede48af0d016ba5135ce901ac5ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/or/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/or/firefox-61.0b6.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "12beee4eafe1c5f41c772bd2b8587f92bd2318af776bc09b935913006b0df2ee7bff7cbd8ad621737ee1c83792db96d51b7d7ee45fdab829c5cfaaf32632e82f";
+      sha512 = "12f15f3fbfec5ac0cb0336a1c1085ce820906e75e58572f7dbbd9df7a5335caa59da4b61c7afbad875b73049521c0a5a478ae5584828f512eb0dcadb591755c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pa-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pa-IN/firefox-61.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "97d3d44d1800b9fd8cedbd90cac6472a3f2f8c4840cb7aa93bb08acb067d47f80c98e2ba3c8d8554ad8987c0cf6d392f64ff0a08127481b30c23915e5f986ad5";
+      sha512 = "b8110cd53fcdb4f5bc4fb2c80aeac28790e8a7666ce644c6a911b7e33842ae2ad12bf4ffdb5de68eb24ff7f66f2d54d2c2c363050465b1ecbcf59c669e991d91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pl/firefox-61.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "6dc388f02cd52c50bd158668bbd86f9ffdf80561e9b9da207fd1e57286d8bad40a4a54fffe02c7102e325ec7b7ff3c2ecc2bb4cada9a3dea544efdd73ef02a98";
+      sha512 = "969d4200aedb22282febdbe652e9a36e197b43c9e038271ec5fff6ec1c3597a2c90979c66d3fea3a4dd705ebe5072cc3382aadc6a82fad7a82c62a138430cf5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pt-BR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pt-BR/firefox-61.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "496cfa11dae110e7d8484fbe43ad689f7d0f6c981c8dfc1634586c533db23b417c7856e63257432d377f4f1b354557733738a613118178eece59049d5790fd88";
+      sha512 = "d336b27d4ec459d4b9e101b74a267d78245cf18a47e9d79f118a5ea8b04553734ed51aca526e16c8e208726240112ba7b8a112aa6dccb5431260690af7c43676";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pt-PT/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pt-PT/firefox-61.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "294f8b13ced20c26151fa75fe5a3471de4e56a70749cdaa99cc0058b3b46f768321e24897e830297e4dbccf5dd1979f33f8902e1e287ec44894c0113f5d6e50d";
+      sha512 = "6b06591468a5fd3f961be6e42d7df2bb302bed493c6c68816fcdba59ee090117529e2201e686b1c06a83273b29e807002c7b27e957f9d37af21a2fdf7ec56a98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/rm/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/rm/firefox-61.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "889517c9b6c5a01263dcc5af5badf44d9692bfd227bda75e376bc9f27c2fae6a8631e4b5673f105949b16594369511fa95812af9f46ad32eca4e101b344f7474";
+      sha512 = "43ee24772c6122341f1f88cdf84b23d53aba46af9fe0384a2518bf6e4c673522c57c52d211da306c7ea7b672ed1048f93a06861af39d024a8fc025b359af6a83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ro/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ro/firefox-61.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "0c9df0c551d310e52a21f6537b883eebcd736e1292f8869a9fcad8d1f505a083ee29ec982cef2b46e487a9a9199ceb97db62a5b2282b7608569956f3cfb370b4";
+      sha512 = "dfbc1ec09705accca52ff20fe7b89ff724da4096f3c2b835cbaa3eb7e16917b808a8ffd2d37ffdecfcb905f0bc06f0bd620ee200c01a653cce9ebded6e475811";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ru/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ru/firefox-61.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "96ce1780836d7a8275024484134a8b8803fb082f608f61d3f00d7f2d0e48d308ce23461ddccd45049adad8a0cc57fd3ea3cb9990ac7c554f6cfb2ccb53de2c62";
+      sha512 = "4849669929700d2d68ced2f63c7fecd1a8788f071ab7d9719e69a63a8418a644e3c74ccc4028a27de160b796c0a08b33822890c355c8eef9512c72490d3d5429";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/si/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/si/firefox-61.0b6.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "75519c81200b371f7a95995d8f4f937f80339eaedfeea581f977f82d3f0883788a43d556f30f931d311a9613b7d13925cf76c2a8ee20eb0886ffb50dbdc2f539";
+      sha512 = "95fec85b73f616c5fe5a3a7da0f6b76efbe6b886c85cc7fdc66960ba6bcfd8348b0b77f599798794c0600c914274b50e878948ef317483598dbc4909bcec0be2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sk/firefox-61.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "b5ce91e583eef01a4c05799e68349f2d5271980862e4b675575d0dd191f1944e7b81c6d111c00b8c28af5bbb32b5e9fd8843a66389a04a2a3bde30ece4dc9033";
+      sha512 = "fa60e6bd7cdfe23448ab026c4f7b65f9b850f009cc7a3b1496e1e883316c01ddd67b36540e90d266d31c9698ec9b7db25e11e9324143eae7d3fdcbbfd80c2de8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sl/firefox-61.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "2ab9f922a208c5ae1ba1d1a00ce719836d16680588e7c7be7d27a8da1a285a0be22ab5854849014b05ff068b65c6f52252b756308a9b6ea329f1b8c0fb2499ba";
+      sha512 = "c25b83329323f236d76783b17c192e4e5433b0a24d816bd81042ad082b0f7bd9905119277e2806645b0c3618eed880590c746c1516797a6ee0c633fe0baed102";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/son/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/son/firefox-61.0b6.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "c61d64dc05293a3c88d2d4d06959779c778149180ddb0932891b2b0ddb67914b93782e827efab0dae2e3709a979e7ff34666cf4daa499a16bb42bfda4fe2781d";
+      sha512 = "26fe3799acc8e52768b3800bf06ec6ae62b030dbd39a6149f9a6623be55c031219125edc57505762c0f2ec4002d1c5bd1cc45f11baf36eb5eec921559c1fb0c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sq/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sq/firefox-61.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "4d8aa23a3a17c2f8f587ec78f523bba59a4bdc1009bca4912e94a0f39bdbbfd375fd76cde61f074b8b3aea40ada4bd684255a0c4ac0d5f0291dfc8888e4e19f5";
+      sha512 = "d3c950fa9d518337e57b53e02daf4539decfdd12ed09768123fbc2d064006d99ab6a02856787c204e080a7ab7e222fdd94081f79982cdb1d7c9d2a04432f9e89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sr/firefox-61.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "6b6f227762879b44bd6bc71dbd5866181b63760d28a4fdcbde1fb50ba746d9e1f3bbde2c0ea2b0e16cce156341593bfedbf1c484f339dc0a27c8c7485d9d94c8";
+      sha512 = "74ae91718c024a69c8135a6ea31936c877be690447686cd6e70c36aeaca23bf9899f691b65d705a4608202832cde9c4fc24b60c2f28e97363690a1160df9580c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sv-SE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sv-SE/firefox-61.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "f036a3799723d74ca21f81f7051e65604d11ee898b2b7a2169f6ee27bc6745a16b72ca1719b68e7b76fcf6023e982ffa6a372f136ee7fee8fb1c11b90de90c3e";
+      sha512 = "5a48173317d01e1d3d3b55972c22994cb6f90e70a4790006b2d077976f4e8c2776455b30c0ae7caa4c378a1ce88a7d33357e451e991a577d5aacc34e9796a8be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ta/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ta/firefox-61.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "8a8f4e1b22601b98a04b71dd85f3ae7356e22ff94c02e9f2ba1f522c30c7ec76e6caa3e3b9a71dadc3e4acbc9ca7c28e8bdaa2867482d2536179d9f6506f49c7";
+      sha512 = "2f24d7d6c8800943d066ecd962d4ac1047424e13020770c8585cc005fa22ee11e4050ca9b093d55534fb5dd60a76b79665067ab1b65d7321cf7f5bb014894248";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/te/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/te/firefox-61.0b6.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "095629cb9b28eb3b48edc66c435c16dcdcc774b7478db0bda3e8aa3f028f600551cf4e190679aa9864658b265399aef27e9c64cb7544f7f06a8355d28f2c965d";
+      sha512 = "9ad81ece7338318f854acac4728eb81389327669cc5ed825f0fdcc2c330e6d871a1df5033bf52f8fa3ee5cf92fc94674b44a7f9e26d0d02f5000eb0d5c990362";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/th/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/th/firefox-61.0b6.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "4918f725a9a1a05bdc2e3056db29dc5e9cca978071c55ad5c8c1a87f1a9119bec0f434bde5c274b5e9e892b49c9a259cc116d1974e3a840f98868721796eaed9";
+      sha512 = "c031247ef411d89abc0d219ce83418b3bea2e261bec19e2c454e8206d80e78e1bc712922d9fa64091e3cf881fcfb09dade12ec163c628ffe17c8472f64ca8956";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/tr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/tr/firefox-61.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "1a350ab2d69ffa1a97b155c7093b5e0c06c8f1061837e19cce52ccb3755bab6e189de77f75771063710ba386b4f1116f58f289c56ad370d8b742ce038528311c";
+      sha512 = "2e3641e6c6d33d13bf35a0996775480eaabf4f80556f8a06dd895e4f90a01a7596e45a90e3e85b76cf271fff88f15b61c0f9e14cb91560556d159a067f199abd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/uk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/uk/firefox-61.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "1623e793507396aecd34cfa5cb1aea1f1ca5ec2007823dfaf73e929643fb630fddb4b81a745d9fafce1fa8b43662b8b09a522f2bdc2456b7e6f9512b4e7dfee7";
+      sha512 = "7ae337395201e2f269d09f8669838fba19eb222673e763a29f3b9324c939f9bfc365a80ad87d4a3ab15b20ccd55c25c92392e4d26aa47355d7649de61aa25541";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ur/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ur/firefox-61.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "6dca6a4bf4608cdd3869d0bde6648a3881d334b3a4bda20bff41626581204e972eafaa272f56b39c051702dcd9219d2b104e2cde9b2f90d0744709bb6ffc0ccc";
+      sha512 = "df727c8439b09423d11ef5ce8c7c38a767bf1b537e6612e3d0d7deaf94a70430ec9a2aa22de5f47b94dbbddf8907d1310f87f0794e251275826e5ae8496e48f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/uz/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/uz/firefox-61.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "1131151207ac3f9248dd03275174a3efba159445824a40bd7a008c2b07c28bc5641d315581e0d98a7982659aa2bf2180ce1e596645e0d780ac42247dde480863";
+      sha512 = "1ccb4a242d9bf02781cf81df7b62a21052a257bc98d64ff827528ed3f1f025ac86a8a87c6fb77ea8ec93f31ffdb6baf9f499dd3e190fe501e8823aedec84018b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/vi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/vi/firefox-61.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "cad7f937f930fe82dfe99ca44d7f2173efb607f8ebd9725372a670abedec5fd26a390dc899ba9b712c9a533f6bf39356c4f7593459bcdd99a740a46dcf2295d6";
+      sha512 = "538d1f17a9914171c919027e3ffad15bc6f7ad4b649a037b168639fb1144db76dd78cb588c105f67f1d7d907b9e6fe2f17d56ee3193490b9be548ad384a56882";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/xh/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/xh/firefox-61.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "a84b9524c567ff16290053cdca4dd494395e4be57fef0282e735795e082ca914abb390f916919352adf4c5d17c163a2d9316bad2348b35ca78529def36d7f83d";
+      sha512 = "fffc1997ba99b1407fcf2242c88c0a48db8a43ac3d07f28557fda510729eb52e542aadd514a83dc54e0b4c5912f84117aae05fe230080c9bab8279baf3818e3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/zh-CN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/zh-CN/firefox-61.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "eb61ad55d93c1e2be656097148a333b78b07c023f60dd9e2f02e9e0c12c42908e96313a05a5cdebf1a51ef210d66081107aeef476a69cf53092b992229365046";
+      sha512 = "28c88ff542004d78d07a19f0b3eae3ec6943911a755ea2874df3bd37f3a214154b7a023bc3519ee8cc8cc4736f67a01c7638a2cca558e905e7923c6337c8e8ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/zh-TW/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/zh-TW/firefox-61.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "1c73f4c230ce3e518721fbf7f1f536d376533f6e56e3b1f562c64d21b575b91055537bc9114163bd8c533b641e68d78892217155f1c9bd4747e3ee48225a61f7";
+      sha512 = "0a3676724d24ab7a625b768146e94a09332ff06502c7b1a72f82777875898a2f70717206d1798581d91d4d2991d872987fd4029df1d738f58b42b8a6d3fd4329";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ach/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ach/firefox-61.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "253261fff1c5c7363a96e185a816ecc59c16212fec6424fac394d9ff6299d33e27928650d2ffffff76019f1c6df7a69c51c16292d987daaebdb745620f7d1970";
+      sha512 = "9a1b12fc9a0a4f97fa40f3ef51cedbcad60f44b9d77a7108eb6d8c33a403d333b58f9641b9a85eb61df9bee7d2a72054c2684548d0a5ddfcb8e87696814f6704";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/af/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/af/firefox-61.0b6.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "47cea191e24310f3b756e5d146015097e2c0cca02769f47213a84ad63039148e7fadf2dd727202a3854f8768014bff18672a6b9afc29bcfb0af72f418efeee6a";
+      sha512 = "020de326d0856914a43f1cbe4de14a95f0a051f99185cf9ff9ff122ce9c1edd9ec32f28101fdee484eb5c3380cb758108e309168051f048a4642598a2e4510a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/an/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/an/firefox-61.0b6.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "96118b013fd5e77802f7bfe7870c9ae07f10687f5ba71985fd346f2cfecb8fedbe86b9d9ec8895fe237d390cf168d1a14ea2bc9ce187d468fcdbe6867c614611";
+      sha512 = "22b4e8d23e466c67bcc13b47973fea7f027a4c41d4c9950bad65a119f94d32935b33d4ed93979fbd8145d844aa12a38895a5ba932e00319c67af0f5a76cdda5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ar/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ar/firefox-61.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "75b034299a822f78ea60c0c0253fe46863d4ba0cddbbf02e64d5bd551b2c5bdd4fc456545f1b5cdd553af47c03bad6afbdf1d1137d570b35414aad0afee4892b";
+      sha512 = "5c6c05dcd81a988065ff94ed8ec93d6bfe18e58e877b03f5610ad2269ae46b5f8e3dc3c3501ce95c5301b1221297e815276dba2753f8dd75dfd8e56b8df5e2a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/as/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/as/firefox-61.0b6.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "2d04a057dbb74a7745d36c85f58604d4d50d7838b7498818a6e900c7839ddf6f28bedda074341f8da877909330123549a8b57078723f3c2c081bddf5f61ce9c8";
+      sha512 = "244e0a6a34a6498871c599866391ecd7220339540cf3d0c3ca5047e1a9cfd2c79dd4709c2286565fa294744be405a7afe01ee5a7c6876bf51388b87d0e42877a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ast/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ast/firefox-61.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "3877139ea20a6de4fcf2217e0ab53e1ba1cf43cbd10222b265a728d7c782b0215fdbd4a51bf883f2a089439b9d8964d7ee9778a5e7680c1dfa719763094e34a6";
+      sha512 = "a2516fe624f20babe6d5cc122298127d91d822237b7b7d86cd6a54ad85579b1cf2d63d133b17eab4f54e128cb71d2c4fb6a6c09bf55e317af26e2033f1f598f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/az/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/az/firefox-61.0b6.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "958a242fca0f27ade3f8c25bf9f12f24bcf1d7cfa51f103bf77e2e493fea7754f00577033a37db0130936ab84f0e03bae986895caaddddc705a439b0f1d4d4bf";
+      sha512 = "cc8dd067bdbe62fcff881dd4661138809486700145eb54f2a6c375523f98d8a8da92672049f745cf7ab6e67cfee669fb8a35f572aa6525404fbc18120bf7a709";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/be/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/be/firefox-61.0b6.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "375048d56637ddc81eb90088cae26de1ec4ee8f25ebf8ae9250032c25737917306cfd39a65e3302d85c1573886f7b829b0dd3ced7d4b7ba10ff4389f27227861";
+      sha512 = "540a41b4de26732c30ed8fcdacc596373e3d91b4555c6d622ad169b44d1f54051d6a459ea7f1ab36711d354ae2c8e65b9db3f3f318cdfb49ae6a412aa9f54d2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bg/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bg/firefox-61.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "0fec26ccc4393e904c31f40d78a784ec3d0191c75d3086cf9efb0b2b64af93af493e2ef8747769edbac70758435ef15d2d1890af1b44ecaaffe2e52ddd5bebaf";
+      sha512 = "d86c89ef09d63b596769d96c98e05ccff275c435d5299877023d59283b26506d1a1ee9a4d22faa66b2e4f9e8ee92984bcc506aeae807e40bc0a856d3fb2c3fb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bn-BD/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bn-BD/firefox-61.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "8536c434b423bf969c167b2f9b40391cca26904cd76f022d46a9dbe127e3647d1b1cc4dcebe08d5b243fe7ffd115c9e3cb1607e556719210e5cc0ad7b10c7aaf";
+      sha512 = "a2b087b07764847347474b5181b161def7e2551a206cc85c2348fd36e490ea4994fe6e14b25d3963993c81be86b808dd353c0bfa768ce7406a7b79b46d04c67e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bn-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bn-IN/firefox-61.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "ae5a493de97a56a15b182eef69079c1f5d59432259b85525a32a396c4537c9359bd41eaaa870f74f680b345cf9c06c487e6b9ac2fb1b5230b404b3e7eb614029";
+      sha512 = "68928c99f7b18bea8c9451e77d0aa125187547f9f2aa6e8b42025ddbccd104e14352ecafe9a242d59d3ecd0fdaceb59f7522ce90dbf462bdc443a40756785262";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/br/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/br/firefox-61.0b6.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "e4a42d0e480313f3346f50de408ed02dba79eadbab368cde5a93542bf0c462c378d79f9e218526667d398795e3f1665f5b89f44d667a34b88560a2d8354dacd7";
+      sha512 = "12225c779abbe923419bb9824f1e55f37a68f70cfa4e847ee6a44da9cc6c1fde6a97720a2a366b8ed8b3ded9e58447ab6705bad30cfc09a3b51729853c47db71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bs/firefox-61.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "0a0d7471a266ced527d7abfd36eb0cfb768d5553efcad7a2e19477ebedfd4942af7d12c123babd9a1791d8ff4c5a5712c74f3595e1f89d9eb0413bdb81e7a624";
+      sha512 = "dc0ee7c8ff43d1e595ebc5adf3cdf7d95a55824294af4542c94127a21a5ec0ea7f8ceb6d3f5268669720d928df2cf9c307899141e3e0c540db4779db2c9d09d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ca/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ca/firefox-61.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "6390ce2250cf20e10defa3d8d75098d5f9c58919f57415bdf742730839958bea2923e9eeccb9bcced97a594c67b54941dc1e1c3589d7d255632b32b4c7192799";
+      sha512 = "2c631c16f8a79ca9fdbf15b5c0c70eb6728bc116030b180c921c1573cc470eb7273b5602d058c88e49be1320da62be5d493050574711cff7b6f40e6ea013ed82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cak/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cak/firefox-61.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c853583283645099dcde8849abd0b3b6ecd98e791ab230ead55cb945b4bca1d91842bbc0cc65fe98dbe16cd284d8f66ff053be643b11d0ff4da17f078b4cf749";
+      sha512 = "2a94ac3e7ef69bcc5949c1e920f55dab9e8e18c1a245763aa215b89b4bbfe1ce08bc00ef463e1edf66ad55b141335f4b4bfc0b09562639c80e9ef48181099643";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cs/firefox-61.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "f7cb7accc1c44205fb893704cbac0b9c08a6a36bafe88098251a57ca80f69699ed04f27b43c0be43c513410a91e1ed391c57c566443e8d7746de5797619b6290";
+      sha512 = "fcf60a56ef5d9bb195368f8883c5fd5b7a361e68377b1bea6a3647c392d3b818c01f17277f834e99bb55f69d9b0c64910df918504c09f3e2904c600217f2d262";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cy/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cy/firefox-61.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "b6f324096a191c9ccf4e5afc8eb65fbd3bc6fcca4bebb1abe9ecdf7b766ad14ee4a598bf83e341e47a28e13ddb8ddee5204f2c9b906b691986ba3fb963819f27";
+      sha512 = "83e34b538d183bd1c0edbae19280537523bbf1388b30b91a5220430255e824c6d8bad2aeb1e15424857a6a826be1eff5be9af0b29a57d637c061e2cd6bcf4fb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/da/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/da/firefox-61.0b6.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "d4a9d5cbba8d840cb493819af66a03bb612cb173c2d8b1462625adb8532e512d9daa0f6a49a8771b3c96afd508109c16a17a65228bca79befcd3bf565b707bb4";
+      sha512 = "f1710159346685fa87656b8cb95855e97397e0b82d551b7321ef709cc0ab9e58afd5ccf3613b45667fe092f4fc14411b9071127b1f597fa97d5ec43457b91eeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/de/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/de/firefox-61.0b6.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "6fb875991cba1c1edf066f9ef44244c1969ff5204f36ab1c643c606adf81b67d578cd861ea16cd2d2aaba1ae37f24ebcdf58248cee4af37d11cdd608e28a7d54";
+      sha512 = "0b2c26defab26023295668bcb5332258b855f1b2477cbbd284cd36c46f355921b072069e523db621de08a73bbd5d2f773a7fa4aa1d0c980cdb0c102cf7a99c74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/dsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/dsb/firefox-61.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "40b27493dbacbff086bbb26396a6a2cc717c4b617c021fc4c1fe488550c6a5f7587f7d30ac6e48dfba91dfb4351b02af4da78082a38da5b64fe843455866431a";
+      sha512 = "e7ec02c1a2a5246bd2411c5f277fef6f72c0f21e5bc1bc3bf0b4fc10e384fd0442c092604e46546bff9a8e33f803a6353293949f4f3310b9dd67ce79e68c5335";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/el/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/el/firefox-61.0b6.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "b6a2ae45054d1abaf8e6e0bb58664a5a1e8476bb62f8f3cd3005121eccf38eef68927d1a46de6a6fec48586aee5ee441767e4235c8d6e7029baefea07fb0ebdf";
+      sha512 = "8639b3c8e63f8955b46440f9d5b1b440c90fe0be9ec730d05312bbab26e15d96e8f1695afa65ece123615bb3e03d8e808e18483fa815b575c893840075cafdcb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-GB/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-GB/firefox-61.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "55d0e6a65c897da608f6c3ea0a6cb6299ceaff15d29e45b34c3a52ff03c85ab85fd2d39c56763f0d589a9ef5085feb3af355758058bb4c9bc12dbbbba5ac7b4c";
+      sha512 = "933be5812db81948566e2ab6216c98cbbf6f1fad32bfd9a5516f14cb2e6bd59fd1d34f1f608d94d3a832bf616d75317e03ef2fe797372cf0bbf86240cd47a414";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-US/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-US/firefox-61.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "22be622ed7c9b621a0782ce727416b78ffe81afcc92b5af840a895f54cedc843fed1fa256bb452d8b5ad721450e5b635845b92e621b5555b98a6a16ca59b29d5";
+      sha512 = "3d1b26b26fac99cd8de9177d56aac1f94785dd22cd32f94f5aa091a4411b6c1e3fade83863ae3badd786cf568f966f469122fce332d433682b818ea43f7ece6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-ZA/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-ZA/firefox-61.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "0442719c3303a9c1f4de79777a266bb1b7544c8b570a69e49746c9455edfab9aada9330280d6c406c5e89054d15b1e89d0935fac7ad4ff80e2d34159706bbafb";
+      sha512 = "795bd13c4ddaf19f4038658a333e8721d334c263ca57e887b944358d43bb3a682883fd3aa7b2e8abfaee1cad5bda3cdb3828f6f9f516c62a06f5899cba660af6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/eo/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/eo/firefox-61.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "9addd422b92067287ba5cc0f5ac14b662d55be8ffb65377e13d5a314c8a486057007a6c8287b8e79dbe12fc59e05c5c09fd79419cc56f83ff0ecffa816048224";
+      sha512 = "bab45a77e2ce6d3dd2099fe84cd29a38154209339c271d35219b36f47d5028e87af0cf848e8938b8078bd94be04ad43c6f854de929d9bea78a6c029929e6ef44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-AR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-AR/firefox-61.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "2043201d4622ddfe333f755191a90290a533fc93b27e8ad2a10e75a8994e56e0de9ac08e391c49a48028252dec96bcfcfe14c1d6c362780ee25f02296969d592";
+      sha512 = "7b3f2df484031f9273b1efe6f178c48d2adea19edafd7dd97cf7d7056153730452a1711eac8b6303e069b0db063192c4678dfe6a177c046574984e47934f170c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-CL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-CL/firefox-61.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "365c0f66382ee55f0cdb98770b9e1ed31ad757e1aaab389f2de83f00dc8222397f2ffbe25d2df720715f78e1af19cd3c4c27cc1d8d04e2505fb927474d9dd42d";
+      sha512 = "05155d10057257f05baeb3803613f98665a43bab3a0b24c3f6a0900d23bc397e30fa28cc63e94cf704e3c505f1f0e2dd73b08e2f96471cdcfdc626e7c5c702cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-ES/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-ES/firefox-61.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "5dcd18d55864e767333026b73b1d931095c1d7845ccdf165e8a6244a0fce84319ff9e7ef212a4c69574160037d231c4b44edd243e15896b79c6e24f14307fe17";
+      sha512 = "c041d8f22ad8aa0f4ceda16931ab1fe6121e826280112dd9d2e991cf24e77c6d333175ec449fbf26c44eda79fe80380d7b17f02cf08d0bc23c4528ad37a6a5ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-MX/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-MX/firefox-61.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "f5e7683eb473e8c411379515836e669aa9755af26746ec5c56c2f6566658b93bd5b8da44e8ee40789d8a378d19e9b63b41ba9a3da95bc82b85f43d0ec34089a1";
+      sha512 = "3a9d92db8de44c70eb4b5088e05f957ee1dcf4323bfbca4cfd1fd9e62332bd62c21e1df11792cdac4abbec39360a3297730a794464f6178fab7346a3175e1d28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/et/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/et/firefox-61.0b6.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "e33cf86b0d591e3a28030ec7c7288a0c97f6258bb7730e7edb850840132ea96dd499c8e2f7fb95e09acc344746ad83458b1d32615debd86d47cf2076c298ce46";
+      sha512 = "12ba06007590a385453d1de574156bbe896a092db5e25009ea5f2327969c6affff9d0960aa42edb4bc087d9477fc4160f3ff579b032de4e395410530154bc737";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/eu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/eu/firefox-61.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "c81cf96e7fcda3cddda4751afcbe0b7515469df72b2bb1fc165659a09796f71d29fc70d6c0bf14474eb81b95490dd160ea4dc7b2292696e1998140f3198932ad";
+      sha512 = "8e7c4e62be76d105ccc2748bf4b017f7bdd0f646ba17ad11e7c1cb14ac2aa7d612bd2f9cd39988624ff42fff57f93d27b9e44a31f8798aab54c1ec55ec027236";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fa/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fa/firefox-61.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "af7fc526c199b75fb8954897d785ebd7f3006b10e5c1306690fcc1161151197892b802bdb20c389be1d8a799a3298b71fcbbc4eadea7802ec4f163484440d4dd";
+      sha512 = "fbb18fb347ac5319fa54366c86de16c615be994a7d3c179dbdb84c0cf349d53b5a9f850779a5c0d2fb4f58e14d2e18089d7856aecbd62c1cfb57382623a67612";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ff/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ff/firefox-61.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "906e84d4963bed5a2ebc1fa82a7e901f09ad1e329db89e52788d820cf7aedd8f98c5e4d9ce3ccf9b7171a8438ab91f29121a78e40685d8230ae5726928295d3c";
+      sha512 = "246b9a718ddd70ba11fad500a0613f2b4feb62c7d6b483fef0715a0830ec09c2fc2063b16f2c1413b74dd0f57a1a870d9766e3740aad06bb131f1d610adf6269";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fi/firefox-61.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "4954b7b1d4ce1028be06d639ca9c68b0e01febab75b4412d6d1f1ccab323add8d95670944782183668a537c44739b09fd3a15eda2db9f0c4643460f21dc4bb22";
+      sha512 = "d0d694f4ba0562bf0ac990ef204c3d517a0e7edc9d3f119040e64c48fa6cf54a0ca945e681b8d5e4d89c1d3d2b9b895a324e85f0368e1bcee4d66a85d22c3913";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fr/firefox-61.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "1693a9ac213487a801d018f7a9f6e8ef61baa8af2c41cf55fc40f320c2d0e6a0b73283725cde09fb9bc64c208a4b9a13825118f0ec7e50cc2c61dd5a8b38b3b5";
+      sha512 = "7dcd9e91b7227361df55a6e29f16af72dca0118e50c563c7ad2ef829aa016e1bdc7b89ec65917f572d8e226a0e7036d9642d0dcce86d5c15d2cecfd19fc0ad8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fy-NL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fy-NL/firefox-61.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "963078489d625db3ac61d38593e5e2e8da801c7205b3622439721da3deec06fd8ac835c8e0ae9eba07ff050853b85f4d3c6afda7a50727244a3c73b9c2bbadc9";
+      sha512 = "c157abe8b5d69ae2777cf39fde9dee27eb244df6db00c5c56afe7d65ec1d3c78a7b4df0f6e6b681be5d741d61c05a9d9c56717716a87d914543bc0b8498cca0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ga-IE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ga-IE/firefox-61.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "a437cd4e09c26a4ad86ee37715307bef9fef6f2ac1fdc117ee6793b89995c0e42d2e77bd3517ae2e047faa2ee3dd22a8c2604d5bd285b5283010cf30173eae49";
+      sha512 = "70465733dbed4ec8977fac3ecf37c96e8a4c775537dc413559b1e9a1f2038ae5788b3d9b3bc7ab57b39ac1c1aa30f13f5e90b877228cf02c1670bb378b4014b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gd/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gd/firefox-61.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "6160d0412721f299dc119d5046052e99e2c64dd7f298cf1704d7f0eb6d25123f1fb2d5e6084fe1b347921e49f041798b49f696514ca04583ca885eefabdf15fd";
+      sha512 = "6a537b71d0758d25e97403363d0fdc3e7d311cd2a4ea818bbeaffb49a302e788f1727999c49ac39c6a242c31f5ab8ecdbe4111d28ff62954bd17e991a285281d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gl/firefox-61.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "8f995ae9b50c0eab7e8ae2a7206ad556e52122b0084b4f24b807f1fbdb4b124a5c539460610cbdbe4f90f1b312b653c9ee52607ade9a1082b270694284e9dbef";
+      sha512 = "0f427ba0afe9b1a09b8947f0ee0de89c675dab2e5132f37ede9159f41d474d386127a1f1967d77f8032d1b48222a8cc5bf9782fcd1bdb3f635154d614a3a69e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gn/firefox-61.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "81ef8a83df19437b37b0834a15077ff23e084021c438578fe3b38bb66d2c6b37957557e9e5989674799abfb9f530ebf6ade8f0e25897e6c82842f80a6c36ec50";
+      sha512 = "8fac0c28a7470ee83d559feebccf025f1a4f4802c92baf7fcaa87d4341bb7241727dadd8d715d23c4896e7161a9f6ba708a8c72296cd86281b8c0ed47628230b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gu-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gu-IN/firefox-61.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "66b0645cca9f77f13fd2c3fd4d38b71cf44567cd86d58e649cbebb1ab0b07d3ca96d14d2b34e33d8fc09e2ece2c4fa6c253f4d55b6c8414b78e95b9e8c4bfe80";
+      sha512 = "5cde88175b0cfc5d1332b7b185257d9558c3ff01d8e9d91180119116d14992be94bc29ad5a4f907dab0f8027720b917a01e0e924018c74d29ff9d25c3e9f3ecc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/he/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/he/firefox-61.0b6.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "666642c10644bb2f2f3e31bd813a3a1c6d930a25c879130250a8484d82acb471b1a169181ce7a49a01c6ec78e4e8ce61f8ea5918b8f87715312ac07adb087120";
+      sha512 = "f418fe4e55c89e75d243c85471b3f49fcac3f910c5d4eaa6b9828b201e886d931a18018906a37df9ab23e61af3f90cb333098fddcad0da3b0473c14d716fab18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hi-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hi-IN/firefox-61.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "53a6e801c45691cac7e1946da9a018aff3dd1f0ccc89d1048f31940e0affb33f7fa34e258cb6bd0e7336369a1862a9ad42d0e2c782c459c9de245c99b4e58f70";
+      sha512 = "2f3aceb53c5bded3e826cfcd9fde465e420366fb0cfa6f49c8f8e614823d3ed008b69544873ff86e3b6eca4be961b0e1c7299d02d39df0ceb51eee3f7803e93f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hr/firefox-61.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "11b09786e4e2ab89c814560822067b60681eff0ef43ad5479df5239c729326db6cde52a535600c3b4ff8d9113327cea38224b3e2f54639df868357d08e0e7bbb";
+      sha512 = "f6b36def280b0541be3920e05649b488cbf3d4f55541a160373fb3a4d5b6a7f3f05fbd1d5730c479c690fbb44f0ea5bbc1ac3948f16d0e8e3f54352a12fd3e1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hsb/firefox-61.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "da0dd10538f0cfee6f9da54dfb48886e7dc74268a4e800f8b5e4e91fff1adf4b1f0b55dfa30d534d82200d7dced710f2e19382b6eb7e48882b18c6856939413b";
+      sha512 = "ffbf547964ac4abb1bfaf563a42f5828227b37fd46686318a7ed73079af30454aa3a3972ced2e887cb1d95ff048b0473ca2a210084179bf44c47a3b394c4adc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hu/firefox-61.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "a03d4b60b08d8379c21010f39065c782dddf2c521043f10746dbbfa83d01a6e4fb7d9422cb637b8d16966616e06c2e631452da1a3da491bc7a18a8ad64d6991d";
+      sha512 = "d3c26b9a91cab7dc1a0b4caaf87deac657e05b8164feb5b167b2af7b0591db99a5310bf3d4ad90687d5761ae36ef00ccba8da6dc3e2e6f5be867da69bcd9d0e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hy-AM/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hy-AM/firefox-61.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "95c0c4ec529ebe05115f2e6fa31ea9c41e9c543a4da8e68ec911a436eadda7e7f7e3e6cc6f0422d99102e839cf8e19a300e0ec343d1c8f056a84e14e682b40b3";
+      sha512 = "c7a8aa830cb8a4f2eb69cac3c18534c03e2162f16b999d21b6b17c7b815391c26c7561ef4f8509a0cefb6fc22647669897c30e0289b1f91c73927b80a0d5ed73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ia/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ia/firefox-61.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "32adf28b54a7981aee100f9649e75d24ee0e620a62ab814a648caf901a504c483cac675e7c5320f777e2fb02e56ba38e6828efbd59c77d0425642289b99f3178";
+      sha512 = "8aff68cff9d430b0c7d25040ad8059e6c80f058867e04eef5390481758c4fc6a840e194edc4bb57b54dd8e9d07b26c17fba016a773b48f7f771c24a1bbb3b593";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/id/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/id/firefox-61.0b6.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "3e9aafd39dc1ebda9ee0789c6ea58c25f755c73d70e1c5a16496c81d4f6b222051aa5b46ba3f98319bfcd767df1bef50ff90f81284441758e7b134c3dababc8a";
+      sha512 = "586adc6942c53997f6c6bb44263a8aa6089c4e9fbd9b887e4694ffcb91c478d44c3972f357d014a8f10b7cf23a85831f75224be6696bf7cd4dc9bb66ec01fd48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/is/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/is/firefox-61.0b6.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "1e4f604e74be51e1f2f32e472c4d67183b46d85661c08acac4adf9de2a632e3d32637e92cb5bf2b9141babc136f15aefd74a61a3d7210dc8fe1bcd119d6cccd4";
+      sha512 = "ab93b73c7cfdee88d4d6d72d0c2d34d88705c50d41a29ceef32360d00e4a0a6de97fe33ee2406733ec233db22d4be5502987c8b80c67e588e1b9a3780b707d3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/it/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/it/firefox-61.0b6.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "7491c8c5f9ea457629de4f907049f5a67d0c412ec430eb29f38bd7d771df779d70733f839fdd1cca978b1b8b89f7b65dd9a3d3af3848dc1ddd5f8376af74efa0";
+      sha512 = "9e981a209491738f86c33f6a7dc8b4f9efd31fee9e89f2b7126c9c160a5304c48e2be026946dcf684db68c1728e3715994d665fe5078e7638c8a93a30ef86165";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ja/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ja/firefox-61.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "b1bb46337e10209359b83466fa19d9751470b30434a1d58a030c2bb858d66bbd736ce8e3790292974b069a6dbcc32939d0fcdcc12b64e3db7fb58a9695c2685c";
+      sha512 = "f3fd18886957c4d8836cf45ddeb7d23626bcdc28992a1b9cbee941de7ed6aa8489187e98a2b7a2e675b8f40e5d3ad6508f8bcc8b910cfc8b41f9cf74a6921857";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ka/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ka/firefox-61.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "179c0975bff295c8e052bac86224d7b36d4ae35b6788b0de88e36789d7d3027310515826cb96500c251915cfc936c4762438724552552f17502e913b4536d67f";
+      sha512 = "6b03ab97981e13a6bc222f88e5a3b53051b4549d6ab0c36a39689a8448eeb20cfd5b9d401e6bfb6a99b1f85f0e91f98d19ec672c1ef2965ba5a35711f9280266";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kab/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kab/firefox-61.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "bf708a69c2bd801b34ac349934609b5dfccd9104e90b5f2cea09c0d9eec3f5ca4229b64cc2226285af8091a556535c3fe5966c30ee97a6077e190732124f6dce";
+      sha512 = "03611d923646638cf4109fea5080a8c874e4b884bf124a0da4b6739bd863b40dd32b18b2845f8fe61cbeb280ab2e82f68d1f7532af4c92b8dacea5e92d62f525";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kk/firefox-61.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "77aec4b603d51cab49d2b055bac3036ffa110d324335ea0259b9b8b290ccae717c20c531e64acf4ec287d166a11a888c1fa8da82ca35c75fb68fccffa3a55d27";
+      sha512 = "f7428e4d06a76b7b3e134acde8e9caaff2db336e7093776fa2692d923d427e667c78df3a09222835248b029b05d13956b61170bff310e7444f0c3572440a1d6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/km/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/km/firefox-61.0b6.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "53981a550e4e2756ceca86f8b6b23da5a7048f9244bb84fd090cdfd801a9bbff6ecdfbb8bc54146c97936e7d66256c3f9a3415749b79860ecbd8b1f2fb6bcdcc";
+      sha512 = "e828d170628f1573c6d4029a9c8708aadd1846aaa76fc5afc50c44792235c060ff1984800de78ab7875a0cd821f53adbca419864871160d489e64f77d2ca513f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kn/firefox-61.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "621ce46516f18505868304da207f12c4515a4fe8adc255fcdd86d61a475860093a8f6941902f71cb9b7772d2e0fcd8411f354477bf5b18841cc48cb318f6d1b2";
+      sha512 = "94c00340adc8d85c52db3dceb604f5ac4e686b274f6bd130350d6c1c2d48fde792dac6feff1ae19f46f5a757280f0f86a352434e7f8066fcbacfd9077a831cf5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ko/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ko/firefox-61.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "c46f6435f7e50a498ee0bed0918941265aa160d8b932a2b668f324a6a67b82aa2e96cf1a2974ec66c69c1a6aab3afad98fb753cf7d26a62a8d78148ff1343e75";
+      sha512 = "508e1a7aa0dd250c1f50ca8c1a05c02c488916e6288d5d45345c4309a96bff4696f1f365bb88cace1465e8fc97073e58c3a5be69beb7e03b47a178abdb416de9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lij/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lij/firefox-61.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "2e75b0e3e25b6c2de02590f922755824dd86cfa46672e0a628fc3a316892e83e08409d1ed7ecd523d878366e5309cdae5908b41bdca81b6e9e6a6079dac1b77a";
+      sha512 = "6929a0a72b082a47e20dc0ce41a6b982df03f60469f3f31499921c0b293c755869b978e224e90e4f3a75c41e88a635bd231236d72fda2fe50cf0f6b314178c82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lt/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lt/firefox-61.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "8298ddf054f8e011e8fddc517dccd4ae0caf73bc13563b5725b5422e8d6fb1d3e59af216a501dabfd5a2b6fd824b62bd944776343170948edf4fccb414c1d607";
+      sha512 = "c1363abd40a5e76ff383c32f9dd58931b692c1c7582cd1a4d21fddf95203c0a34588075e4d420fa39759844b9c0bfb9916af06ce260cceeaa2f0f1efff37b2d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lv/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lv/firefox-61.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "99ccec4cf5ee280a14c680755b190e3a1d011b8837db405738a36b998816a805d664ad38113b5cf64696276a8d8acddd0daf248aaacfc52ed1178ea6caf32e2d";
+      sha512 = "95d2e14a1b77f5a3ca6d113ea5cad2a7fc4a0a8e21c7c40162198614637c0844547261a2f14242fda2cd9053391a78f3e587f21874b798e8fa522bc71d62816a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mai/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mai/firefox-61.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "f79a4325a3aceb24fad97c191d94d9133719d176f00cb9ee43ca275d29cc582b0a27f6a06f02106bbccd85b53791b6f2e0a7f751d9d0eb68bfd5d34a332e1088";
+      sha512 = "75e8cacd919ea8721102f6301e3b855d398e9ea01c516fca6eb7e94e24cd2ceaa289b3a6ca4afdc658c70dc46e2ec9b0bcf3086b70ce857adf7f0fec31996d36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mk/firefox-61.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "abe2b26198a4d94c2842017d28e3a23229d6c67dab99d436760ed2f7458bb613f31b9f9e56b453f4d7c1c398e681fbb6135f827a313eb5b1ba0a2964b042c198";
+      sha512 = "aa48016df099652eef14abf8cc774cd83c3c839d9fb47a6556ac86a4bef55d80855ff2aab810841e9c2ef86c47b968f57a27e0cd7369ec30b21bf29b423a6a02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ml/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ml/firefox-61.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "c197b8bb1f436ba151030f663e686ed41efe6d3dc162551fcf4bbea1d6de0f08354308323ecea722f2068b36503b6a896542fe35f0bb44d6e4e0227e033da3bc";
+      sha512 = "f40e4e169272764a55332f868e9a6b19ef54d04ff312827a0cf0c3792a2e5c0264f62b9cfb5939f0c43775811e350a4913387e1c4899293b7311a2b1c505dee3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mr/firefox-61.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "5052273c867fbbd433c83acbbe701679ac073dc468ce60516aa326dc798828a03d7bb8d52e14bd45d0a66d0da4f5c9c85a7877ab99565259c659734443e8383b";
+      sha512 = "4a8ba1adbfbf88332adb40336b986a42f89e4789a8e2da2ae485041788bbbcbca56d971de43ae640022647a3d30760b4b5e072afafa74df0ca90449aa03d93e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ms/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ms/firefox-61.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "29bd77b97746166569ccb56ed32bbe4122957fc00738a9ca246fdb2d6dbf4bc1537f53bd07153c4e1605937795a7cc37257618a83676ffce7af1396a626d227a";
+      sha512 = "2ebf6eba002a877ec2d3a5928a46d6b39d5acf10fcf4c0238695e821bb0e0ca2ffa7230ba3bd910ad50f429712f4bb7ddf8bfa365d23034919d3a8e4c19188fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/my/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/my/firefox-61.0b6.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "a8f0b2d6d29ab10053ff9a90fc44aa16c98862337237a5c45c6e4dba98c96545e8fa683814e1ea00d2269cd86f12841d7fede243ffbc3dbc1ee1d7e51cdbebb8";
+      sha512 = "073224f374af0b25249f30112edf86b32fd2612b571b064ae4668f2739cbc02a33df0b5a459048ae0ba2d784035b2309671b61a5a894857edd2ef6fb5181b120";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nb-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nb-NO/firefox-61.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "40fc4b9a8e6c94199c407e43cefd14c9bab34c2faa4f80d0452519c2a286d77961421340d5bc4103df81e0de6036f058db06614b89d19d4c273a5f7c81d0aa4c";
+      sha512 = "b654a0ebe06c63d9324d3821bdbcb8517a50274c3adf6e5f24ffc334649eaf6583774af15bb485f115c129c0ab5c66b31a17cbef97bc9b4a65c1ad09a333df58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ne-NP/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ne-NP/firefox-61.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "9c309cc9eb2fdd16a33e15da0bb67998b5d6a1a4768723898293dfdb0bb38138339b566324767b427326e7c89600da199f33a8c4ebadd15cd74dfede718b0e8e";
+      sha512 = "43f18c506cb0964f860c12b16722f2c53a0312d007f00c4d248ba3babaa9bc1363758bea6b6a7207ffe477cb23e7f7c151a1578a49779634b2f8d208bcb97e6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nl/firefox-61.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "281cbcf67bf6a75525b84e6552db454a481cdf92f6382258f05a4081eebc2a4db0ecf0a127f9c99c0d7bfca7a8b33850f2dd412ebf23f3bd2dc794d51a312ca0";
+      sha512 = "f40697b407b06402abb256d17322337b3ceaed07967d88f65a4e560090a0077a02fd96fc06c5937b8404a0d96353cf447ac5cc3a73c655224f65ea9b21364915";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nn-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nn-NO/firefox-61.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "bf540d7ed9ad4e3290f33105bfc228ed096d30da7d99fc60da3c2fa386913cc98c3202666317fc8e52270ac14c5c778cbf8385f113c723062bbd61c18ffe128c";
+      sha512 = "00930c704aa3ed6910e6f0b03034706fceb7ceb6ef5c46b8eb2c8af4acf1bca331b0432f3b18419f715b4ba862691543e5d539ac08772090b8d1d15868854087";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/oc/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/oc/firefox-61.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "1838462fdedd67e5be3836eefb5e06d2607bb7b18459514c5a16c4e31d84910c44e3bad8a3c1a492a96ac60b68fc123214288dd3cf22e067de3cb19ce0e88faa";
+      sha512 = "baacd03d232c645a06773dfcaeea6597672bc619eaccf5bb2276ab66737264c26c050a7d8f8f6fd8a69b3ee9460d0fa3d8308967af22cd1a4ae648a9f07a886e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/or/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/or/firefox-61.0b6.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "323b67ad29b15e809e9b7d5601abcf107ed4d80452f27e47edae9baaabf664aaff08f662dfe049ceaa1588ddf9efc976c220eee5b1b1c623447c155fd4f56971";
+      sha512 = "b27205d604a460dd45bc4c134f76f396fa9a9cae04da1cef936aa0a75fe3ecb683b75c88735c468660d8584a2cd0b00f867a8411e20465d03e0ce3a57b2d9ed3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pa-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pa-IN/firefox-61.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "d54705ad2391bc0c4015b0729f86f651e321ef15ac4af72e47f31087e3ba87bfddcbdefcaeb17dcf9dceb4bebee7665785e06eb2537b56f2a22cb55afc7091b5";
+      sha512 = "aef11773f1498d65f5a4d81f8d411bb73a89a134239826589842979528e44898a4ac8005cbbb42fc1eb56c4eb0f920e3a89aec9f27ebcf1b922b1af1b037ce92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pl/firefox-61.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "d5db33a8ec5dae3141c6b61d23b0bf3c33c8b2ebd5e29aa71adaa5e03753e646fa45b56cfa4961609580585f9ecbc5b8b899f9bf3ccaeebe036be450740fefc3";
+      sha512 = "a50410b04c8ecf83734ae318d1da075844b50d6bd9147bd92a7ef1e59effdfbcc6ae2c9bb6d01a03ef3a0364623c36e7ce7e78a6caec5d75a561ac1770285282";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pt-BR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pt-BR/firefox-61.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "7507d710c231e8bda52d01d7ca757523790a61f9e8b3cd87d7b81ae341c62fbaaf7b731658d21bef2a66f7b9b65135fb5863f7043dd12f2444d72c3dd89a8d8e";
+      sha512 = "ca09e94cd945c182e43b4e661a50f0bf462956c438c83fb180a6dec8542dafa9a46bbb531e38cae30ac5facd6e2d318eb5c74dea86c8b4002228da5124c6c38c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pt-PT/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pt-PT/firefox-61.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "98634081c0976e04794ce53f237ec7c9bcb7dafa106accc50c6cf13ec2e69c1c2e70e3f6c8e3b6f56a7287d60fac632ad027a8bc5d0fc92cc86296ba4440d160";
+      sha512 = "03af81ef5b4472877ab0f5977876d4713f7a75759bf8012853429c57ac11d7d3c71390d3c899d653438df5ded9751e5a9ad15c7c7550adcaa04920d473b6bbbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/rm/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/rm/firefox-61.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "25c77c8ec3e4531522991568c0b380eeb51332afcf086fef9c1a6a583bf615cd4a7fbded7d4fcd292ffacf79ef0f15df92d30f394e58c20bf43888aa8bc155b4";
+      sha512 = "d6d2ce2c896cc415b84a06a9abb8727bf5e1c71469f2e1d43ef98f4ad5f854ea05b5b90505074dfcd3176663bfd50dd64b435d5aea061f5be9e6c9fdc4f8ddd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ro/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ro/firefox-61.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "8a70253983d92f187bf96037e4c319961040d8709fb4f71814dbb02b48d6b4565008895a5c0708878680963a2ec04e9ac90d207cea381ee6ea33cb95c6aa9727";
+      sha512 = "9593b5d051b3059b98916ad8fa2d49fd436d76270d2f3542e33d58fd9f9a53fe7706679224cd34e9ceb519c5f31593c390f8aecf055302d1edfaceb4ac8673a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ru/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ru/firefox-61.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "0845c354ed3c31b31a9d9e7afe6f573ae1fdffb990aff5cf0a6d100da27cc218d6245024623d665146d7793b6cff209effa9587b6999cc0c5c7b427037616165";
+      sha512 = "db8eb5f0203eae6d21717d52d879c229edb5ada4cddfbe60909914dde9f3e8060e85a04ff865e8f1fdcf77035299d8003abc8e380cf02f41d4c45013c0652dd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/si/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/si/firefox-61.0b6.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "6bf31f8262c584ec8c9b719736c516eb179c5f66d384f59761edabb606808928115a850f278894793b392a6d16f9008de5edc8efd1d8023a55041ffdce2d5a60";
+      sha512 = "59fbd221d80e9ecac9021806ff977d988ff5487e7e0f51bf89e91d0ca20d55c2ab492dab0f68c47d8502a0323004a35ed027fb5bdf7f781ee72b64f4b796c473";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sk/firefox-61.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "cf2a01c6d0ce55c43a54afaa439cfb074260cfd4e03c70e2c3a6eac011ff4c77c7fa6f5c3fcdec0823066b7caec7230d46911173f73ed65ccfbfb37d30c9e156";
+      sha512 = "ec20f49c5f208938ba94aa0a03fcf6b85b7d987fd05882f4a473a7a7f776254d5264841bd718515e1e35fc20e69e46964f637d559e39a38567749f9b3d4db3d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sl/firefox-61.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3eb37b8878d2cc28cf385668dac9c6487f76d9c1dd834aa2d81b5712657e3a5a76b229e03bbf9f5f464df54d2df412ff2a4aa5d78900437bcc2c0129317c825f";
+      sha512 = "6aa15d62fb495464518761add56f9f373059ff0029a7bd18115148dd23c9e88c1e9c1b3a23be2df2bd33380856888f58a7c39943453cb7d060fc5cd5619258be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/son/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/son/firefox-61.0b6.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "8f66f2d505fb113cf48561380e350632696201e207cc4a39a6757dbeecd923172fb5ee6d58ff771f8cb578e95c1bf01223c90fa14d4a1253c199978a499a5880";
+      sha512 = "e0c11fadff083ce242ced4d76da9e6187c621956ac77524733394820ffe720e3f9470fd4f3485dace497acc1ba04a07eacf9f0c115d081f8a9b107f4ce1f4568";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sq/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sq/firefox-61.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "3828b306dfaf69b2d5b97ed2d026b40e7d1dd323321712bfd746e930e62c0b83b27a7ddc225c218dcc08ff314104e6287bb3e010985f3df30ecd630d22c8a0d1";
+      sha512 = "9bbe79a5d89912a4326af31b7c66ddff443e203835ed306b8cf2f409d08f9199e1f588892f349d1578810a618fa8692323d5ecdb2c987bfd263f3f4b18237f01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sr/firefox-61.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3eefba51599529796bfb02e5ef558077f0fa65db9cf856d9b189a323284274827f2d10d7f16759a28480167cce7c773d6c59ad7802c303ccc9d7ea8bbfc45fde";
+      sha512 = "6ce14b5c4f7d9c82ae6b62e08508cfd4f619800c59c59290943e1c66369bcf87e05029441f6f4141311aedf9d13da000763258da67e54e5748efc0b07a76deaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sv-SE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sv-SE/firefox-61.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "1a15fb14c63c741c068bdbdb2965311ff367acdbaecfaf174a88b42470cc5e36ad190512aba8cda7e816d8d01449cdf9fd34203fc9bc868124381f5daf527e17";
+      sha512 = "4c457ddf3cb1d1fcf35fc27f405ea5bc9154447e24ad95d16f768768ebdc800f6e7b164b0366a05d2d9c2810a8ada43eae58c5e5e9fea033fa67ad3a306aa9f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ta/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ta/firefox-61.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ee860b0595d2e0a9341d03a49df3cb82db3e272dbd258c791c1c575e5aaff3e29c755054425d8dfec0beaf47af9d05e0266116fe00a3e5ef5e8c298a31fe492b";
+      sha512 = "ba010386a6bfad89da7bde1cad05b88e26abe485e664a13c92bd97d247fc481188d44da1d20053a157df1024d658edb2952d7d8b1fbc6821e0e8e4d0a91388d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/te/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/te/firefox-61.0b6.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "c4782516677864b28e5ebc01cc5cbda67fe7ce2912adcda0cec00958f2bbcf6ee2107b622dcb1170d32735dfceed80a2670f05c6d879ff3f626b7626aadb1811";
+      sha512 = "0bf97c198c26cfe13d95f8e7b5f6faa7dacff5045c1b030b5ddf3916936965ec47d99e2743e0e3c7dfa83fff1a03f588fe30632c13d25ed7a3d417982634403a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/th/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/th/firefox-61.0b6.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "409d4a385efb0b1ef61d7192873839e7b1d99aae50af62c8e7ed689230d2588b3d5b6d197c3c96f1e7ff6b41551880200ae2d32c936cbf4a5fb9e00a71251070";
+      sha512 = "c6a229f46eeb3623dc94394b2110b1e8f2cc854f82e87316aeaa01dd409267fece25de74202df41e50ed34a89a75284b5a32e9322ccf771bbc38cda4fd7b8f66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/tr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/tr/firefox-61.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "ed3b6f18e54df3d342bcf7674fc48c84a4321db52af779aabf3d3150d96cca9a0e86314d4ce1476894343f5789e227db5aa8d8dc0abce0474d215eb7cdd3c084";
+      sha512 = "72559e85a3be28e3f39daf4a2464c9ecc48f8a6c911b0db4183b6b5e897c25a639a30c11b71446799c4eea50a09f3f02031144a930b37b7ea9655e0235b2981e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/uk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/uk/firefox-61.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "cce08b4cb1b820ca5bc9832e7ed19e753cc6db066e3bd007f58ce713d85976f060cae4b221833e085d39effc5a2dcb288b6fd89e4a3ec01577afe19585c6061e";
+      sha512 = "6f9482aab13ffc83e6efc9834369629c21ce60aebaca5a8e8935538ced4270ecafb3b88f46dee3a5be3f13b556702d58092e73063349534dbf2279a91a096aab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ur/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ur/firefox-61.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "a9e137a01005de3dd60d05f7145134b3f2d5eb96ba84895effe434228fdebe995994682ba83c3368046732d8ceea7bd0289d4c852a0771feb6099fb29d524666";
+      sha512 = "541eb087462b501256886853f194c1078942bdf31339b453f9d8ae058902882c7aeba6c67157161cd6ffefeeb3791a4a63b15ebcbf813ba5c00f4f4311ccf008";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/uz/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/uz/firefox-61.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "3ef9a4d7e92d813c3ec236869452372ba1c87cd978ffe7dc230ef410174625fb3d64caaef6c378b7609043ed5f3482dd6e03a975e0574365deeb6b35a1523600";
+      sha512 = "6a9112d88bc51818c06dde6643aaf606831abd00812da9e372415784eb3fbb0ed77914f60ddf1e2cb0f95b2379378911abdccc4f229ad5fafac98c81be60dd13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/vi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/vi/firefox-61.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "d8b49627c29430ee420e8c878da1fde7df4fa0b3aa5f145b0003f7fd9270d9a7d0e3d5f9941dee9cfc081a376cc922b7652667f559421e5e7ca8aeae8aa4ddfe";
+      sha512 = "ff1742130854a5d61ddb6a22c8b61eb1bb71995f8f9d0f2ddbf032edf0e7a70cf4e64690e7d4ca05b1fe42121ca8b389244d492234428b517771afb1a79ac803";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/xh/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/xh/firefox-61.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "de32d3f2b715eaba412484d1b3e67d9ccfd53afcaf9d0a829c9873f07edc88d3f8c984d0752ef7dc378888a92ef515f6ace3ad4e4c98ab40f7232ed385445d13";
+      sha512 = "07d1c523173fc4eaa47bc6a22de40e73849960b9f8f92139c1ca95e3e35a1b852b69eb698912e0e2e4ff4e265801779a027336ef788e3bd93a7bc49fc831c577";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/zh-CN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/zh-CN/firefox-61.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "109d325c32a754dcf004e3dab0716a93ec7a29718719128855b0024f75822662df48d6c609cc1c2fc652818f3925972d9d317b928349db9ce4b267cd10e867e5";
+      sha512 = "bbfd0b2a751f02993fc82f1be83ed6ed1a1cc054774128423787341faa059ee1f7d402741f78d8076eb5012bef656037bbebeea0775284cd4691b2fc3053e476";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/zh-TW/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/zh-TW/firefox-61.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "6c85e5e20da3495ce351ca04ecda4addff13ce8ef09b14194110b409f9aa89c76eb6d4b851667414645249012cfb544ebce1dd41ca05b5d18873d4ecf3bf4960";
+      sha512 = "925de39349b7a4bec721bf494fa8af8252fd923b0976bc1a99869c5bc5b083ef09b8a3116d79aaa2ff3bace9b0df26ed455ea385c6853e0ac1f4a03ce257d51e";
     }
     ];
 }
-- 
GitLab


From 430bfa5ae58fb462ca9142e622375baf4940ca5c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 20 May 2018 14:30:24 +0300
Subject: [PATCH 1013/1085] kmscube: Fix src

Someone sedded a bit too eagerly.
---
 pkgs/os-specific/linux/kmscube/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix
index 27ffaca61e7..99ef7d4a550 100644
--- a/pkgs/os-specific/linux/kmscube/default.nix
+++ b/pkgs/os-specific/linux/kmscube/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "kmscube-2017-03-19";
 
   src = fetchgit {
-    url = git://anongit.freedesktop.org/libGLU_combined/kmscube;
+    url = git://anongit.freedesktop.org/mesa/kmscube;
     rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea";
     sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca";
   };
-- 
GitLab


From 5188ef371f3d5d96e8775cd39fdf18714f58f774 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 19 Apr 2018 19:10:51 +0000
Subject: [PATCH 1014/1085] libnatpmp: init at 20150609

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

diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix
new file mode 100644
index 00000000000..17626bb23e1
--- /dev/null
+++ b/pkgs/development/libraries/libnatpmp/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libnatpmp-${version}";
+  version = "20150609";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+    sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1";
+  };
+
+  makeFlags = [ "INSTALLPREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = http://miniupnp.free.fr/libnatpmp.html;
+    description = "NAT-PMP client";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1634bf343ca..f2b880ad696 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10119,6 +10119,8 @@ with pkgs;
     mysql = mysql57;
   };
 
+  libnatpmp = callPackage ../development/libraries/libnatpmp { };
+
   libnatspec = callPackage ../development/libraries/libnatspec { };
 
   libndp = callPackage ../development/libraries/libndp { };
-- 
GitLab


From 75e66b558102492631ceef1600c836a91b27e64a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 19 Apr 2018 19:11:16 +0000
Subject: [PATCH 1015/1085] swift-im: init at 4.0.2

(cherry picked from commit d7117945f5a3edf44b3c71432a8a6a4f94e1d75b)
---
 .../instant-messengers/swift-im/default.nix   | 48 +++++++++++++++++
 .../instant-messengers/swift-im/scons.patch   | 53 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 105 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/swift-im/default.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/swift-im/scons.patch

diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
new file mode 100644
index 00000000000..e3b3d719189
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, pkgconfig, qttools, scons
+, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2
+, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib
+}:
+
+let
+  _scons = "scons -j$NIX_BUILD_CORES";
+in stdenv.mkDerivation rec {
+  name = "swift-im-${version}";
+  version = "4.0.2";
+
+  src = fetchurl {
+    url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
+    sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
+  };
+
+  patches = [ ./scons.patch ];
+
+  nativeBuildInputs = [ pkgconfig qttools scons ];
+
+  buildInputs = [
+    GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2
+    lua miniupnpc openssl qtbase qtmultimedia qtsvg qtwebkit qtx11extras zlib
+  ];
+
+  propagatedUserEnvPkgs = [ GConf ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${libxml2.dev}/include/libxml2"
+    "-I${miniupnpc}/include/miniupnpc"
+  ];
+
+  buildPhase = ''
+    ${_scons} Swift
+  '';
+
+  installPhase = ''
+    ${_scons} SWIFT_INSTALLDIR=$out $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://swift.im/;
+    description = "Qt XMPP client";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch
new file mode 100644
index 00000000000..c63b05d7acb
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch
@@ -0,0 +1,53 @@
+diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
+index 40f242513..53e1ff26a 100644
+--- a/BuildTools/SCons/SConscript.boot
++++ b/BuildTools/SCons/SConscript.boot
+@@ -508,6 +508,7 @@ if env.get("distcc", False) :
+         if var.startswith("DISTCC_") :
+             env["ENV"][var] = os.environ[var]
+ 
++env["ENV"] = os.environ
+ conf_env = env.Clone()
+ 
+ Export("env")
+diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
+index 70bffbcfe..fef281899 100644
+--- a/BuildTools/SCons/SConstruct
++++ b/BuildTools/SCons/SConstruct
+@@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"]
+     gconf_env = conf_env.Clone()
+     conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG})
+     if conf.CheckPKG("gconf-2.0") :
+-        gconf_bare_env = Environment()
++        gconf_bare_env = Environment(ENV = os.environ)
+         gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0')
+         if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) :
+             gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]]
+@@ -634,9 +634,9 @@ hunspell_env.MergeFlags(hunspell_flags)
+ env["HAVE_HUNSPELL"] = 0;
+ if env.get("hunspell_enable", False) :
+     hunspell_conf = Configure(hunspell_env)
+-    if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell") :
++    if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell-1.6") :
+         env["HAVE_HUNSPELL"] = 1
+-        hunspell_flags["LIBS"] = ["hunspell"]
++        hunspell_flags["LIBS"] = ["hunspell-1.6"]
+         env["HUNSPELL_FLAGS"] = hunspell_flags
+     hunspell_conf.Finish()
+ 
+diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py
+index 89f8963dc..b8559f7a6 100644
+--- a/BuildTools/SCons/Tools/textfile.py
++++ b/BuildTools/SCons/Tools/textfile.py
+@@ -113,7 +113,10 @@ def _action(target, source, env):
+     lsep = None
+     for s in source:
+         if lsep: fd.write(lsep)
+-        fd.write(_do_subst(s, subs))
++        b = _do_subst(s, subs)
++        if isinstance(b, unicode):
++            b = b.encode('UTF-8')
++        fd.write(b)
+         lsep = linesep
+     fd.close()
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2b880ad696..182bc498df0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18072,6 +18072,10 @@ with pkgs;
 
   swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
 
+  swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im {
+    inherit (gnome2) GConf;
+  };
+
   sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { };
 
   symlinks = callPackage ../tools/system/symlinks { };
-- 
GitLab


From 95b1827682dc30ff1ccffb4f46c197289cea3e1c Mon Sep 17 00:00:00 2001
From: Euan T <euantorano@users.noreply.github.com>
Date: Sun, 20 May 2018 14:33:22 +0100
Subject: [PATCH 1016/1085] nim: 0.17.2 -> 0.18.0 (#40556)

* Nim 0.17.2 -> 0.18.0

* Add missing dependencies for Nim 0.18.0

Solved GC and SFML-related test failures.
Attempting to download nimble packages.

* Fix tzdata test

* Fix tworkingdir test

* Replace outdated nodejs

* Disable non-runnable tests
---
 pkgs/development/compilers/nim/default.nix | 47 ++++++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index a49b1b82439..de383410b9c 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, lib, fetchurl, makeWrapper, nodejs, openssl, pcre, readline, sqlite }:
+# based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml
+
+{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-8_x, openssl, pcre, readline, sqlite, boehmgc, sfml, tzdata, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "nim-${version}";
-  version = "0.17.2";
+  version = "0.18.0";
 
   src = fetchurl {
     url = "https://nim-lang.org/download/${name}.tar.xz";
-    sha256 = "1gc2xk3ygmz9y4pm75pligssgw995a7gvnfpy445fjpw4d81pzxa";
+    sha256 = "45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0";
   };
 
   doCheck = true;
@@ -18,6 +20,7 @@ stdenv.mkDerivation rec {
     "-lpcre"
     "-lreadline"
     "-lsqlite3"
+    "-lgc"
   ];
 
   # 1. nodejs is only needed for tests
@@ -25,12 +28,12 @@ stdenv.mkDerivation rec {
   #    used for bootstrapping, but koch insists on moving the nim compiler around
   #    as part of building it, so it cannot be read-only
 
-  buildInputs  = [
-    makeWrapper nodejs
-    openssl pcre readline sqlite
+  buildInputs = [
+    makeWrapper nodejs-slim-8_x tzdata coreutils
+    openssl pcre readline sqlite boehmgc sfml
   ];
 
-  buildPhase   = ''
+  buildPhase = ''
     sh build.sh
     ./bin/nim c koch
     ./koch boot  -d:release \
@@ -48,7 +51,35 @@ stdenv.mkDerivation rec {
       --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}
   '';
 
-  checkPhase = "./koch tests";
+  postPatch =
+    let disableTest = ''sed -i '1i discard \"\"\"\n  disabled: true\n\"\"\"\n\n' '';
+        disableCompile = ''sed -i -e 's/^/#/' '';
+    in ''
+      substituteInPlace ./tests/async/tioselectors.nim --replace "/bin/sleep" "sleep"
+      substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"
+      substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+
+      # disable supposedly broken tests
+      ${disableTest} ./tests/errmsgs/tproper_stacktrace2.nim
+      ${disableTest} ./tests/vm/trgba.nim
+
+      # disable tests requiring network access (not available in the build container)
+      ${disableTest} ./tests/stdlib/thttpclient.nim
+      ${disableTest} ./tests/cpp/tasync_cpp.nim
+      ${disableTest} ./tests/niminaction/Chapter7/Tweeter/src/tweeter.nim
+
+      # disable tests requiring un-downloadable dependencies (using nimble, which isn't available in the fetch phase)
+      ${disableCompile} ./tests/manyloc/keineschweine/keineschweine.nim
+      ${disableTest} ./tests/manyloc/keineschweine/keineschweine.nim
+      ${disableCompile} ./tests/manyloc/nake/nakefile.nim
+      ${disableTest} ./tests/manyloc/nake/nakefile.nim
+      ${disableCompile} ./tests/manyloc/named_argument_bug/main.nim
+      ${disableTest} ./tests/manyloc/named_argument_bug/main.nim
+    '';
+
+  checkPhase = ''
+    ./koch tests
+  '';
 
   meta = with stdenv.lib; {
     description = "Statically typed, imperative programming language";
-- 
GitLab


From 65df48a6dedf35668233bf8eb3862fe9004ed14d Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Sat, 19 May 2018 13:41:26 -0400
Subject: [PATCH 1017/1085] pidgin: 2.12.0 -> 2.13.0

closes #40798
---
 .../networking/instant-messengers/pidgin/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 3ec45702b17..430357cc666 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -15,11 +15,11 @@
 let unwrapped = stdenv.mkDerivation rec {
   name = "pidgin-${version}";
   majorVersion = "2";
-  version = "${majorVersion}.12.0";
+  version = "${majorVersion}.13.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
-    sha256 = "1y5p2mq3bfw35b66jsafmbva0w5gg1k99y9z8fyp3jfksqv3agcc";
+    sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7";
   };
 
   inherit nss ncurses;
-- 
GitLab


From 410be1aa1da9f081e622369bbf1abc73705b959a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 10:13:23 -0700
Subject: [PATCH 1018/1085] wireguard: 0.0.20180514 -> 0.0.20180519

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

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

These checks were done:

- built on NixOS
- /nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519/bin/wg passed the binary check.
- /nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519/bin/wg-quick passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.0.20180519 with grep in /nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519
- directory tree listing: https://gist.github.com/64bccf9c57ca84c49486890ccbf17239
- du listing: https://gist.github.com/f28d6cfd8bcbf6ab1a6c39ad40ce1606
---
 pkgs/tools/networking/wireguard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index f34119893c4..c9e48d61c35 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
-  version = "0.0.20180514";
+  version = "0.0.20180519";
 
   src = fetchzip {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj";
+    sha256 = "0pd04ia0wcm0f6di4gx5kflccc5j35d72j38l8jqpj8vinl6l070";
   };
 
   preConfigure = "cd src";
-- 
GitLab


From 69038bf7b1ed7af0e3f4a52dca245a5a7578622a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 10:20:10 -0700
Subject: [PATCH 1019/1085] python27Packages.youtube-dl: 2018.05.09 ->
 2018.05.18

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

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

These checks were done:

- built on NixOS
- /nix/store/xdrcf96p90hk4cdpwjcafvqz9dhpab0p-youtube-dl-2018.05.18/bin/.youtube-dl-wrapped passed the binary check.
- /nix/store/xdrcf96p90hk4cdpwjcafvqz9dhpab0p-youtube-dl-2018.05.18/bin/youtube-dl passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 2 of 2 passed binary check by having the new version present in output.
- found 2018.05.18 with grep in /nix/store/xdrcf96p90hk4cdpwjcafvqz9dhpab0p-youtube-dl-2018.05.18
- directory tree listing: https://gist.github.com/d85bbc7695f5c7236d2de010c6381975
- du listing: https://gist.github.com/c5ad848ac823c72e329d20063defbc67
---
 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 f76b439b920..b639397388b 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   pname = "youtube-dl";
-  version = "2018.05.09";
+  version = "2018.05.18";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0sl4bi2jls3417rd62awbqdq1b6wskkjbfwpnyw4a61qarfxid1d";
+    sha256 = "11r0hv6885w8k4m307kvf9545vr5a3ym9bf7szghvbcgmgc8lm5w";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 1f348e41a4960e00bc2b511411c3f7884d6e00d1 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 20 May 2018 13:24:28 -0400
Subject: [PATCH 1020/1085] Dont test enclosed exceptions

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 011f307e8a8..83d97c64b48 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -408,6 +408,9 @@ self: super: {
     jailbreak       = true;
   });
 
+  # https://github.com/jcristovao/enclosed-exceptions/issues/12
+  enclosed-exceptions = dontCheck super.enclosed-exceptions;
+
   # Older versions don't compile.
   base-compat = self.base-compat_0_10_1;
   brick = self.brick_0_37;
-- 
GitLab


From 4db2d4d1fda550d480faa72e32b0e4e07c7862b5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 20 May 2018 20:59:53 +0200
Subject: [PATCH 1021/1085] nixos/xsslock: wait until `pgrep xlock` succeeds
 (#40810)

Please refer to the conversation in the original PR (#40619) for further
reference: https://github.com/NixOS/nixpkgs/pull/40619#issuecomment-390437845

It takes some time after the standby to trigger the locker which might
break the test on Hydra.
---
 nixos/tests/xss-lock.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix
index 3e3864cab77..045667bdcde 100644
--- a/nixos/tests/xss-lock.nix
+++ b/nixos/tests/xss-lock.nix
@@ -20,6 +20,6 @@ with lib;
 
     $machine->fail("pgrep xlock");
     $machine->succeed("su -l alice -c 'xset dpms force standby'");
-    $machine->succeed("pgrep xlock");
+    $machine->waitUntilSucceeds("pgrep xlock");
   '';
 })
-- 
GitLab


From d0f3fc1be408d3b3c42330d0c007542569faf192 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 20 May 2018 12:04:36 -0700
Subject: [PATCH 1022/1085] trackballs: 1.3.0 -> 1.3.1 (#40829)

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

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

These checks were done:

- built on NixOS
- /nix/store/0admi2vxfnbyx4ivgfcgvm8nb5lsrqi6-trackballs-1.3.1/bin/trackballs passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.3.1 with grep in /nix/store/0admi2vxfnbyx4ivgfcgvm8nb5lsrqi6-trackballs-1.3.1
- directory tree listing: https://gist.github.com/adba0c7480e5b6838c65b78eea5a190e
- du listing: https://gist.github.com/280989936dc7851623de29d3fb610355
---
 pkgs/games/trackballs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix
index 29bf399087b..06bd2a8bc4d 100644
--- a/pkgs/games/trackballs/default.nix
+++ b/pkgs/games/trackballs/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "trackballs-${version}";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "trackballs";
     repo = "trackballs";
     rev = "v${version}";
-    sha256 = "1rahqsydpbh8nmh41fxggzj5f6s3ldf7p5krik5fnhpy0civfsxd";
+    sha256 = "1yjzz50r57aahy7wcbsmhrd40abzyriq40j49225ya7m9g28vmgl";
   };
 
   buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU_combined ];
-- 
GitLab


From d7679fb2b5a1c22b9e8a9b3c82e1119737ba1dbe Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 21 May 2018 03:32:03 +0800
Subject: [PATCH 1023/1085] 0ad: 0.0.22 -> 0.0.23 (#40807)

---
 pkgs/games/0ad/data.nix         |  6 +++---
 pkgs/games/0ad/default.nix      |  4 ++--
 pkgs/games/0ad/game.nix         | 21 +++++++++------------
 pkgs/top-level/all-packages.nix |  4 +++-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 2c6abd7972f..20921a61b8c 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, zeroad-unwrapped }:
 
 stdenv.mkDerivation rec {
   name = "0ad-data-${version}";
-  version = "0.0.22";
+  inherit (zeroad-unwrapped) version;
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
-    sha256 = "0vknk9ay9h2p34r7mym2g066f3s3c5d5vmap0ckcs5b86h5cscjc";
+    sha256 = "1b6qcvd8yyyxavgdwpcs7asmln3xgnvjkglz6ggvwb956x37ggzx";
   };
 
   installPhase = ''
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index 983e8accc20..d53942766bb 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -1,10 +1,10 @@
-{ newScope }:
+{ wxGTK, newScope }:
 
 let
   callPackage = newScope self;
 
   self = {
-    zeroad-unwrapped = callPackage ./game.nix { };
+    zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; };
 
     zeroad-data = callPackage ./data.nix { };
 
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 4d5a4fe8379..0cf1b6f5e67 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, callPackage, perl, fetchurl, python2
-, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng
+, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium
 , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
-, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL, SDL2
+, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL2
 , gloox, nvidia-texture-tools
 , withEditor ? true, wxGTK ? null
 }:
@@ -10,11 +10,11 @@ assert withEditor -> wxGTK != null;
 
 stdenv.mkDerivation rec {
   name = "0ad-${version}";
-  version = "0.0.22";
+  version = "0.0.23";
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
-    sha256 = "1cgmr4g5g9wv36v7ylbrvqhsjwgcsdgbqwc8zlqmnayk9zgkdpgx";
+    sha256 = "0qz1sg4n5y766qwgi63drrrx6k17kk0rcnn9a4a9crllk2vf78fg";
   };
 
   nativeBuildInputs = [ python2 perl pkgconfig ];
@@ -23,14 +23,13 @@ stdenv.mkDerivation rec {
     spidermonkey_38 boost icu libxml2 libpng libjpeg
     zlib curl libogg libvorbis enet miniupnpc openal
     libGLU_combined xproto libX11 libXcursor nspr SDL2 gloox
-    nvidia-texture-tools
+    nvidia-texture-tools libsodium
   ] ++ lib.optional withEditor wxGTK;
 
   NIX_CFLAGS_COMPILE = [
     "-I${xproto}/include/X11"
     "-I${libX11.dev}/include/X11"
     "-I${libXcursor.dev}/include/X11"
-    "-I${SDL.dev}/include/SDL"
     "-I${SDL2}/include/SDL2"
   ];
 
@@ -77,16 +76,14 @@ stdenv.mkDerivation rec {
     ''}
 
     # Copy l10n data.
-    mkdir -p "$out"/share/0ad/data
-    cp -r binaries/data/l10n "$out"/share/0ad/data
+    install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/*
 
     # Copy libraries.
-    mkdir -p "$out"/lib/0ad
-    cp binaries/system/*.so "$out"/lib/0ad/
+    install -Dm644 -t $out/lib/0ad        binaries/system/*.so
 
     # Copy icon.
-    install -D build/resources/0ad.png "$out"/share/icons/hicolor/128x128/0ad.png
-    install -D build/resources/0ad.desktop "$out"/share/applications/0ad.desktop
+    install -D build/resources/0ad.png     $out/share/icons/hicolor/128x128/0ad.png
+    install -D build/resources/0ad.desktop $out/share/applications/0ad.desktop
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 182bc498df0..9052b09c372 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19736,7 +19736,9 @@ with pkgs;
 
   keen4 = callPackage ../games/keen4 { };
 
-  zeroadPackages = callPackage ../games/0ad { };
+  zeroadPackages = callPackage ../games/0ad {
+    wxGTK = wxGTK30;
+  };
 
   zeroad = zeroadPackages.zeroad;
 
-- 
GitLab


From 74a0ff512c98c64ada1d95193784e77b7406cdaf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 20 May 2018 12:42:01 -0700
Subject: [PATCH 1024/1085] worker: 3.15.0 -> 3.15.1 (#40820)

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

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

These checks were done:

- built on NixOS
- /nix/store/m3af3zhrxravdkwq8fcsgqrqyywfbl20-worker-3.15.1/bin/worker passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.15.1 with grep in /nix/store/m3af3zhrxravdkwq8fcsgqrqyywfbl20-worker-3.15.1
- directory tree listing: https://gist.github.com/25a3c6e8ffd32fd4b88511e305669c51
- du listing: https://gist.github.com/6f5f0c3dfcb21b2d414fafa466d13283
---
 pkgs/applications/misc/worker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 968539336a9..bfb43d3e49d 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "worker-${version}";
-  version = "3.15.0";
+  version = "3.15.1";
 
   src = fetchurl {
     url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
-    sha256 = "0baaxa10jnf4nralhjdi7525wd1wj0161z2ixz1j5pb0rl38brl8";
+    sha256 = "05h25dxqff4xhmrk7j9j11yxpqa4qm7m3xprv7yldryc1mbvnpwi";
   };
 
   buildInputs = [ libX11 ];
-- 
GitLab


From e92d68e3ab44e818876bdc1431c4d5d66b03e104 Mon Sep 17 00:00:00 2001
From: averelld <averelld@users.noreply.github.com>
Date: Sun, 20 May 2018 21:53:45 +0200
Subject: [PATCH 1025/1085] x2goclient: qt4 -> qt5 (#40811)

---
 .../networking/remote/x2goclient/default.nix         | 12 +++++++-----
 pkgs/top-level/all-packages.nix                      |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index b470c6b39d3..a4d2e85a911 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, makeWrapper, qt4 }:
+{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh,
+makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }:
 
 stdenv.mkDerivation rec {
   name = "x2goclient-${version}";
@@ -9,18 +10,19 @@ stdenv.mkDerivation rec {
     sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3";
   };
 
-  buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ];
+  buildInputs = [ cups libssh libXpm nxproxy openldap openssh
+                  qtbase qtsvg qtx11extras qttools phonon ];
   nativeBuildInputs = [ makeWrapper ];
 
   patchPhase = ''
      substituteInPlace Makefile \
        --replace "SHELL=/bin/bash" "SHELL=$SHELL" \
-       --replace "lrelease-qt4" "${qt4}/bin/lrelease" \
-       --replace "qmake-qt4" "${qt4}/bin/qmake" \
+       --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \
+       --replace "qmake-qt4" "${qtbase.dev}/bin/qmake" \
        --replace "-o root -g root" ""
   '';
 
-  makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ];
+  makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9052b09c372..49ed30dc8a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18692,7 +18692,7 @@ with pkgs;
 
   x11vnc = callPackage ../tools/X11/x11vnc { };
 
-  x2goclient = callPackage ../applications/networking/remote/x2goclient { };
+  x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { };
 
   x2vnc = callPackage ../tools/X11/x2vnc { };
 
-- 
GitLab


From 65f58cfaf8fd9ec2b15bb0d08f8b7c6e39938336 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 20 May 2018 16:11:43 -0400
Subject: [PATCH 1026/1085] vim_configurable: unpin from old lua 5.1 (#40749)

This pin was added in 2014 during a lua upgrade, but it appears vim today builds
fine with lua 5.2, so we can have it just depend on the `lua` package.
---
 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 49ed30dc8a4..2d7d8e93b34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18345,9 +18345,9 @@ with pkgs;
   vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
     inherit (darwin) libobjc cf-private;
+    inherit lua;
 
     features = "huge"; # one of  tiny, small, normal, big or huge
-    lua = pkgs.lua5_1;
     gui = config.vim.gui or "auto";
 
     # optional features by flags
-- 
GitLab


From b6539403d737eca2c6c956dd658fc18ac8169e6d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 20 May 2018 22:16:01 +0200
Subject: [PATCH 1027/1085] lf: 3 -> 4

---
 pkgs/tools/misc/lf/default.nix | 4 ++--
 pkgs/tools/misc/lf/deps.nix    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index b78bb977dbc..79f70da9e26 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "lf-${version}";
-  version = "3";
+  version = "4";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
     rev = "r${version}";
-    sha256 = "1w4nly8g1p28ixq1vjg7qv07mb1vryys7cf6b7jdb523swra6a97";
+    sha256 = "0wvx5hhkj3l68xjcr0i5lk623zi3si79hhvwi6mw9s52i43irr31";
   };
 
   goPackagePath = "github.com/gokcehan/lf";
diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix
index 35becb00263..e22a31a8fe2 100644
--- a/pkgs/tools/misc/lf/deps.nix
+++ b/pkgs/tools/misc/lf/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nsf/termbox-go";
-      rev = "7cbfaac9e282b3ea0cefeddc67b2c3ed3aaf97bc"; # master
-      sha256 = "0pb5p8q2x31aqs307lla75mm1a01mr2qyqxsfqix1pgwg16xbad8";
+      rev = "21a4d435a86280a2927985fd6296de56cbce453e"; # master
+      sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7";
     };
   }
   {
-- 
GitLab


From 10b4de1a8db1897dcebf9c2bf36418f15e10b321 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 20 May 2018 13:35:09 -0700
Subject: [PATCH 1028/1085] xonsh: 0.6.3 -> 0.6.4 (#40821)

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/zdkhffpw9yfjkxi877mildima9kp7skm-xonsh-0.6.4/bin/xon.sh had a zero exit code or showed the expected version
- /nix/store/zdkhffpw9yfjkxi877mildima9kp7skm-xonsh-0.6.4/bin/.xonsh-wrapped passed the binary check.
- /nix/store/zdkhffpw9yfjkxi877mildima9kp7skm-xonsh-0.6.4/bin/xonsh passed the binary check.
- 2 of 3 passed binary check by having a zero exit code.
- 2 of 3 passed binary check by having the new version present in output.
- found 0.6.4 with grep in /nix/store/zdkhffpw9yfjkxi877mildima9kp7skm-xonsh-0.6.4
- directory tree listing: https://gist.github.com/f4e56948f12666dc9fa8965e32e1844e
- du listing: https://gist.github.com/de490af4f1967c7d07e86d7068da2c32
---
 pkgs/shells/xonsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 8f117b788e7..93add8a6913 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "xonsh-${version}";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "scopatz";
     repo = "xonsh";
     rev = version;
-    sha256= "1893kkxvalx8ycjl27gixkh979kkp4ra00zb7m6a8cdllx6yhsgi";
+    sha256= "16nfvfa9cklm5qb2lrr12z7k4wjb6pbb0y0ma15riqcda56ygmj7";
   };
 
   LC_ALL = "en_US.UTF-8";
-- 
GitLab


From 1a611d4f4e25b513387ec3d09f942035a52102cc Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 8 May 2018 11:35:28 +0200
Subject: [PATCH 1029/1085] kcgi: init -> 0.10.5

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

diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix
new file mode 100644
index 00000000000..6d91007e486
--- /dev/null
+++ b/pkgs/development/web/kcgi/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, pkgconfig, fetchFromGitHub, libbsd }:
+
+stdenv.mkDerivation rec {
+  pname = "kcgi";
+  version = "0.10.5";
+  underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version;
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "kristapsdz";
+    repo = pname;
+    rev = "VERSION_${underscoreVersion}";
+    sha256 = "0ksdjqibkj7h1a99i84i6y0949c0vwx789q0sslzdkkgqvjnw3xw";
+  };
+  patchPhase = ''substituteInPlace configure \
+    --replace /usr/local /
+  '';
+  
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ;
+
+  dontAddPrefix = true;
+
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://kristaps.bsd.lv/kcgi;
+    description = "Minimal CGI and FastCGI library for C/C++";
+    license = licenses.isc;
+    platforms = platforms.all;
+    maintainers = [ maintainers.leenaars ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 519403cb73f..a32af50429f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8030,6 +8030,8 @@ with pkgs;
     gperf = gperf_3_0;
   };
 
+  kcgi = callPackage ../development/web/kcgi { };
+
   kcov = callPackage ../development/tools/analysis/kcov { };
 
   kube-aws = callPackage ../development/tools/kube-aws { };
-- 
GitLab


From bc309f5c57ebfff399d0488aa19ef1b6ec1d7088 Mon Sep 17 00:00:00 2001
From: leenaars <leenaars@users.noreply.github.com>
Date: Sun, 20 May 2018 23:27:34 +0200
Subject: [PATCH 1030/1085] webmetro: init => unstable-20180426 (#39673)

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

diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix
new file mode 100644
index 00000000000..45369f5f5a0
--- /dev/null
+++ b/pkgs/servers/webmetro/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "webmetro";
+  name = "${pname}-${version}";
+  version = "unstable-20180426";
+
+  src = fetchFromGitHub {
+    owner = "Tangent128";
+    repo = pname;
+    rev = "4f6cc00fe647bd311d00a8a4cb53ab08f20a04f9";
+    sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651";
+  };
+
+  cargoSha256 = "0drf331qic1gf58j7izwp0q2l4w0dyrhr19rd2y5k43cw4m1nq59";
+
+  meta = with stdenv.lib; {
+    description = "Simple relay server for broadcasting a WebM stream";
+    longDescription = ''
+    Webmetro is a simple relay server for broadcasting a WebM stream
+    from one uploader to many downloaders, via HTTP.
+    The initialization segment is remembered, so that viewers can join
+    mid-stream.  Cluster timestamps are rewritten to be monotonic, so multiple
+    (compatibly-encoded) webm files can be chained together without
+    clients needing to reconnect.
+    '';
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40c67171503..17613fbc67d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13073,6 +13073,8 @@ with pkgs;
 
   wallabag = callPackage ../servers/web-apps/wallabag { };
 
+  webmetro = callPackage ../servers/webmetro { };
+
   winstone = callPackage ../servers/http/winstone { };
 
   xinetd = callPackage ../servers/xinetd { };
-- 
GitLab


From a14ffe567b4fed5d10d9e28c6bb864308ab44234 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Sat, 19 May 2018 16:47:04 -0400
Subject: [PATCH 1031/1085] add emmanuelrosa as maintainer

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6fd5c335ad1..0c3175823b0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1236,6 +1236,11 @@
     github = "ElvishJerricco";
     name = "Will Fancher";
   };
+  emmanuelrosa = {
+      email = "emmanuel_rosa@aol.com";
+      github = "emmanuelrosa";
+      name = "Emmanuel Rosa";
+  };
   endgame = {
     email = "jack@jackkelly.name";
     github = "endgame";
-- 
GitLab


From 3dadae4cd241961eb457543be1c01878a0dc75ae Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Sat, 19 May 2018 16:48:05 -0400
Subject: [PATCH 1032/1085] purple-lurch: init at 0.6.7

Adds XEP-0384: OMEMO Encryption for libpurple
---
 .../pidgin-plugins/purple-lurch/default.nix   | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
new file mode 100644
index 00000000000..bcfcbee8556
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }:
+
+stdenv.mkDerivation rec {
+  name = "purple-lurch-${version}";
+  version = "0.6.7";
+
+  src = fetchFromGitHub {
+    owner = "gkdr";
+    repo = "lurch";
+    rev = "v${version}";
+    sha256 = "029jjqinsfhpv0zgji3sv1cyk54fn9qp176fwy97d1clf0vflxrz";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ pidgin minixml libxml2 sqlite libgcrypt ];
+
+  dontUseCmakeConfigure = true;
+
+  installPhase = ''
+    install -Dm755 -t $out/lib/purple-2 build/lurch.so
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/gkdr/lurch;
+    description = "XEP-0384: OMEMO Encryption for libpurple";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ emmanuelrosa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17613fbc67d..1ebedcec4fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1451,7 +1451,7 @@ with pkgs;
   mcrypt = callPackage ../tools/misc/mcrypt { };
 
   mongodb-compass = callPackage ../tools/misc/mongodb-compass { };
-  
+
   mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
 
   mozlz4a = callPackage ../tools/compression/mozlz4a {
@@ -1467,7 +1467,7 @@ with pkgs;
   };
 
   antibody = callPackage ../shells/zsh/antibody { };
-  
+
   antigen = callPackage ../shells/zsh/antigen { };
 
   apparix = callPackage ../tools/misc/apparix { };
@@ -17446,6 +17446,8 @@ with pkgs;
 
   purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { };
 
+  purple-lurch = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-lurch { };
+
   purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { };
 
   purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { };
-- 
GitLab


From 1ba24058af6b7911f9b824798c62c434ff863c4a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 20 May 2018 15:48:26 -0700
Subject: [PATCH 1033/1085] praat: 6.0.38 -> 6.0.40 (#40836)

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

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

These checks were done:

- built on NixOS
- /nix/store/51k239kq3pb732lar9y4j996p8inmmzq-praat-6.0.40/bin/praat passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 6.0.40 with grep in /nix/store/51k239kq3pb732lar9y4j996p8inmmzq-praat-6.0.40
- directory tree listing: https://gist.github.com/48461f433362d4c7c4143942011a22d6
- du listing: https://gist.github.com/621b0b6d55906c1ba560361af3d25bcb
---
 pkgs/applications/audio/praat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index ada12eefaf7..8d49c49f0c6 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "praat-${version}";
-  version = "6.0.38";
+  version = "6.0.40";
 
   src = fetchurl {
     url = "https://github.com/praat/praat/archive/v${version}.tar.gz";
-    sha256 = "1l01mdhd0kf6mnyrg8maydr56cpw4312gryk303kr0a4w0gwzhhc";
+    sha256 = "168qrrr59qxii265vba7pj6f61lzq5lk9c43zcda0wmmjp87bq1x";
   };
 
   configurePhase = ''
-- 
GitLab


From 641fa3d1c2539b1ac27688ed4d619ae6d1799d02 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 20 May 2018 23:14:29 +0200
Subject: [PATCH 1034/1085] =?UTF-8?q?babl:=200.1.48=20=E2=86=92=200.1.50?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index ac9056d1e03..f3e7fc7f162 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.48";
+  name = "babl-0.1.50";
 
   src = fetchurl {
     url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "0596flzqzdlq4y6lsg34szh1ffgyccghp8y1k9h4d3jwymfd16xy";
+    sha256 = "0bavr2y4v88pip7vlca4kwmnksk2qxcvkkdp9jyfi6pzh701sb5m";
   };
 
   doCheck = true;
-- 
GitLab


From d6a68d4b2da826b90e925813828ff4729ee7c5ea Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 21 May 2018 00:16:19 +0200
Subject: [PATCH 1035/1085] =?UTF-8?q?gimp:=202.10.0=20=E2=86=92=202.10.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/graphics/gimp/default.nix | 32 ++++-----------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 80bc2d49efc..f92594f08e1 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
 , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff
 , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
 , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
@@ -9,37 +9,13 @@ let
   inherit (python2Packages) pygtk wrapPython python;
 in stdenv.mkDerivation rec {
   name = "gimp-${version}";
-  version = "2.10.0";
+  version = "2.10.2";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
-    sha256 = "1qkxaigbfkx26xym5nzrgfrmn97cbnhn63v1saaha2nbi3xrdk3z";
+    sha256 = "1srkqd9cx1xmny7cyk3b6f14dknb3fd77whm38vlvr7grnpbmc0w";
   };
 
-  patches = [
-    # fix rpath of python library https://bugzilla.gnome.org/show_bug.cgi?id=795620
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=371482;
-      sha256 = "18bysndh61pvlv255xapdrfpsl5ivm51wp1w7xgk9vky9z2y3llc";
-    })
-
-    # fix absolute paths stored in configuration
-    (fetchpatch {
-      url = https://git.gnome.org/browse/gimp/patch/?id=0fce8fdb3c056acead8322c976a96fb6fba793b6;
-      sha256 = "09845i3bdpdbf13razr04ksvwydxcvzhjwlb4dfgdv5q203g2ris";
-    })
-    (fetchpatch {
-      url = https://git.gnome.org/browse/gimp/patch/?id=f6b586237cb8c912c1503f8e6086edd17f07d4df;
-      sha256 = "0s68885ip2wgjvsl5vqi2f1xhxdjpzqprifzgdl1vnv6gqmfy3bh";
-    })
-
-    # fix pc file (needed e.g. for building plug-ins)
-    (fetchpatch {
-      url = https://git.gnome.org/browse/gimp/patch/?id=7e19906827d301eb70275dba089849a632a0eabe;
-      sha256 = "0cbjfbwvzg2hqihg3rpsga405v7z2qahj22dfqn2jrb2gbhrjcp1";
-    })
-  ];
-
   nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ];
   propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc
   buildInputs = [
@@ -80,6 +56,8 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [
     "--without-webkit" # old version is required
+    "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
+    "--with-icc-directory=/var/run/current-system/sw/share/color/icc"
   ];
 
   doCheck = true;
-- 
GitLab


From f5ca57b6d909b8224acdacfcc587537e169e6683 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 20 May 2018 17:55:21 -0500
Subject: [PATCH 1036/1085] powerline-rs: Fix darwin build (#40840)

---
 pkgs/tools/misc/powerline-rs/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix          | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index e48816db935..138145683cb 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, openssl_1_1_0, libssh2, libgit2, libzip }:
+{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl_1_1_0, libssh2, libgit2, libzip, Security }:
 rustPlatform.buildRustPackage rec {
   pname = "powerline-rs";
   name = "${pname}-${version}";
@@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
 
-  nativeBuildInputs = [ pkgconfig file perl cmake ];
-  buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ];
+  nativeBuildInputs = [ pkgconfig file perl cmake curl ];
+  buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security;
 
   postInstall = ''
     install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ebedcec4fe..d2b566ab5f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14632,7 +14632,9 @@ with pkgs;
 
   powerline-go = callPackage ../tools/misc/powerline-go { };
 
-  powerline-rs = callPackage ../tools/misc/powerline-rs { };
+  powerline-rs = callPackage ../tools/misc/powerline-rs {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   profont = callPackage ../data/fonts/profont { };
 
-- 
GitLab


From de18e296da59b9b3e0ba3df1f2999a729b6d4bcb Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Sun, 20 May 2018 20:05:24 -0400
Subject: [PATCH 1037/1085] purple-facebook: 0.9.3 -> 0.9.5

---
 .../pidgin-plugins/purple-facebook/default.nix         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
index 37b490304c4..8eb086a9807 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
@@ -5,18 +5,18 @@ let
   pidginHg = fetchhg {
     url = "https://bitbucket.org/pidgin/main";
     # take from VERSION file
-    rev = "c9b74a765767";
-    sha256 = "07bjz87jpslsb4gdqvcwp79mkahls2mfhlmpaa5w6n4xqhahw4j3";
+    rev = "9ff9acf9fa14";
+    sha256 = "06imlhsps4wrjgjb92zpaxprxfxl2pjb2x9pl859c8cryssrz2jv";
   };
 
 in stdenv.mkDerivation rec {
-  name = "purple-facebook-0.9.3";
+  name = "purple-facebook-0.9.5";
 
   src = fetchFromGitHub {
     owner = "dequis";
     repo = "purple-facebook";
-    rev = "v0.9.3-c9b74a765767";
-    sha256 = "10ncvg0arcxnd3cpb0nxry1plbws0mw9vhzjrhb40sv2i563dywb";
+    rev = "v0.9.5-9ff9acf9fa14";
+    sha256 = "0a1860bkzrmyxahm9rlxi80z335w491wzdaqaw6j9ccavbymhwhs";
   };
 
   postPatch = ''
-- 
GitLab


From 2287c5f6a55c3c4edf1d244c7dbf7b331aa94783 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 20 May 2018 22:43:35 +0000
Subject: [PATCH 1038/1085] dpdk: extract from linuxPackages.dpdk

DPDK kernel modules are optional and its libraries do not reference them.

This allows to move the packages that depend on DPDK out of linuxPackages,
since they do not depend on kernel version.
---
 pkgs/os-specific/linux/dpdk/default.nix | 50 ++++++++++++++++---------
 pkgs/top-level/all-packages.nix         |  4 ++
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index fd45e83c26b..808feaff02c 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -1,7 +1,13 @@
-{ stdenv, kernel, fetchurl, pkgconfig, numactl }:
+{ stdenv, lib, kernel, fetchurl, pkgconfig, numactl }:
 
-stdenv.mkDerivation rec {
-  name = "dpdk-${version}-${kernel.version}";
+let
+
+  kver = kernel.modDirVersion or null;
+
+  mod = kernel != null;
+
+in stdenv.mkDerivation rec {
+  name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}";
   version = "17.11.2";
 
   src = fetchurl {
@@ -9,35 +15,45 @@ stdenv.mkDerivation rec {
     sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2";
   };
 
-  nativeBuildInputs = [ pkgconfig ] ++ kernel.moduleBuildDependencies;
-  buildInputs = [ numactl ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ numactl ] ++ lib.optional mod kernel.moduleBuildDependencies;
 
-  RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+  RTE_KERNELDIR = if mod then "${kernel.dev}/lib/modules/${kver}/build" else "/var/empty";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
 
   # we need sse3 instructions to build
   NIX_CFLAGS_COMPILE = [ "-msse3" ];
-
-  enableParallelBuilding = true;
-  outputs = [ "out" "kmod" ];
-
   hardeningDisable = [ "pic" ];
 
+  postPatch = lib.optionalString (!mod) ''
+    # Do not build kernel modules.
+    cat >>config/defconfig_$RTE_TARGET <<EOF
+CONFIG_RTE_EAL_IGB_UIO=n
+CONFIG_RTE_KNI_KMOD=n
+EOF
+  '';
+
   configurePhase = ''
     make T=${RTE_TARGET} config
   '';
 
-  installPhase = ''
-    make install-runtime DESTDIR=$out prefix= includedir=/include datadir=/
-    make install-sdk DESTDIR=$out prefix= includedir=/include datadir=/
-    make install-kmod DESTDIR=$kmod
-  '';
+  installTargets = [ "install-runtime" "install-sdk" "install-kmod" ]; # skip install-doc
+
+  installFlags = [
+    "prefix=$(out)" "datadir=$(out)" "includedir=$(out)/include"
+  ] ++ lib.optionals mod [
+    "kerneldir=$(kmod)/lib/modules/${kver}"
+  ];
+
+  outputs = [ "out" ] ++ lib.optional mod "kmod";
+
+  enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Set of libraries and drivers for fast packet processing";
     homepage = http://dpdk.org/;
     license = with licenses; [ lgpl21 gpl2 bsd2 ];
     platforms =  [ "x86_64-linux" ];
-    maintainers = [ maintainers.domenkozar ];
+    maintainers = with maintainers; [ domenkozar orivej ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2b566ab5f6..1fe6e71d83d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13814,6 +13814,10 @@ with pkgs;
 
   buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs;
 
+  dpdk = callPackage ../os-specific/linux/dpdk {
+    kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod
+  };
+
   keyutils = callPackage ../os-specific/linux/keyutils { };
 
   libselinux = callPackage ../os-specific/linux/libselinux { };
-- 
GitLab


From 345f4639d66a0c7f4163bf4f5123d00889a5e3eb Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 21 May 2018 00:50:08 +0000
Subject: [PATCH 1039/1085] odp-dpdk, ofp, pktgen: move from linuxPackages

These packages do not depend on the kernel.

ofp is not aliased because it is marked as broken.
---
 pkgs/top-level/all-packages.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fe6e71d83d..5e5e294064c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13585,6 +13585,9 @@ with pkgs;
     inherit kernel;
     inherit (kernel) stdenv; # in particular, use the same compiler by default
 
+    # Obsolete aliases (these packages do not depend on the kernel).
+    inherit (pkgs) odp-dpdk pktgen; # added 2018-05
+
     acpi_call = callPackage ../os-specific/linux/acpi-call {};
 
     amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { };
@@ -13611,14 +13614,8 @@ with pkgs;
 
     evdi = callPackage ../os-specific/linux/evdi { };
 
-    pktgen = callPackage ../os-specific/linux/pktgen { };
-
     hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { };
 
-    odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
-
-    ofp = callPackage ../os-specific/linux/ofp { };
-
     e1000e = callPackage ../os-specific/linux/e1000e {};
 
     ixgbevf = callPackage ../os-specific/linux/ixgbevf {};
@@ -13966,8 +13963,12 @@ with pkgs;
 
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
 
+  odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
+
   odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { };
 
+  ofp = callPackage ../os-specific/linux/ofp { };
+
   openpam = callPackage ../development/libraries/openpam { };
 
   openbsm = callPackage ../development/libraries/openbsm { };
@@ -14013,6 +14014,8 @@ with pkgs;
 
   pipework = callPackage ../os-specific/linux/pipework { };
 
+  pktgen = callPackage ../os-specific/linux/pktgen { };
+
   plymouth = callPackage ../os-specific/linux/plymouth { };
 
   pmount = callPackage ../os-specific/linux/pmount { };
-- 
GitLab


From ed465dc7de883d7e6fcaa26b426b2db5f1e43f3d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 21 May 2018 01:04:31 +0000
Subject: [PATCH 1040/1085] dpdk: install files in the standard layout

---
 pkgs/os-specific/linux/dpdk/default.nix     | 2 +-
 pkgs/os-specific/linux/odp-dpdk/default.nix | 2 +-
 pkgs/os-specific/linux/pktgen/default.nix   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index 808feaff02c..78b11c7b18f 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -40,7 +40,7 @@ EOF
   installTargets = [ "install-runtime" "install-sdk" "install-kmod" ]; # skip install-doc
 
   installFlags = [
-    "prefix=$(out)" "datadir=$(out)" "includedir=$(out)/include"
+    "prefix=$(out)"
   ] ++ lib.optionals mod [
     "kerneldir=$(kmod)/lib/modules/${kver}"
   ];
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix
index cf4f9df2677..ff408b6a624 100644
--- a/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ dpdk libconfig libpcap numactl openssl ];
 
-  RTE_SDK = dpdk;
+  RTE_SDK = "${dpdk}/share/dpdk";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
 
   dontDisableStatic = true;
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index c443da7df3b..a7bb4a81510 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
     [ dpdk libpcap numactl ]
     ++ stdenv.lib.optionals withGtk [gtk2];
 
-  RTE_SDK = "${dpdk}";
+  RTE_SDK = "${dpdk}/share/dpdk";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
   GUI = stdenv.lib.optionalString withGtk "true";
 
-- 
GitLab


From 66002a0e07ac9a05bd2ae518310797819bba29fd Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 21 May 2018 01:59:30 +0000
Subject: [PATCH 1041/1085] spdk: init at 18.04

Closes #39138.
---
 pkgs/development/libraries/spdk/default.nix | 31 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/spdk/default.nix

diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix
new file mode 100644
index 00000000000..b712d426304
--- /dev/null
+++ b/pkgs/development/libraries/spdk/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libuuid, numactl, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "spdk-${version}";
+  version = "18.04";
+
+  src = fetchFromGitHub {
+    owner = "spdk";
+    repo = "spdk";
+    rev = "v${version}";
+    sha256 = "07i13jkf63h5ld9djksxl445v1mj6m5cbq4xydix9y5qcxwlss3n";
+  };
+
+  nativeBuildInputs = [ python ];
+
+  buildInputs = [ cunit dpdk libaio libuuid numactl openssl ];
+
+  configureFlags = [ "--with-dpdk=${dpdk}" ];
+
+  NIX_CFLAGS_COMPILE = [ "-mssse3" ]; # Necessary to compile.
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Set of libraries for fast user-mode storage";
+    homepage = http://www.spdk.io;
+    license = licenses.bsd3;
+    platforms =  [ "x86_64-linux" ];
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e5e294064c..3acb4e4f729 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11632,6 +11632,8 @@ with pkgs;
 
   spatialite_tools = callPackage ../development/libraries/spatialite-tools { };
 
+  spdk = callPackage ../development/libraries/spdk { };
+
   speechd = callPackage ../development/libraries/speechd { };
 
   speech-tools = callPackage ../development/libraries/speech-tools {};
-- 
GitLab


From f1a202396195009461bb59552bc90a03055c3ff0 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 21 May 2018 02:32:18 +0000
Subject: [PATCH 1042/1085] dpdk: support static/shared build mode switch

The default is false because upstream default is false (for performance).
---
 pkgs/os-specific/linux/dpdk/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index 78b11c7b18f..b4c4af8c2e2 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, kernel, fetchurl, pkgconfig, numactl }:
+{ stdenv, lib, kernel, fetchurl, pkgconfig, numactl, shared ? false }:
 
 let
 
@@ -25,9 +25,14 @@ in stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [ "-msse3" ];
   hardeningDisable = [ "pic" ];
 
-  postPatch = lib.optionalString (!mod) ''
-    # Do not build kernel modules.
+  postPatch = ''
     cat >>config/defconfig_$RTE_TARGET <<EOF
+# Build static or shared libraries.
+CONFIG_RTE_BUILD_SHARED_LIB=${if shared then "y" else "n"}
+EOF
+  '' + lib.optionalString (!mod) ''
+    cat >>config/defconfig_$RTE_TARGET <<EOF
+# Do not build kernel modules.
 CONFIG_RTE_EAL_IGB_UIO=n
 CONFIG_RTE_KNI_KMOD=n
 EOF
-- 
GitLab


From b61f83eda64d9941656177e4bfdd2cbe215ad19b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 20 May 2018 22:44:54 -0400
Subject: [PATCH 1043/1085] linux: 4.9.100 -> 4.9.101

---
 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 3a7dc9353f8..15a8d63651d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.100";
+  version = "4.9.101";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0z572csacfwn3kl3yaz4wpd7wkzabm42p2z4ysx5rq0kf4x6zfy5";
+    sha256 = "005awyjylyp7di8cy269923j7wsvv74s42k7955fq0790wmx15dg";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From a91a0ce16c39bcdf9eb0a73fc4413c12fabcff7a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 20 May 2018 22:45:08 -0400
Subject: [PATCH 1044/1085] linux: 4.14.41 -> 4.14.42

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index f44adb6bc94..16d597e1640 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.41";
+  version = "4.14.42";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0vffv1iqcvrzvhs534czdjhj7702gr01pyn9idr8dj85kdx19wfc";
+    sha256 = "00wh8ydawy6j18as28albzid88cm2aanzr8vz367jjp2k5pi00rb";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 950e17fdd94cb7c4e2a064adac00da8aeb085844 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 20 May 2018 22:45:20 -0400
Subject: [PATCH 1045/1085] linux: 4.16.9 -> 4.16.10

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index c1df425280e..7039c460c5c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.9";
+  version = "4.16.10";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "12lvdnfz06r7pj5f15x39c4glhbp3sv7bdbwj4yimbp6iqwvndv0";
+    sha256 = "1gnf16p4rmibcn3wn5zp4pl2zmhgk4dg6718gvdr8vcffd87ksc0";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 3995b586a5c1b9122212bdc3837f6da54a8b5667 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 20 May 2018 22:45:32 -0400
Subject: [PATCH 1046/1085] linux: 4.17-rc5 -> 4.17-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 691c0d7a0a9..e61e9a354de 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.17-rc5";
-  modDirVersion = "4.17.0-rc5";
+  version = "4.17-rc6";
+  modDirVersion = "4.17.0-rc6";
   extraMeta.branch = "4.17";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1khx3s8nb604h23hasamshcvcwll0j4vi5v6v274ls01ja9mg1xk";
+    sha256 = "16x8bwhaj35fqhl773qxwabs1rhl3ayapizjsqyzn92pggsgy6p8";
   };
 
   # Should the testing kernels ever be built on Hydra?
-- 
GitLab


From 691e8e64c449925b59c577379f879943495ff287 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 19:52:28 -0700
Subject: [PATCH 1047/1085] csound: 6.10.0 -> 6.11.0

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

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

These checks were done:

- built on NixOS
- /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csound passed the binary check.
- /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csbeats passed the binary check.
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csdebugger had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/atsa had a zero exit code or showed the expected version
- /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csanalyze passed the binary check.
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/cvanal had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/dnoise had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/envext had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/extractor had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/het_export had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/het_import had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/hetro had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/lpanal had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/lpc_export had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/lpc_import had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/mixer had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pvanal had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pvlook had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pv_export had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pv_import had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/scale had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/sndinfo had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/srconv had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/src_conv had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/sdif2ad had a zero exit code or showed the expected version
- /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/scsort passed the binary check.
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/extract had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/cs had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csb64enc had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/makecsd had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/scot had a zero exit code or showed the expected version
- 4 of 31 passed binary check by having a zero exit code.
- 0 of 31 passed binary check by having the new version present in output.
- found 6.11.0 with grep in /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0
- directory tree listing: https://gist.github.com/a9a7303309eb2e6e6ce70fc3f368e8af
- du listing: https://gist.github.com/c8d61a997a4e56d47eab852cdae66f01
---
 pkgs/applications/audio/csound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 191074eba27..c8ac0a938ef 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   name = "csound-${version}";
-  version = "6.10.0";
+  version = "6.11.0";
 
   enableParallelBuilding = true;
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "csound";
     repo = "csound";
     rev = version;
-    sha256 = "1mak183y8bn097z9q3k7f1kwvawkngkc4ch9hv6gqhgfy1cjln8n";
+    sha256 = "1nnfl8dqvc5b3f94zbvdg6bxr2wlp7as78hb31awxmvfwwihpv18";
   };
 
   cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
-- 
GitLab


From 4558ba5b794ca2c6897c1a845e3de208f2f9e8fb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 19:56:07 -0700
Subject: [PATCH 1048/1085] feh: 2.26.1 -> 2.26.3

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

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

These checks were done:

- built on NixOS
- /nix/store/s9li7cqcph7bvkplpnq8b32gqvn7hm41-feh-2.26.3/bin/feh passed the binary check.
- /nix/store/s9li7cqcph7bvkplpnq8b32gqvn7hm41-feh-2.26.3/bin/.feh-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.26.3 with grep in /nix/store/s9li7cqcph7bvkplpnq8b32gqvn7hm41-feh-2.26.3
- directory tree listing: https://gist.github.com/8a7c95c1c856e51ed0f4fab74284bffe
- du listing: https://gist.github.com/6e5a4734d20a27553f39cb1b99cb0ac9
---
 pkgs/applications/graphics/feh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 96d4a397c90..eb7daf2797b 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.26.1";
+  version = "2.26.3";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "155clzkrzs7fh5nx924851di30hilcg16g192ldqqc12p5z5gikd";
+    sha256 = "08aagymgajcvciagwy2zdxhicvdfnjmd2xyx9bqjy7l1n16ydwrz";
   };
 
   outputs = [ "out" "man" "doc" ];
-- 
GitLab


From 03c61b71f9f578db76b667a699732dfc46b6b229 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 21 May 2018 03:39:54 +0000
Subject: [PATCH 1049/1085] spdk: fix sandboxed build

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

diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix
index b712d426304..14672c78d21 100644
--- a/pkgs/development/libraries/spdk/default.nix
+++ b/pkgs/development/libraries/spdk/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cunit dpdk libaio libuuid numactl openssl ];
 
+  postPatch = ''
+    patchShebangs .
+  '';
+
   configureFlags = [ "--with-dpdk=${dpdk}" ];
 
   NIX_CFLAGS_COMPILE = [ "-mssse3" ]; # Necessary to compile.
-- 
GitLab


From d2329184a9204a61d9505e27790bf65b5eb773a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 20:57:32 -0700
Subject: [PATCH 1050/1085] bind: 9.12.1 -> 9.12.1-P2

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

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

These checks were done:

- built on NixOS
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/delv passed the binary check.
- Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/arpaname had a zero exit code or showed the expected version
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-rrchecker passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/mdig passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/ddns-confgen passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-cds passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-dsfromkey passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-importkey passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-keyfromlabel passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-keygen passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-revoke passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-settime passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-signzone passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-verify passed the binary check.
- Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/genrandom had a zero exit code or showed the expected version
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-checkconf passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-checkzone passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-compilezone passed the binary check.
- Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-journalprint had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/nsec3hash had a zero exit code or showed the expected version
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/rndc passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/rndc-confgen passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/tsig-keygen passed the binary check.
- 20 of 24 passed binary check by having a zero exit code.
- 14 of 24 passed binary check by having the new version present in output.
- found 9.12.1-P2 with grep in /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2
- directory tree listing: https://gist.github.com/d95b236ef147c4c8ad6a99ca42db1acd
- du listing: https://gist.github.com/f6bcea6b6bdce7df3f66bbf02768bd20
---
 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 4002c6b3542..d266f534d66 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -6,14 +6,14 @@
 assert enableSeccomp -> libseccomp != null;
 assert enablePython -> python3 != null;
 
-let version = "9.12.1"; in
+let version = "9.12.1-P2"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "043mjcw405qa0ghm5dkhfsq35gsy279724fz3mjqpr1mbi14dr0n";
+    sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
-- 
GitLab


From 80bfd2f371d64d0d81c0820166f98f49a5501988 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 21 May 2018 15:44:50 +0800
Subject: [PATCH 1051/1085] musescore: 2.1.0 -> 2.2.1

Fixes #29519
---
 pkgs/applications/audio/musescore/default.nix | 46 +++++--------------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index f56ca009f1e..7ed9021e3e0 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,59 +1,37 @@
-{ stdenv, fetchzip, cmake, pkgconfig
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
 , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
-, portaudio, qtbase, qtdeclarative, qtscript, qtsvg, qttools
+, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools
 , qtwebkit, qtxmlpatterns
 }:
 
 stdenv.mkDerivation rec {
   name = "musescore-${version}";
-  version = "2.1.0";
+  version = "2.2.1";
 
-  src = fetchzip {
-    url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz";
-    sha256 = "1rlxz2nzilz7n6c0affnjk2wcxl4b8949qxs0xi555gxg01kybls";
+  src = fetchFromGitHub {
+    owner  = "musescore";
+    repo   = "MuseScore";
+    rev    = "v${version}";
+    sha256 = "00lwcsnpyiq9l9x11nm24mzf67xmhzjhwi4c3iqry6ayi9c4p4qs";
   };
 
-  hardeningDisable = [ "relro" "bindnow" ];
-
-  makeFlags = [
-    "PREFIX=$(out)"
-  ];
-
   cmakeFlags = [
-    "-DAEOLUS=OFF"
-    "-DZERBERUS=ON"
-    "-DOSC=ON=ON"
-    "-DOMR=OFF" # TODO: add OMR support, CLEF_G not declared error
-    "-DOCR=OFF" # Not necessary without OMR
-    "-DSOUNDFONT3=ON"
-    "-DHAS_AUDIOFILE=ON"
-    "-DBUILD_JACK=ON"
-  ];
-
-  preBuild = ''
-    make lrelease
-  '';
-
-  postBuild = ''
-    make manpages
-  '';
+  ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON";
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  enableParallelBuilding = true;
-
   buildInputs = [
     alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
-    portaudio qtbase qtdeclarative qtscript qtsvg qttools
-    qtwebkit qtxmlpatterns #tesseract
+    portaudio portmidi # tesseract
+    qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns
   ];
 
   meta = with stdenv.lib; {
     description = "Music notation and composition software";
     homepage = https://musescore.org/;
     license = licenses.gpl2;
+    maintainers = with maintainers; [ vandenoever ];
     platforms = platforms.linux;
-    maintainers = [ maintainers.vandenoever ];
     repositories.git = https://github.com/musescore/MuseScore;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3acb4e4f729..cdc4ed881e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17096,6 +17096,7 @@ with pkgs;
       else null;
   };
 
+  # TODO: we should probably merge these 2
   musescore =
     if stdenv.isDarwin then
       callPackage ../applications/audio/musescore/darwin.nix { }
-- 
GitLab


From ad399afd6f3af6e21924919f136e776ae1b42d3a Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Thu, 8 Mar 2018 10:38:26 +0100
Subject: [PATCH 1052/1085] pythonPackages.pysdl2: init at 0.9.6

---
 .../python-modules/pysdl2/PySDL2-dll.patch    | 119 ++++++++++++++++++
 .../python-modules/pysdl2/default.nix         |  41 ++++++
 pkgs/top-level/python-packages.nix            |   2 +
 3 files changed, 162 insertions(+)
 create mode 100644 pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
 create mode 100644 pkgs/development/python-modules/pysdl2/default.nix

diff --git a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
new file mode 100644
index 00000000000..ca723a0e573
--- /dev/null
+++ b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
@@ -0,0 +1,119 @@
+diff -ru PySDL2-0.9.6-old/sdl2/dll.py PySDL2-0.9.6/sdl2/dll.py
+--- PySDL2-0.9.6-old/sdl2/dll.py	2018-03-08 10:18:37.583471745 +0100
++++ PySDL2-0.9.6/sdl2/dll.py	2018-03-08 10:20:06.705517520 +0100
+@@ -45,29 +45,31 @@
+     """Function wrapper around the different DLL functions. Do not use or
+     instantiate this one directly from your user code.
+     """
+-    def __init__(self, libinfo, libnames, path=None):
+-        self._dll = None
+-        foundlibs = _findlib(libnames, path)
+-        dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")
+-        if len(foundlibs) == 0:
+-            raise RuntimeError("could not find any library for %s (%s)" %
+-                               (libinfo, dllmsg))
+-        for libfile in foundlibs:
+-            try:
+-                self._dll = CDLL(libfile)
+-                self._libfile = libfile
+-                break
+-            except Exception as exc:
+-                # Could not load the DLL, move to the next, but inform the user
+-                # about something weird going on - this may become noisy, but
+-                # is better than confusing the users with the RuntimeError below
+-                warnings.warn(repr(exc), DLLWarning)
+-        if self._dll is None:
+-            raise RuntimeError("found %s, but it's not usable for the library %s" %
+-                               (foundlibs, libinfo))
+-        if path is not None and sys.platform in ("win32",) and \
+-            path in self._libfile:
+-            os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])
++    def __init__(self, libfile):
++        self._dll = CDLL(libfile)
++        self._libfile = libfile
++        # self._dll = None
++        # foundlibs = _findlib(libnames, path)
++        # dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")
++        # if len(foundlibs) == 0:
++        #     raise RuntimeError("could not find any library for %s (%s)" %
++        #                        (libinfo, dllmsg))
++        # for libfile in foundlibs:
++        #     try:
++        #         self._dll = CDLL(libfile)
++        #         self._libfile = libfile
++        #         break
++        #     except Exception as exc:
++        #         # Could not load the DLL, move to the next, but inform the user
++        #         # about something weird going on - this may become noisy, but
++        #         # is better than confusing the users with the RuntimeError below
++        #         warnings.warn(repr(exc), DLLWarning)
++        # if self._dll is None:
++        #     raise RuntimeError("found %s, but it's not usable for the library %s" %
++        #                        (foundlibs, libinfo))
++        # if path is not None and sys.platform in ("win32",) and \
++        #     path in self._libfile:
++        #     os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])
+ 
+     def bind_function(self, funcname, args=None, returns=None, optfunc=None):
+         """Binds the passed argument and return value types to the specified
+@@ -110,7 +112,7 @@
+     return
+ 
+ try:
+-    dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH"))
++    dll = DLL("SDL2")
+ except RuntimeError as exc:
+     raise ImportError(exc)
+ 
+diff -ru PySDL2-0.9.6-old/sdl2/sdlgfx.py PySDL2-0.9.6/sdl2/sdlgfx.py
+--- PySDL2-0.9.6-old/sdl2/sdlgfx.py	2018-03-08 10:18:37.585471769 +0100
++++ PySDL2-0.9.6/sdl2/sdlgfx.py	2018-03-08 10:20:06.705517520 +0100
+@@ -34,8 +34,7 @@
+            ]
+ 
+ try:
+-    dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"],
+-              os.getenv("PYSDL2_DLL_PATH"))
++    dll = DLL("SDL2_gfx")
+ except RuntimeError as exc:
+     raise ImportError(exc)
+ 
+diff -ru PySDL2-0.9.6-old/sdl2/sdlimage.py PySDL2-0.9.6/sdl2/sdlimage.py
+--- PySDL2-0.9.6-old/sdl2/sdlimage.py	2018-03-08 10:18:37.585471769 +0100
++++ PySDL2-0.9.6/sdl2/sdlimage.py	2018-03-08 10:20:06.705517520 +0100
+@@ -26,8 +26,7 @@
+            ]
+ 
+ try:
+-    dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"],
+-              os.getenv("PYSDL2_DLL_PATH"))
++    dll = DLL("SDL2_image")
+ except RuntimeError as exc:
+     raise ImportError(exc)
+ 
+diff -ru PySDL2-0.9.6-old/sdl2/sdlmixer.py PySDL2-0.9.6/sdl2/sdlmixer.py
+--- PySDL2-0.9.6-old/sdl2/sdlmixer.py	2018-03-08 10:18:37.585471769 +0100
++++ PySDL2-0.9.6/sdl2/sdlmixer.py	2018-03-08 10:20:27.415758478 +0100
+@@ -50,8 +50,7 @@
+           ]
+ 
+ try:
+-    dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"],
+-              os.getenv("PYSDL2_DLL_PATH"))
++    dll = DLL("SDL2_mixer")
+ except RuntimeError as exc:
+     raise ImportError(exc)
+ 
+diff -ru PySDL2-0.9.6-old/sdl2/sdlttf.py PySDL2-0.9.6/sdl2/sdlttf.py
+--- PySDL2-0.9.6-old/sdl2/sdlttf.py	2018-03-08 10:18:37.585471769 +0100
++++ PySDL2-0.9.6/sdl2/sdlttf.py	2018-03-08 10:20:06.705517520 +0100
+@@ -38,8 +38,7 @@
+           ]
+ 
+ try:
+-    dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"],
+-              os.getenv("PYSDL2_DLL_PATH"))
++    dll = DLL("SDL2_ttf")
+ except RuntimeError as exc:
+     raise ImportError(exc)
+ 
diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix
new file mode 100644
index 00000000000..6681b1b199a
--- /dev/null
+++ b/pkgs/development/python-modules/pysdl2/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer, pyopengl }:
+
+buildPythonPackage rec {
+  pname = "PySDL2";
+  version = "0.9.6";
+  # The tests use OpenGL using find_library, which would have to be
+  # patched; also they seem to actually open X windows and test stuff
+  # like "screensaver disabling", which would have to be cleverly
+  # sandboxed. Disable for now.
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "08r1v9wdq8pzds4g3sng2xgh1hlzfs2z7qgy5a6b0xrs96swlamm";
+  };
+
+  # Deliberately not in propagated build inputs; users can decide
+  # which library they want to include.
+  buildInputs = [ SDL2_ttf SDL2_image SDL2_gfx SDL2_mixer ];
+  propagatedBuildInputs = [ SDL2 ];
+  patches = [ ./PySDL2-dll.patch ];
+  postPatch = ''
+    substituteInPlace sdl2/dll.py --replace \
+      "DLL(\"SDL2\")" "DLL('${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}')"
+    substituteInPlace sdl2/sdlttf.py --replace \
+      "DLL(\"SDL2_ttf\")" "DLL('${SDL2_ttf}/lib/libSDL2_ttf${stdenv.hostPlatform.extensions.sharedLibrary}')"
+    substituteInPlace sdl2/sdlimage.py --replace \
+      "DLL(\"SDL2_image\")" "DLL('${SDL2_image}/lib/libSDL2_image${stdenv.hostPlatform.extensions.sharedLibrary}')"
+    substituteInPlace sdl2/sdlgfx.py --replace \
+     "DLL(\"SDL2_gfx\")" "DLL('${SDL2_gfx}/lib/libSDL2_gfx${stdenv.hostPlatform.extensions.sharedLibrary}')"
+    substituteInPlace sdl2/sdlmixer.py --replace \
+     "DLL(\"SDL2_mixer\")" "DLL('${SDL2_mixer}/lib/libSDL2_mixer${stdenv.hostPlatform.extensions.sharedLibrary}')"
+  '';
+
+  meta = {
+    description = "A wrapper around the SDL2 library and as such similar to the discontinued PySDL project";
+    homepage = https://github.com/marcusva/py-sdl2;
+    license = lib.licenses.publicDomain;
+    maintainers = with lib.maintainers; [ pmiddend ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3be39ded656..204a49e63b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18194,6 +18194,8 @@ EOF
   pyowm = callPackage ../development/python-modules/pyowm { };
 
   prometheus_client = callPackage ../development/python-modules/prometheus_client { };
+
+  pysdl2 = callPackage ../development/python-modules/pysdl2 { };
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From b34f0a11dc451efea8d4aa877803b46c7609be01 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 14:57:21 -0700
Subject: [PATCH 1053/1085] pari: 2.9.4 -> 2.9.5

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

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

These checks were done:

- built on NixOS
- /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5/bin/gp passed the binary check.
- /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5/bin/tex2mail passed the binary check.
- /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5/bin/gphelp passed the binary check.
- /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5/bin/gp-2.9 passed the binary check.
- 4 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 2.9.5 with grep in /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5
- directory tree listing: https://gist.github.com/63c5da24ace1d863b434a462fc0d0123
- du listing: https://gist.github.com/d275cd2f3b274f52576dbab1bf9ebc9c
---
 pkgs/applications/science/math/pari/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 8c24881f215..07c6af0926d 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -8,11 +8,11 @@ assert withThread -> libpthreadstubs != null;
 stdenv.mkDerivation rec {
 
   name = "pari-${version}";
-  version = "2.9.4";
+  version = "2.9.5";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
-    sha256 = "0ir6m3a8r46md5x6zk4xf159qra7aqparby9zk03k81hjrrxr72g";
+    sha256 = "05z6y5iwdzcdggbrkic9cy9vy9wmk5qxc21cb4lqnbqxnhjihibb";
   };
 
   buildInputs = [
-- 
GitLab


From 249c043d8d42eaf122ef3a2df9ac2a931e2c22f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 06:02:39 -0700
Subject: [PATCH 1054/1085] krusader: 2.6.0 -> 2.7.0

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/qk46il6aq1pyr1fbjfykklcpihj61cng-krusader-2.7.0/bin/krusader had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/qk46il6aq1pyr1fbjfykklcpihj61cng-krusader-2.7.0/bin/.krusader-wrapped had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.7.0 with grep in /nix/store/qk46il6aq1pyr1fbjfykklcpihj61cng-krusader-2.7.0
- directory tree listing: https://gist.github.com/d2f674d471fc7a978cf2d1c9e4920a4e
- du listing: https://gist.github.com/00387b725fabb991524a07962b9bf2fb
---
 pkgs/applications/misc/krusader/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index bcf351ff46a..6dc448c6bf4 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -6,13 +6,13 @@
 
 let
   pname = "krusader";
-  version = "2.6.0";
+  version = "2.7.0";
 in mkDerivation rec {
   name = "krusader-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
-    sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh";
+    sha256 = "09ws3samxnjk0qi9pcfm2rmw0nr5mzn9pzpljgrdb5qj7cmm4hcb";
   };
 
   meta = with lib; {
-- 
GitLab


From a58e93bd78d4b0d12d71ecbea9e105a0bc70d444 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 13:07:07 -0700
Subject: [PATCH 1055/1085] simpleitk: 1.0.0 -> 1.1.0

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.1.0 with grep in /nix/store/926vcv62wgj9nyj4z4yw6hxi64yaqha8-simpleitk-1.1.0
- directory tree listing: https://gist.github.com/fc471fd5a722b3d1303143f4ca87457d
- du listing: https://gist.github.com/6f050e82917acd9dc266df3c2c3cb81b
---
 pkgs/development/libraries/simpleitk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
index 4802683079d..c807325b155 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname    = "simpleitk";
-  version = "1.0.0";
+  version = "1.1.0";
   name  = "${pname}-${version}";
 
   src = fetchurl {
     url    = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz";
-    sha256 = "0554j0zp314zhs8isfg31fi6gvsl7xq3xjyyxkx1b1mjkn5qx673";
+    sha256 = "01y8s73mw4yabqir2f8qp5zc1c0y6szi18rr4zwgsxz62g4drzgm";
   };
 
   nativeBuildInputs = [ cmake git swig ];
-- 
GitLab


From 415f5ee000e173cf4b037418f24efa9540e8b741 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 14:21:03 -0700
Subject: [PATCH 1056/1085] powerstat: 0.02.15 -> 0.02.16

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

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

These checks were done:

- built on NixOS
- /nix/store/r8r2fb581gxng6pkwyvbssyl3w21f2pg-powerstat-0.02.16/bin/powerstat passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.02.16 with grep in /nix/store/r8r2fb581gxng6pkwyvbssyl3w21f2pg-powerstat-0.02.16
- directory tree listing: https://gist.github.com/07ed4981848777e18cca2c072d0fb30c
- du listing: https://gist.github.com/5766491662635d4a960a7cd3a4911db0
---
 pkgs/os-specific/linux/powerstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix
index 88151fca2f5..2d4d8f8266f 100644
--- a/pkgs/os-specific/linux/powerstat/default.nix
+++ b/pkgs/os-specific/linux/powerstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "powerstat-${version}";
-  version = "0.02.15";
+  version = "0.02.16";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz";
-    sha256 = "0m8662qv77nzbwkdpydiz87kd75cjjajgp30j6mc5padyw65bxxx";
+    sha256 = "14sx37l40038sjygsnp95542fkbhhc911vd9k5rf85czmvndz29m";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''
-- 
GitLab


From c57afb8ca2cee72174b63418781e4706189cec96 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 16:08:02 -0700
Subject: [PATCH 1057/1085] neofetch: 4.0.0 -> 4.0.2

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

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

These checks were done:

- built on NixOS
- /nix/store/3ys3zndn1cz0s05p84hn6djrzbb9pmlg-neofetch-4.0.2/bin/neofetch passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 4.0.2 with grep in /nix/store/3ys3zndn1cz0s05p84hn6djrzbb9pmlg-neofetch-4.0.2
- directory tree listing: https://gist.github.com/33741fc29ddd44c6fb85d08f2f1a04d5
- du listing: https://gist.github.com/ebad77e50a02ef38e4df2b5db0a93c4f
---
 pkgs/tools/misc/neofetch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index cece77b8d3e..af6c17433f1 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "neofetch-${version}";
-  version = "4.0.0";
+  version = "4.0.2";
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "neofetch";
     rev = version;
-    sha256 = "1ijg6fmrqjgn87899q8cpbir93hqrq4070wzm62s9nmggdgzx6mn";
+    sha256 = "0c0x05ca8lp74928nix4pvd243l95lav35r21mpkbagf72z284d2";
   };
 
   dontBuild = true;
-- 
GitLab


From fca8ce870c9fe8c8cac5e0dee6774ac3dc2ba24e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 15:26:12 -0700
Subject: [PATCH 1058/1085] osinfo-db: 20180502 -> 20180514

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 20180514 with grep in /nix/store/4lgxl3vd6h691mx9hn2znln8idhv5bnn-osinfo-db-20180514
- directory tree listing: https://gist.github.com/557cda4c5d9742fc2f03e3eb6c73b7ee
- du listing: https://gist.github.com/17de36b5bae99c6d771de2b293c347b5
---
 pkgs/data/misc/osinfo-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 82122335f69..7f0fbd71021 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "osinfo-db-20180502";
+  name = "osinfo-db-20180514";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
-    sha256 = "05036mpc5hapx616lfzc67xj157hw3mgyk0arv3brjcx0qmzaram";
+    sha256 = "1pyz89gwn3s9ha4chgfcfddi6dixm2dp4zsypfd38fwhqa9v0ij2";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
-- 
GitLab


From 932c1f7650241a2dd8330de420a9112b521e3de8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 16:29:58 -0700
Subject: [PATCH 1059/1085] metabase: 0.29.2 -> 0.29.3

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/b7bpmc5h45cq2afcmrrsw2w60im3420w-metabase-0.29.3/bin/metabase had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/986f43a4bd9effc51da98989246f0267
- du listing: https://gist.github.com/cec3ac2b5a9a0226fbb8653fbe98ce5e
---
 pkgs/servers/metabase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index f329b108849..588f1dda50c 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "metabase-${version}";
-  version = "0.29.2";
+  version = "0.29.3";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "02cba755mfim8q403gj02ggc0gg4ckcyalxkw09k0jqi5irdi4h1";
+    sha256 = "18yvjxlgdbg7h7ipj1wlic5m0gv5s2943c72shs44jvic6g42pzv";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 910ac0ff47a33052ffdca80ed1f0c96217245cfc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 18:18:15 -0700
Subject: [PATCH 1060/1085] krita: 4.0.2 -> 4.0.3

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/603q26b9pswma12ypz68l39jqyrxbvvy-krita-4.0.3/bin/krita had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 4.0.3 with grep in /nix/store/603q26b9pswma12ypz68l39jqyrxbvvy-krita-4.0.3
- directory tree listing: https://gist.github.com/23ba1bbd1767e4a61fafcd9646d63898
- du listing: https://gist.github.com/4eed85b1634be0fb42b59cdc55799267
---
 pkgs/applications/graphics/krita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index f86694ebc6c..690253947a1 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -9,11 +9,11 @@
 
 mkDerivation rec {
   name = "krita-${version}";
-  version = "4.0.2";
+  version = "4.0.3";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "136nia6z8l9czk3ls2c9dpk617cvfilfhx0s838g5nrqxh4kn0cf";
+    sha256 = "0zmn29dzqncc80pvy9ymgyzqw8x1ryq8b4x5mr4sz15iyj7xgspr";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
-- 
GitLab


From 1fd9740efbabc5cb5f90296e47a641f440eab822 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 20:18:46 -0700
Subject: [PATCH 1061/1085] debootstrap: 1.0.98 -> 1.0.99

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

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

These checks were done:

- built on NixOS
- /nix/store/nnih8xgijkbs82f7xig7q615m9nm8vbd-debootstrap-1.0.99/bin/debootstrap passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.0.99 with grep in /nix/store/nnih8xgijkbs82f7xig7q615m9nm8vbd-debootstrap-1.0.99
- directory tree listing: https://gist.github.com/1c31f499b4a365254573c6c37df9e41c
- du listing: https://gist.github.com/bb42785bdce49536fc4aec7913c57bdf
---
 pkgs/tools/misc/debootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 0ed883bf342..22bf8340156 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -4,13 +4,13 @@
 # There is also cdebootstrap now. Is that easier to maintain?
 stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.98";
+  version = "1.0.99";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "07wfvjhzc5schhpn1dkvhwbi115yn4f1q99g0g39m79bbyxm50d8";
+    sha256 = "1plw53zghiykddj77s5jk10ncx82cgrkk798p909yydhcghnvcsb";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];
-- 
GitLab


From b5204da735c9485e0eb747528bea2115209e0822 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 11:22:32 -0700
Subject: [PATCH 1062/1085] urlwatch: 2.9 -> 2.11

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/gpf4j5mmd5zbz0rqj39d57d38f6311pn-urlwatch-2.11/bin/.urlwatch-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/gpf4j5mmd5zbz0rqj39d57d38f6311pn-urlwatch-2.11/bin/urlwatch had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.11 with grep in /nix/store/gpf4j5mmd5zbz0rqj39d57d38f6311pn-urlwatch-2.11
- directory tree listing: https://gist.github.com/f36eb5277839d9ca3d15995cec7cc592
- du listing: https://gist.github.com/47f738cad88e3941c1c0f149f8aa4fc7
---
 pkgs/tools/networking/urlwatch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index 3e77117e55f..3efc9e6be23 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urlwatch-${version}";
-  version = "2.9";
+  version = "2.11";
 
   src = fetchFromGitHub {
     owner  = "thp";
     repo   = "urlwatch";
     rev    = version;
-    sha256 = "0biy02vyhdwghy9qjmjwlfd8hzaz9gfsssd53ng6zpww4wkkiydz";
+    sha256 = "0vp85d62zhca7d841vg82mwlqb8yihshyc8q2cvwm3rpn5vwf0pi";
   };
 
   propagatedBuildInputs = with python3Packages; [
-- 
GitLab


From 7d0f84b9091d17425eaa6db2077330575e17b924 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 20:32:07 -0700
Subject: [PATCH 1063/1085] ddcutil: 0.8.6 -> 0.9.0

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

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

These checks were done:

- built on NixOS
- /nix/store/xlxjnfwwcwkhzkpg2qwxz5j5gbh4csnk-ddcutil-0.9.0/bin/ddcutil passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.9.0 with grep in /nix/store/xlxjnfwwcwkhzkpg2qwxz5j5gbh4csnk-ddcutil-0.9.0
- directory tree listing: https://gist.github.com/39ac3ce627e1198f84287e5a42257663
- du listing: https://gist.github.com/b896a17a17dd52041097af423a55aea6
---
 pkgs/tools/misc/ddcutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index 052f52e2ebd..e5af0c8d726 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "ddcutil-${version}";
-  version = "0.8.6";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner  = "rockowitz";
     repo   = "ddcutil";
     rev    = "v${version}";
-    sha256 = "1c4cl9cac90xf9rap6ss2d4yshcmhdq8pdfjz3g4cns789fs1vcf";
+    sha256 = "1lcn3jbhpcm6ixp24vsfnk1v0qi0fjkkf57f4grs1wg148s3jpvc";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From 48b9d00c6b62faefa001eec168cb0a4fbaa70815 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 21:08:16 -0700
Subject: [PATCH 1064/1085] adapta-gtk-theme: 3.93.1.14 -> 3.93.1.16

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

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/1f7d6359cc7a8a9633e6baffccd4c6e7
- du listing: https://gist.github.com/976b4a761384960b8a30216a39131cee
---
 pkgs/misc/themes/adapta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index c8e7d860bcf..d696a43b3bc 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.93.1.14";
+  version = "3.93.1.16";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "11iviw9gj4jwp6v32a3y1n6hq8m9pf14drfqxhp3dnygylvxxdr2";
+    sha256 = "11jjzhqvx74iq12682ymsnms99izwl5hys1anb9l0fl6jy0dh2xx";
   };
 
   preferLocalBuild = true;
-- 
GitLab


From 7f7b1daf944aed1619a48486599db3bb8e6dd1b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 19:25:12 -0700
Subject: [PATCH 1065/1085] gqrx: 2.11.4 -> 2.11.5

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/cbn1yxw95q3ypja7bxzlm07z0zbfp9nc-gqrx-2.11.5/bin/gqrx had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.11.5 with grep in /nix/store/cbn1yxw95q3ypja7bxzlm07z0zbfp9nc-gqrx-2.11.5
- directory tree listing: https://gist.github.com/45186a693bdf1b1c7ae2be1c9457ddf8
- du listing: https://gist.github.com/fe434d6ba0c5f72ef74629f65efea48f
---
 pkgs/applications/misc/gqrx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 5c449451e70..f7c7ca5472e 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   name = "gqrx-${version}";
-  version = "2.11.4";
+  version = "2.11.5";
 
   src = fetchFromGitHub {
     owner = "csete";
     repo = "gqrx";
     rev = "v${version}";
-    sha256 = "0a5w9b3fi4f95j34cqsbzxks0d9hmrz4cznc8pi9b0pwvx13hqhm";
+    sha256 = "0q9i0dhd6blagxzk84pzqjq8n4ym3jc1mkkhygg8yncr4vq2saaf";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 80fe329faf037b8dc7bb0d5a743e807a7f52ea0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 17:11:39 -0700
Subject: [PATCH 1066/1085] jackett: 0.8.953 -> 0.8.997

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

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

These checks were done:

- built on NixOS
- /nix/store/1rbrbn9h8ll5srwpv073578fcb0y930j-jackett-0.8.997/bin/Jackett passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.8.997 with grep in /nix/store/1rbrbn9h8ll5srwpv073578fcb0y930j-jackett-0.8.997
- directory tree listing: https://gist.github.com/725e5ff70be355ede10316c73e49da01
- du listing: https://gist.github.com/46fe05a40289b5eb82e68af6ef0dd0d0
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 2bbb4674440..ef4b8239693 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.953";
+  version = "0.8.997";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "0jc7c0z315wh73b75fxz1ad2qy1z5nsvpr7iml4998k15sl7w7mi";
+    sha256 = "0a0viv3aw33kvj9z2fmqacvk2prv8dbdnk85b3xa4knp8cvsva6w";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 96ad842c473c385db9386a38ab95c18695781536 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 16:54:22 -0700
Subject: [PATCH 1067/1085] librealsense: 2.11.0 -> 2.11.1

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

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

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 2.11.1 with grep in /nix/store/qyy6s8nbpifg33h0hvnpf3fizwdycpvz-librealsense-2.11.1
- directory tree listing: https://gist.github.com/020e7e6cfc0e9cc89911d68349e47bc7
- du listing: https://gist.github.com/dfc212b0151822573970980eb31f8289
---
 pkgs/development/libraries/librealsense/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index c61000066f4..796954b356d 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "librealsense-${version}";
-  version = "2.11.0";
+  version = "2.11.1";
 
   src = fetchFromGitHub {
     owner = "IntelRealSense";
     repo = "librealsense";
     rev = "v${version}";
-    sha256 = "11vzs2m6jh9v1xbffr2k541pymmih6g4w641mp8rll8qzqfh89i0";
+    sha256 = "1r27pdisg4hl4x23lrmykqfdc5agrc4pi161mhvzd1vjfkjrxbid";
   };
 
   buildInputs = [
-- 
GitLab


From 8870e3a510cd3b39e99bfa82972ff024417be747 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 18:25:49 -0700
Subject: [PATCH 1068/1085] irqbalance: 1.3.0 -> 1.4.0

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

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

These checks were done:

- built on NixOS
- /nix/store/fkv19sqbw1kxda43q1jqm1zlc8pakzx3-irqbalance-1.4.0/bin/irqbalance passed the binary check.
- Warning: no invocation of /nix/store/fkv19sqbw1kxda43q1jqm1zlc8pakzx3-irqbalance-1.4.0/bin/irqbalance-ui had a zero exit code or showed the expected version
- 1 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/786f267f8a2d5f1ed39214c1c32e4ffa
- du listing: https://gist.github.com/0fd6680f29f78791a2d23a08bc831456
---
 pkgs/os-specific/linux/irqbalance/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix
index 76c10f0a06e..439b2aff6af 100644
--- a/pkgs/os-specific/linux/irqbalance/default.nix
+++ b/pkgs/os-specific/linux/irqbalance/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "irqbalance-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "irqbalance";
     repo = "irqbalance";
     rev = "v${version}";
-    sha256 = "009777p5v72x4r58skqgaf03qv3app9b8lkxkpxq0226l0x3j4qh";
+    sha256 = "05q3cdz2a5zp5s2bdz5a80y9vq7awqw9lbvyvh6vjs9a8vg80hwm";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From cdd0d9944ad0ad2d3fbd1e793300a7959a22284f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 19:54:21 -0700
Subject: [PATCH 1069/1085] dash: 0.5.10.1 -> 0.5.10.2

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

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

These checks were done:

- built on NixOS
- /nix/store/shdckmx580jc9c283dxlnl47gfj5lykc-dash-0.5.10.2/bin/dash passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/f099316518721d966018e207da80b59f
- du listing: https://gist.github.com/943c0fa7050582ee37c58883869edf64
---
 pkgs/shells/dash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix
index c852e1feb33..2db8edd5e0c 100644
--- a/pkgs/shells/dash/default.nix
+++ b/pkgs/shells/dash/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dash-0.5.10.1";
+  name = "dash-0.5.10.2";
 
   src = fetchurl {
     url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
-    sha256 = "1bl4brz5vy07lrss54glp4vfca3q8d73hyc87sqdk99f76z95b6s";
+    sha256 = "0wb0bwmqc661hylqcfdp7l7x12myw3vpqk513ncyqrjwvhckjriw";
   };
 
   hardeningDisable = [ "format" ];
-- 
GitLab


From bd0dbed3ff6c9e1c415ce669d1152761a9c64f97 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 10:42:20 -0700
Subject: [PATCH 1070/1085] uncrustify: 0.66.1 -> 0.67

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

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

These checks were done:

- built on NixOS
- /nix/store/k96qsfrnrv7wdps9i46pbfzwm4n0ml0x-uncrustify-0.67/bin/uncrustify passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.67 with grep in /nix/store/k96qsfrnrv7wdps9i46pbfzwm4n0ml0x-uncrustify-0.67
- directory tree listing: https://gist.github.com/71da32610fd0c4196f8b0f19061ca051
- du listing: https://gist.github.com/6af9737f25aad6d34b2ee37f3d3a056e
---
 pkgs/development/tools/misc/uncrustify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix
index 3cf707c6beb..d85cd1a8216 100644
--- a/pkgs/development/tools/misc/uncrustify/default.nix
+++ b/pkgs/development/tools/misc/uncrustify/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "uncrustify";
-  version = "0.66.1";
+  version = "0.67";
 
   src = fetchFromGitHub {
     owner = product;
     repo = product;
     rev = name;
-    sha256 = "1y69b0g07ksynf1fwfh5qqwmscxfbvs1yi3n3lbdd4vplb9zakyx";
+    sha256 = "0hf8c93aj1hjg6cc77x6p7nf7ddp8mn4b6a9gpcrvmx8w81afpd3";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From fbf82900c49afb8ea4ab688b82fdaf6157fa142c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 20:54:59 -0700
Subject: [PATCH 1071/1085] chirp: 20180512 -> 20180519

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

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

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/s2g23ds5fsnl0bg7dyn9j5y3drvxs3ar-chirp-daily-20180519/bin/.chirpw-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/s2g23ds5fsnl0bg7dyn9j5y3drvxs3ar-chirp-daily-20180519/bin/chirpw had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 20180519 with grep in /nix/store/s2g23ds5fsnl0bg7dyn9j5y3drvxs3ar-chirp-daily-20180519
- directory tree listing: https://gist.github.com/a05ef55580a6032a5b40aabb92e6dfd7
- du listing: https://gist.github.com/13517a738616514609c44b95f30fc5a1
---
 pkgs/applications/misc/chirp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 54f36663454..90d7ecd082c 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
-  version = "20180512";
+  version = "20180519";
 
   src = fetchurl {
     url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
-    sha256 = "111pijr0v36n3yg0p58mgvfxvz088axnxvgfhs8cblssi931mimm";
+    sha256 = "1sb4cw95lcj2cdfzzgnwjgmnpk2nqjys4am5qvj4pnh0x447sznv";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From d9bdd77eb59079f1ebefb522325cf117ae575982 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 21 May 2018 11:46:44 +0200
Subject: [PATCH 1072/1085] vimNox: pin to lua 5.1

vimNox is currently built from a patched vim 7.3 source from 2012
that requires lua 5.1. Temporary fix, see discussion in #40749.
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdc4ed881e0..c19e956e7a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18374,7 +18374,10 @@ with pkgs;
 
   xxd = callPackage ../tools/misc/xxd { };
 
-  vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; });
+  vimNox = lowPrio (vim_configurable.override {
+    source = "vim-nox";
+    lua = pkgs.lua5_1; # vimNox source is from 2012, requires older lua
+  });
 
   qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};
 
-- 
GitLab


From d239113bb0a2b471ea72d8a8af2331ec87d72a93 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 21 May 2018 08:42:51 -0700
Subject: [PATCH 1073/1085] palemoon: 27.9.1 -> 27.9.2 (#40838)

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

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

These checks were done:

- built on NixOS
- /nix/store/5kg07d9qryxy21ikixc0273ngbm3zl3v-palemoon-27.9.2/bin/palemoon passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 27.9.2 with grep in /nix/store/5kg07d9qryxy21ikixc0273ngbm3zl3v-palemoon-27.9.2
- directory tree listing: https://gist.github.com/97521481792d6df556c4536742a77bb4
- du listing: https://gist.github.com/7f246d760956bb748d5e09cfd1193a6b
---
 pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 3f44d157660..e6b5ee641ee 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   name = "palemoon-${version}";
-  version = "27.9.1";
+  version = "27.9.2";
 
   src = fetchFromGitHub {
     name   = "palemoon-src";
     owner  = "MoonchildProductions";
     repo   = "Pale-Moon";
     rev    = version + "_Release";
-    sha256 = "1cjd0liy3x7iqx8g8mbwdrr0f2aiqjiaifzzkngcvx3vfmphj97k";
+    sha256 = "0v6vgkxac2s1hw1namvrjysj2k1kbkabwdxrpq6kyd8svr7n974r";
   };
 
   desktopItem = makeDesktopItem {
-- 
GitLab


From e8ef471df4fb1f9e7712fc9498437790c440201f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 21 May 2018 14:41:14 -0400
Subject: [PATCH 1074/1085] linux-copperhead: 4.16.9.a -> 4.16.10.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
index 5c65f2064b4..fea27b649f5 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.16.9";
+  version = "4.16.10";
   revision = "a";
-  sha256 = "1g1924whb79cflh4wcqpyq9d7nfxdsvsjh2mv5ps85fsg2109kpl";
+  sha256 = "1dd9zislrlv24mnvzm2j9rfxnfp93lgf0pi48zpdglw5xpfwqm49";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
-- 
GitLab


From d775dc916080ed52eac84cdd6b68ab8feaeb0cb2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 21 May 2018 14:41:34 -0400
Subject: [PATCH 1075/1085] linux-copperhead: 4.14.41 -> 4.14.42

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
index 8054ba0be6a..f9af5e5f602 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.14.41";
+  version = "4.14.42";
   revision = "a";
-  sha256 = "16jwv1drs6xlwghzn8ps7v8x5xja61b5y6747c86g17idfaac1k3";
+  sha256 = "09j36qhxs1z2qcxlpscg8yrif4qvm5ipbh7n6gxg58150yg9sl05";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
-- 
GitLab


From 2a5b2550f38afc92dfe33acb0e9d3c20a139f941 Mon Sep 17 00:00:00 2001
From: Alvar <geistesk@users.noreply.github.com>
Date: Mon, 21 May 2018 21:53:50 +0200
Subject: [PATCH 1076/1085] pythonPackages.pypcap: 1.2.0 -> 1.2.2 (#40882)

---
 .../python-modules/pypcap/default.nix         | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix
index e2d4e1efe28..dc916213fcd 100644
--- a/pkgs/development/python-modules/pypcap/default.nix
+++ b/pkgs/development/python-modules/pypcap/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, lib, writeText, buildPythonPackage, fetchPypi, libpcap, dpkt }:
+{ lib, writeText, buildPythonPackage, fetchPypi, libpcap, dpkt }:
 
 buildPythonPackage rec {
   pname = "pypcap";
-  version = "1.2.0";
-  name = "${pname}-${version}";
+  version = "1.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n01xjgg8n5mf1cs9yg9ljsx1kvir8cm6wwrd2069fawjxdbk0b9";
+    sha256 = "07ww25z4xydp11hb38halh1940gmp5lca11hwfb63zv3bps248x3";
   };
 
   patches = [
@@ -17,26 +16,24 @@ buildPythonPackage rec {
       ''
       --- a/setup.py
       +++ b/setup.py
-      @@ -27,7 +27,8 @@ def recursive_search(path, target_files):
+      @@ -28,6 +28,7 @@ def recursive_search(path, target_files):
 
-       def get_extension():
-           # A list of all the possible search directories
-      -    dirs = ['/usr', sys.prefix] + glob.glob('/opt/libpcap*') + \
-      +    dirs = ['${libpcap}', '/usr', sys.prefix] + \
-      +        glob.glob('/opt/libpcap*') + \
-               glob.glob('../libpcap*') + glob.glob('../wpdpack*') + \
-               glob.glob('/Applications/Xcode.app/Contents/Developer/Platforms/' +
-                         'MacOSX.platform/Developer/SDKs/*')
+       def find_prefix_and_pcap_h():
+           prefixes = chain.from_iterable((
+      +        '${libpcap}',
+               ('/usr', sys.prefix),
+               glob.glob('/opt/libpcap*'),
+               glob.glob('../libpcap*'),
       '')
   ];
 
   buildInputs = [ libpcap ];
-  nativeBuildInputs = [ dpkt ];
+  checkInputs = [ dpkt ];
 
-  meta = {
+  meta = with lib; {
     homepage = https://github.com/pynetwork/pypcap;
     description = "Simplified object-oriented Python wrapper for libpcap";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ geistesk ];
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ geistesk ];
   };
 }
-- 
GitLab


From 3709e30d067675956bce99a70bb4c55c10b3711a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 21 May 2018 22:15:33 +0200
Subject: [PATCH 1077/1085] restic: 0.8.3 -> 0.9.0

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

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 158d7f1d2cf..9f9714e6d99 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "restic-${version}";
-  version = "0.8.3";
+  version = "0.9.0";
 
   goPackagePath = "github.com/restic/restic";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "restic";
     repo = "restic";
     rev = "v${version}";
-    sha256 = "0vbwbxly3p1wj25ai1xak1bmhibh2ilxl55gsbnaaq7pcznc3ad9";
+    sha256 = "09520ggr98w7nn6kl3yx0nrx4f79q4vhg4q1hiv2nlwxd0jz1p6y";
   };
 
   buildPhase = ''
@@ -31,7 +31,7 @@ buildGoPackage rec {
       --man $bin/share/man/man1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://restic.net;
     description = "A backup program that is fast, efficient and secure";
     platforms = platforms.linux ++ platforms.darwin;
-- 
GitLab


From 5f9b2597105876afb4388e122a9545c1c0000571 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 21 May 2018 15:36:25 -0500
Subject: [PATCH 1078/1085] heaptrack: 2018-01-28 -> 1.1.0

use new stable release!
---
 pkgs/development/tools/profiling/heaptrack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index f5f9a15dd00..5ff0d2ca2b1 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "heaptrack-${version}";
-  version = "2018-01-28";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "KDE";
     repo = "heaptrack";
-    rev = "a4534d52788ab9814efca1232d402b2eb319342c";
-    sha256 = "00xfv51kavvcmwgfmcixx0k5vhd06gkj5q0mm8rwxiw6215xp41a";
+    rev = "v${version}";
+    sha256 = "0vgwldl5n41r4y3pv8w29gmyln0k2w6m59zrfw9psm4hkxvivzlx";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
-- 
GitLab


From 07723f14bb132f6d65c74b953bef39cd80457273 Mon Sep 17 00:00:00 2001
From: Frank Doepper <github@woffs.de>
Date: Tue, 22 May 2018 00:10:32 +0200
Subject: [PATCH 1079/1085] shotcut: 18.03.06 -> 18.05.08 (#40887)

---
 pkgs/applications/video/shotcut/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 0a786312214..6572164c797 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -3,15 +3,18 @@
 , qtgraphicaleffects, libmlt
 , qmake, makeWrapper }:
 
+assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
+assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
+
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
-  version = "18.03.06";
+  version = "18.05.08";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "1b8hfym89i1nmrx80y16z06zsff5qba7gpga8jydnw1lmcscdash";
+    sha256 = "1qm1ycsx93qpw2vga25m3cr82vzqla1qqardjiln3iqfa0m93qsk";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 050d07d6726ca650599af9108fb7ed0977caa152 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 21 May 2018 17:43:22 -0500
Subject: [PATCH 1080/1085] gn: fix patch url

Fixes #40891
---
 pkgs/development/tools/build-managers/gn/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index 35f54369abd..f49456a86ea 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -69,7 +69,7 @@ in stdenv.mkDerivation {
 
   patches = [
     (fetchpatch {
-      url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/master/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch";
+      url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/3375fbc7b865dafe1230431a1e3f9bffd27ec184/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch";
       sha256 = "1h8jgxznm7zrxlzb4wcfx4zx4lyvfrmpd0r7cd7h0s23wn8ibb3a";
     })
   ];
-- 
GitLab


From fe79fc0be4f3e27d634fbcb27c43eed948d285ce Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Tue, 22 May 2018 01:22:12 +0200
Subject: [PATCH 1081/1085] nixos/tests/mysql-replication: fix test (#40850)

Failed non-deterministically on hydra because replcation
sometimes was not finished yet when checking the results.
---
 nixos/tests/mysql-replication.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index 75c6d793feb..ed09ac10b75 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -57,18 +57,25 @@ in
     $master->start;
     $master->waitForUnit("mysql");
     $master->waitForOpenPort(3306);
+    # Wait for testdb to be fully populated (5 rows).
+    $master->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
+
     $slave1->start;
     $slave2->start;
     $slave1->waitForUnit("mysql");
     $slave1->waitForOpenPort(3306);
     $slave2->waitForUnit("mysql");
     $slave2->waitForOpenPort(3306);
-    $slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
+
+    # wait for replications to finish
+    $slave1->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
+    $slave2->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
+
     $slave2->succeed("systemctl stop mysql");
     $master->succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N");
     $slave2->succeed("systemctl start mysql");
     $slave2->waitForUnit("mysql");
     $slave2->waitForOpenPort(3306);
-    $slave2->succeed("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456");
+    $slave2->waitUntilSucceeds("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456");
   '';
 })
-- 
GitLab


From 9ec53a397ff52ec8a94a5bc6b603bff357c1fdd0 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 21 May 2018 19:19:29 -0400
Subject: [PATCH 1082/1085] requireFile: Use stdenvNoCC

There's no need for a C compiler
---
 pkgs/build-support/trivial-builders.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 2ec56c94763..73da775f7f5 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -157,14 +157,14 @@ rec {
       hash = if sha256 != null then sha256 else sha1;
       name_ = if name == null then baseNameOf (toString url) else name;
     in
-    stdenv.mkDerivation {
+    stdenvNoCC.mkDerivation {
       name = name_;
       outputHashMode = hashMode;
       outputHashAlgo = hashAlgo;
       outputHash = hash;
       preferLocalBuild = true;
       builder = writeScript "restrict-message" ''
-        source ${stdenv}/setup
+        source ${stdenvNoCC}/setup
         cat <<_EOF_
 
         ***
-- 
GitLab


From 9cf701f856df2cdb7ec18cf7bc3829bf40c0cdcc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 21 May 2018 17:03:26 -0700
Subject: [PATCH 1083/1085] mutt: 1.9.5 -> 1.10.0 (#40846)

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

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

These checks were done:

- built on NixOS
- /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/mutt passed the binary check.
- /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/pgpring passed the binary check.
- Warning: no invocation of /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/pgpewrap had a zero exit code or showed the expected version
- /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/muttbug passed the binary check.
- /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/flea passed the binary check.
- Warning: no invocation of /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/smime_keys had a zero exit code or showed the expected version
- 4 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- found 1.10.0 with grep in /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0
- directory tree listing: https://gist.github.com/2b53d5dc44b600872e77911ba7099e1c
- du listing: https://gist.github.com/4caca5d9043a5281a6b192ebaf30065f
---
 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 bbd56b188df..81cf4541222 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
-  version = "1.9.5";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
-    sha256 = "0lsp72lm3cw490x7lhzia7h8f591bab2mr7qpscaj22fmrj7wqdz";
+    sha256 = "0nskymwr2cdapxlfv0ysz3bjwhb4kcvl5a3c39237k7r1vwva582";
   };
 
   patches = optional smimeSupport (fetchpatch {
-- 
GitLab


From 0106dfcbeb56742503a89309c60a95433514226e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 21 May 2018 17:07:27 -0700
Subject: [PATCH 1084/1085] rust-bindgen: 0.36.1 -> 0.37.0 (#40833)

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

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

These checks were done:

- built on NixOS
- /nix/store/y7lbrcpy05c1br43257fj056p6vf269l-rust-bindgen-0.37.0/bin/bindgen passed the binary check.
- Warning: no invocation of /nix/store/y7lbrcpy05c1br43257fj056p6vf269l-rust-bindgen-0.37.0/bin/.bindgen-wrapped had a zero exit code or showed the expected version
- 1 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 0.37.0 with grep in /nix/store/y7lbrcpy05c1br43257fj056p6vf269l-rust-bindgen-0.37.0
- directory tree listing: https://gist.github.com/dab90e1565932370211bc1cb47b526d9
- du listing: https://gist.github.com/1ea884a58cb25990e712703124f8a6da
---
 pkgs/development/tools/rust/bindgen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 36fa1019705..aeeae494e58 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.36.1";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rust-bindgen";
     rev = "v${version}";
-    sha256 = "0y99dvkbkd4vhac26dmc3bwf6z2m85p2il7mndvv8liam012pkbz";
+    sha256 = "0cqjr7qspjrfgqcp4nqxljmhhbqyijb2jpw3lajgjj48y6wrnw93";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From afc439d57b3866cb499fe68b94f969079aba7963 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 21 May 2018 20:26:37 -0400
Subject: [PATCH 1085/1085] binutils: Always apply Aarch64 patch

Otherwise various things which depend on `--enable-targets=all`
lib{bfd,opcodes}...like LLVM.
---
 pkgs/development/tools/misc/binutils/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index ac055171658..fb780734bd7 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -64,13 +64,12 @@ stdenv.mkDerivation rec {
 
     # https://sourceware.org/bugzilla/show_bug.cgi?id=22868
     ./gold-symbol-visibility.patch
-  ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch
-    ++ stdenv.lib.optionals targetPlatform.isAarch64 [
+
     # Version 2.30 introduced strict requirements on ELF relocations which cannot
     # be satisfied on aarch64 platform. Add backported fix from bugzilla.
     # https://sourceware.org/bugzilla/show_bug.cgi?id=22764
     ./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
-  ];
+  ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch;
 
   outputs = [ "out" "info" "man" ];
 
-- 
GitLab