From b5258982d27350322c0d37e44dfb84fb18c9f73d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 13 Apr 2017 02:12:35 +0300
Subject: [PATCH 001/206] qt4: enable gtk2 by default

---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 46bb7a4e8fa..18f2e7611a9 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -6,7 +6,8 @@
 , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
 , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
 , flashplayerFix ? false, gdk_pixbuf
-, gtkStyle ? false, libgnomeui, gtk2, GConf, gnome_vfs
+, gtkStyle ? true, gtk2
+, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
 , developerBuild ? false
 , docs ? false
 , examples ? false
@@ -73,14 +74,15 @@ stdenv.mkDerivation rec {
         glibc = stdenv.cc.libc.out;
         openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path";
       })
-    ] ++ stdenv.lib.optional gtkStyle (substituteAll {
+    ] ++ stdenv.lib.optional gtkStyle (substituteAll ({
         src = ./dlopen-gtkstyle.diff;
         # substituteAll ignores env vars starting with capital letter
-        gconf = GConf.out;
         gtk = gtk2.out;
+      } // stdenv.lib.optionalAttrs gnomeStyle {
+        gconf = GConf.out;
         libgnomeui = libgnomeui.out;
         gnome_vfs = gnome_vfs.out;
-      })
+      }))
     ++ stdenv.lib.optional flashplayerFix (substituteAll {
         src = ./dlopen-webkit-nsplugin.diff;
         gtk = gtk2.out;

From 86e160440f25a5f3afb811d2d0660d1f275b3127 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Fri, 28 Apr 2017 21:35:46 -0400
Subject: [PATCH 002/206] rtags: link to libclang.dylib at absolute path on
 darwin

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

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

From 4338f096f59ad448192d692504a08565775e06ab Mon Sep 17 00:00:00 2001
From: Daniel Ehlers <danielehlers@mindeye.net>
Date: Mon, 27 Mar 2017 23:42:02 +0200
Subject: [PATCH 003/206] nullmailer + service: init at 2.0

---
 nixos/modules/module-list.nix              |   1 +
 nixos/modules/services/mail/nullmailer.nix | 217 +++++++++++++++++++++
 pkgs/servers/mail/nullmailer/default.nix   |  51 +++++
 pkgs/top-level/all-packages.nix            |   2 +
 4 files changed, 271 insertions(+)
 create mode 100644 nixos/modules/services/mail/nullmailer.nix
 create mode 100644 pkgs/servers/mail/nullmailer/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4e9154f1740..e27b5f5f93a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -246,6 +246,7 @@
   ./services/mail/spamassassin.nix
   ./services/mail/rspamd.nix
   ./services/mail/rmilter.nix
+  ./services/mail/nullmailer.nix
   ./services/misc/apache-kafka.nix
   ./services/misc/autofs.nix
   ./services/misc/bepasty.nix
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
new file mode 100644
index 00000000000..b2c738ab6eb
--- /dev/null
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -0,0 +1,217 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+
+  options = {
+
+    services.nullmailer = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable nullmailer daemon.";
+      };
+
+      user = mkOption {
+        type = types.string;
+        default = "nullmailer";
+        description = ''
+          User to use to run nullmailer-send.
+        '';
+      };
+
+      group = mkOption {
+        type = types.string;
+        default = "nullmailer";
+        description = ''
+          Group to use to run nullmailer-send.
+        '';
+      };
+
+      setSendmail = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Whether to set the system sendmail to nullmailer's.";
+      };
+
+      config = {
+        adminaddr = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            If set, all recipients to users at either "localhost" (the literal string)
+            or the canonical host name (from the me control attribute) are remapped to this address.
+            This is provided to allow local daemons to be able to send email to
+            "somebody@localhost" and have it go somewhere sensible instead of being  bounced
+            by your relay host. To send to multiple addresses,
+            put them all on one line separated by a comma.
+          '';
+        };
+
+        allmailfrom = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            If set, content will override the envelope sender on all messages.
+          '';
+        };
+
+        defaultdomain = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+             The content of this attribute is appended to any host name that
+             does not contain a period (except localhost), including defaulthost
+             and idhost. Defaults to the value of the me attribute, if it exists,
+             otherwise the literal name defauldomain.
+          '';
+        };
+
+        defaulthost = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+             The content of this attribute is appended to any address that
+             is missing a host name. Defaults to the value of the me control
+             attribute, if it exists, otherwise the literal name defaulthost.
+          '';
+        };
+
+        doublebounceto = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            If the original sender was empty (the original message was a
+            delivery status or disposition notification), the double bounce
+            is sent to the address in this attribute.
+          '';
+        };
+
+        helohost = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            Sets  the  environment variable $HELOHOST which is used by the
+            SMTP protocol module to set the parameter given to the HELO command.
+            Defaults to the value of the me configuration attribute.
+          '';
+        };
+
+        idhost = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            The content of this attribute is used when building the message-id
+            string for the message. Defaults to the canonicalized value of defaulthost.
+          '';
+        };
+
+        maxpause = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+             The maximum time to pause between successive queue runs, in seconds.
+             Defaults to 24 hours (86400).
+          '';
+        };
+
+        me = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+             The fully-qualifiled host name of the computer running nullmailer.
+             Defaults to the literal name me.
+          '';
+        };
+
+        pausetime = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            The minimum time to pause between successive queue runs when there
+            are messages in the queue, in seconds. Defaults to 1 minute (60).
+            Each time this timeout is reached, the timeout is doubled to a
+            maximum of maxpause. After new messages are injected, the timeout
+            is reset.  If this is set to 0, nullmailer-send will exit
+            immediately after going through the queue once (one-shot mode).
+          '';
+        };
+
+        remotes = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            If set, content will override the envelope sender on all messages.
+          '';
+        };
+
+        sendtimeout = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = ''
+            The  time to wait for a remote module listed above to complete sending
+            a message before killing it and trying again, in seconds.
+            Defaults to 1 hour (3600).  If this is set to 0, nullmailer-send
+            will wait forever for messages to complete sending.
+          '';
+        };
+      };
+    };
+  };
+
+  config = let
+    cfg = config.services.nullmailer;
+  in mkIf cfg.enable {
+
+    environment = {
+      systemPackages = [ pkgs.nullmailer ];
+      etc = let
+        getval  = attr: builtins.getAttr attr cfg.config;
+        attrs   = builtins.attrNames cfg.config;
+        attrs'  = builtins.filter (attr: ! isNull (getval attr)) attrs;
+      in foldl' (as: attr: as // { "nullmailer/${attr}".text = getval attr; }) {} attrs';
+    };
+
+    users = {
+      extraUsers = singleton {
+        name = cfg.user;
+        description = "Nullmailer relay-only mta user";
+        group = cfg.group;
+      };
+
+      extraGroups = singleton {
+        name = cfg.group;
+      };
+    };
+
+    systemd.services.nullmailer = {
+      description = "nullmailer";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      preStart = ''
+        mkdir -p /var/spool/nullmailer/{queue,tmp}
+        rm -f var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger
+        chown ${cfg.user} /var/spool/nullmailer/*
+      '';
+
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        PermissionsStartOnly=true;
+        ExecStart = "${pkgs.nullmailer}/bin/nullmailer-send";
+        Restart = "always";
+      };
+    };
+
+    services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail {
+      program = "sendmail";
+      source = "${pkgs.nullmailer}/bin/sendmail";
+      owner = cfg.user;
+      group = cfg.group;
+      setuid = true;
+      setgid = true;
+    };
+  };
+}
diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix
new file mode 100644
index 00000000000..44840c91b05
--- /dev/null
+++ b/pkgs/servers/mail/nullmailer/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, lib, tls ? true, gnutls ? null }:
+
+assert tls -> gnutls != null;
+
+stdenv.mkDerivation rec {
+
+  version = "2.0";
+  name = "nullmailer-${version}";
+
+  src = fetchurl {
+    url = "http://untroubled.org/nullmailer/nullmailer-${version}.tar.gz";
+    sha256 = "112ghdln8q9yljc8kp9mc3843mh0fyb4rig2v4q2dzy1l324q3yp";
+  };
+
+  buildInputs = stdenv.lib.optional tls gnutls;
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+  ] ++ stdenv.lib.optional tls "--enable-tls";
+
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  # We have to remove the ''var'' directory, since nix can't handle named pipes
+  # and we can't use it in the store anyway. Same for ''etc''.
+  # The second line is need, because the installer of nullmailer will copy its
+  # own prepared version of ''etc'' and ''var'' and also uses the prefix path (configure phase)
+  # for hardcoded absolute references to its own binary farm, e.g. sendmail binary is
+  # calling nullmailer-inject binary. Since we can't configure inside the store of
+  # the derivation we need both directories in the root, but don't want to put them there
+  # during install, hence we have to fix mumbling inside the install directory.
+  # This is kind of a hack, but the only way I know of, yet.
+  postInstall = ''
+    rm -rf $out/var/ $out/etc/
+    mv $out/$out/* $out/
+    rmdir $out/$out
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = "http://untroubled.org/nullmailer/";
+    description = ''
+      A sendmail/qmail/etc replacement MTA for hosts which relay to a fixed set of smart relays.
+      It is designed to be simple to configure, secure, and easily extendable.
+    '';
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers ; [ sargon ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4da7d503d45..eb7ff19545f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12499,6 +12499,8 @@ with pkgs;
   inherit (callPackages ../data/fonts/noto-fonts {})
     noto-fonts noto-fonts-cjk noto-fonts-emoji;
 
+  nullmailer = callPackage ../servers/mail/nullmailer { };
+
   numix-icon-theme = callPackage ../data/icons/numix-icon-theme { };
 
   numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { };

From 473a9be1c2e07b65e5798fab2263c9f612176a0c Mon Sep 17 00:00:00 2001
From: Moritz Drexl <mdrexl@fastmail.fm>
Date: Mon, 1 May 2017 18:29:33 +0200
Subject: [PATCH 004/206] purescript: remove pinned dependencies in hackage2nix
 config

The dependencies were added for purescript 0.10.7 and are no longer needed since
the override is gone.
---
 .../haskell-modules/configuration-hackage2nix.yaml         | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d2c2e27cc65..65a0042f0ec 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2454,13 +2454,6 @@ extra-packages:
   - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
   - vector < 0.10.10                    # newer versions don't work with GHC 6.12.3
   - zlib < 0.6                          # newer versions break cabal-install
-  - aeson == 0.11.3.0                   # purescript 0.10.7
-  - bower-json == 1.0.0.1               # purescript 0.10.7
-  - optparse-applicative == 0.13.1.0    # purescript 0.10.7
-  - http-client == 0.4.31.2             # purescript 0.10.7
-  - http-client-tls == 0.2.4.1          # purescript 0.10.7
-  - pipes == 4.2.0                      # purescript 0.10.7
-  - websockets == 0.9.8.2               # purescript 0.10.7
 
 package-maintainers:
   peti:

From 56b30bf98a41c5ed8d33fafaa2c8b1243d7a9d8e Mon Sep 17 00:00:00 2001
From: Andy Li <andy@onthewings.net>
Date: Tue, 2 May 2017 17:01:22 +0800
Subject: [PATCH 005/206] haxe: 3.2.1 -> 3.4.2

---
 pkgs/development/compilers/haxe/default.nix   |  18 ++-
 .../compilers/haxe/haxelib-nix.patch          | 128 ------------------
 2 files changed, 8 insertions(+), 138 deletions(-)
 delete mode 100644 pkgs/development/compilers/haxe/haxelib-nix.patch

diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index a4077408ef0..684c6d25daa 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -1,25 +1,23 @@
-{ stdenv, fetchgit, ocaml, zlib, neko, camlp4 }:
+{ stdenv, fetchgit, ocaml, zlib, pcre, neko, camlp4 }:
 
 stdenv.mkDerivation {
-  name = "haxe-3.2.1";
+  name = "haxe-3.4.2";
 
-  buildInputs = [ocaml zlib neko camlp4];
+  buildInputs = [ocaml zlib pcre neko camlp4];
 
   src = fetchgit {
     url = "https://github.com/HaxeFoundation/haxe.git";
-    sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3";
+    sha256 = "1m5fp183agqv8h3ynhxw4kndkpq2d6arysmirv3zl3vz5crmpwqd";
     fetchSubmodules = true;
 
-    # Tag 3.2.1
-    rev = "deab4424399b520750671e51e5f5c2684e942c17";
+    # Tag 3.4.2
+    rev = "890f8c70cf23ce6f9fe0fdd0ee514a9699433ca7";
   };
 
   prePatch = ''
-    sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml
+    sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml
   '';
 
-  patches = [ ./haxelib-nix.patch ];
-
   buildFlags = [ "all" "tools" ];
 
   installPhase = ''
@@ -34,7 +32,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
-    homepage = http://haxe.org;
+    homepage = https://haxe.org;
     license = with licenses; [ gpl2 bsd2 /*?*/ ];  # -> docs/license.txt
     maintainers = [ maintainers.marcweber ];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/compilers/haxe/haxelib-nix.patch b/pkgs/development/compilers/haxe/haxelib-nix.patch
deleted file mode 100644
index ed370e8efd1..00000000000
--- a/pkgs/development/compilers/haxe/haxelib-nix.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff --git a/src/tools/haxelib/Main.hx b/src/tools/haxelib/Main.hx
-index dc18815..def5231 100644
---- a/extra/haxelib_src/src/tools/haxelib/Main.hx
-+++ b/extra/haxelib_src/src/tools/haxelib/Main.hx
-@@ -1301,21 +1301,26 @@ class Main {
- 	}
-
- 	function checkRec( prj : String, version : String, l : List<{ project : String, version : String, info : Infos }> ) {
--		var pdir = getRepository() + Data.safe(prj);
--		if( !FileSystem.exists(pdir) )
--			throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'";
--		var version = if( version != null ) version else getCurrent(pdir);
--		var vdir = pdir + "/" + Data.safe(version);
--		if( vdir.endsWith("dev") )
--			vdir = getDev(pdir);
--		if( !FileSystem.exists(vdir) )
--			throw "Library "+prj+" version "+version+" is not installed";
--		for( p in l )
--			if( p.project == prj ) {
--				if( p.version == version )
--					return;
--				throw "Library "+prj+" has two version included "+version+" and "+p.version;
--			}
-+		var vdir = this.getNixLib(prj);
-+		if (vdir == null) {
-+			var pdir = getRepository() + Data.safe(prj);
-+			if( !FileSystem.exists(pdir) )
-+				throw "Library "+prj+" is not installed : run 'haxelib install "+prj+"'";
-+			var version = if( version != null ) version else getCurrent(pdir);
-+			var vdir = pdir + "/" + Data.safe(version);
-+			if( vdir.endsWith("dev") )
-+				vdir = getDev(pdir);
-+			if( !FileSystem.exists(vdir) )
-+				throw "Library "+prj+" version "+version+" is not installed";
-+			for( p in l )
-+				if( p.project == prj ) {
-+					if( p.version == version )
-+						return;
-+					throw "Library "+prj+" has two version included "+version+" and "+p.version;
-+				}
-+		} else {
-+			version = null;
-+		}
- 		var json = try File.getContent(vdir+"/"+Data.JSON) catch( e : Dynamic ) null;
- 		var inf = Data.readData(json,false);
- 		l.add({ project : prj, version : version, info: inf });
-@@ -1330,15 +1335,21 @@ class Main {
- 			var a = args[argcur++].split(":");
- 			checkRec(a[0],a[1],list);
- 		}
--		var rep = getRepository();
- 		for( d in list ) {
--			var pdir = Data.safe(d.project)+"/"+Data.safe(d.version)+"/";
--			var dir = rep + pdir;
--			try {
--				dir = getDev(rep+Data.safe(d.project));
-+			var dir = this.getNixLib(d.project);
-+			var pdir = Data.safe(d.project)+"/";
-+			if (dir == null) {
-+				var rep = getRepository();
-+				pdir += Data.safe(d.version)+"/";
-+				dir = rep + pdir;
-+				try {
-+					dir = getDev(rep+Data.safe(d.project));
-+					dir = Path.addTrailingSlash(dir);
-+					pdir = dir;
-+				} catch( e : Dynamic ) {}
-+			} else {
- 				dir = Path.addTrailingSlash(dir);
--				pdir = dir;
--			} catch( e : Dynamic ) {}
-+			}
- 			var ndir = dir + "ndll";
- 			if( FileSystem.exists(ndir) ) {
- 				var sysdir = ndir+"/"+Sys.systemName();
-@@ -1491,23 +1502,43 @@ class Main {
- 			);
- 	}
-
-+	function getNixLib(project:String):Null<String>
-+	{
-+		var hlibPath = Sys.getEnv("HAXELIB_PATH");
-+		if (hlibPath != null) {
-+			for (libDir in hlibPath.split(":")) {
-+				var fullpath = libDir;
-+				fullpath += libDir.substr(-1, 1) == "/" ? "" : "/";
-+				fullpath += Data.safe(project);
-+				if (FileSystem.exists(fullpath))
-+					return fullpath;
-+			}
-+		}
-+		return null;
-+	}
-
- 	function run() {
--		var rep = getRepository();
- 		var project = param("Library");
- 		var temp = project.split(":");
- 		project = temp[0];
--		var pdir = rep + Data.safe(project);
--		if( !FileSystem.exists(pdir) )
--			throw "Library "+project+" is not installed";
--		pdir += "/";
--		var version = temp[1] != null ? temp[1] : getCurrent(pdir);
--		var dev = try getDev(pdir) catch ( e : Dynamic ) null;
--		var vdir = dev != null ? dev : pdir + Data.safe(version);
-
- 		args.push(cli.cwd);
-+
-+		var vdir = this.getNixLib(project);
-+		if (vdir == null) {
-+			var rep = getRepository();
-+			var pdir = rep + Data.safe(project);
-+			if( !FileSystem.exists(pdir) )
-+				throw "Library "+project+" is not installed";
-+			pdir += "/";
-+			var version = temp[1] != null ? temp[1] : getCurrent(pdir);
-+			var dev = try getDev(pdir) catch ( e : Dynamic ) null;
-+			vdir = dev!=null ? dev : pdir + Data.safe(version);
-+			var rdir = vdir + "/run.n";
-+			if( !FileSystem.exists(rdir) )
-+				throw "Library "+project+" version "+version+" does not have a run script";
-+		}
- 		cli.cwd = vdir;
--
- 		var callArgs =
- 			switch try [Data.readData(File.getContent(vdir + '/haxelib.json'), false), null] catch (e:Dynamic) [null, e] {
- 				case [null, e]:

From 4a89ab35eef00098a7edc1c0ffa990929e14ba57 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 7 May 2017 14:00:23 +0300
Subject: [PATCH 006/206] pythonPackages.cram: init at 0.7

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

diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix
new file mode 100644
index 00000000000..3ba861f1c87
--- /dev/null
+++ b/pkgs/development/python-modules/cram/default.nix
@@ -0,0 +1,38 @@
+{lib, buildPythonPackage, fetchPypi, coverage, bash, which, writeText}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  version = "0.7";
+  pname = "cram";
+
+  buildInputs = [ coverage which ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bvz6fwdi55rkrz3f50zsy35gvvwhlppki2yml5bj5ffy9d499vx";
+  };
+
+  postPatch = ''
+    substituteInPlace tests/test.t \
+      --replace "/bin/bash" "${bash}/bin/bash"
+  '';
+
+  # This testing is copied from Makefile. Simply using `make test` doesn't work
+  # because it uses the unpatched `scripts/cram` executable which has a bad
+  # shebang. Also, for some reason, coverage fails on one file so let's just
+  # ignore that one.
+  checkPhase = ''
+    # scripts/cram tests
+    #COVERAGE=${coverage}/bin/coverage $out/bin/cram tests
+    #${coverage}/bin/coverage report --fail-under=100
+    COVERAGE=coverage $out/bin/cram tests
+    coverage report --fail-under=100 --omit="*/_encoding.py"
+  '';
+
+  meta = {
+    description = "A simple testing framework for command line applications";
+    homepage = https://bitheap.org/cram/;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4ebc4f77f1e..e68a9f1cc8d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2433,6 +2433,8 @@ in {
     doCheck = false; # lazy packager
   };
 
+  cram = callPackage ../development/python-modules/cram { };
+
   csscompressor = callPackage ../development/python-modules/csscompressor.nix {};
 
   csvkit =  callPackage ../development/python-modules/csvkit { };

From f303480f1f8d9febc0d1bba16f28fa34580805d2 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 7 May 2017 14:04:55 +0300
Subject: [PATCH 007/206] pythonPackages.pytest-cram: init at 0.1.1

---
 .../python-modules/pytest-cram/default.nix    | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 10 +++---
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytest-cram/default.nix

diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix
new file mode 100644
index 00000000000..fdd2b2316e2
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-cram/default.nix
@@ -0,0 +1,34 @@
+{lib, buildPythonPackage, fetchPypi, pytest, cram, bash, writeText}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  version = "0.1.1";
+  pname = "pytest-cram";
+
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ cram ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ad05999iqzyjay9y5lc0cnd3jv8qxqlzsvxzp76shslmhrv0c4f";
+  };
+
+  postPatch = ''
+    substituteInPlace pytest_cram/tests/test_options.py \
+      --replace "/bin/bash" "${bash}/bin/bash"
+  '';
+
+  # Remove __init__.py from tests folder, otherwise pytest raises an error that
+  # the imported and collected modules are different.
+  checkPhase = ''
+    rm pytest_cram/tests/__init__.py
+    pytest pytest_cram
+  '';
+
+  meta = {
+    description = "Test command-line applications with pytest and cram";
+    homepage = https://github.com/tbekolay/pytest-cram;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e68a9f1cc8d..98ff1f587dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -677,15 +677,15 @@ in {
   aniso8601 = buildPythonPackage rec {
     name = "aniso8601-${version}";
     version = "1.2.0";
- 
+
     meta = {
       description = "Parses ISO 8601 strings.";
       homepage    = "https://bitbucket.org/nielsenb/aniso8601";
       license     = licenses.bsd3;
     };
- 
+
     propagatedBuildInputs = with self; [ dateutil ];
- 
+
     src = pkgs.fetchurl {
       url = "mirror://pypi/a/aniso8601/${name}.tar.gz";
       sha256 = "502400f82574afa804cc915d83f15c67533d364dcd594f8a6b9d2053f3404dd4";
@@ -5078,6 +5078,8 @@ in {
     };
   };
 
+  pytest-cram = callPackage ../development/python-modules/pytest-cram { };
+
   pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { };
 
   pytest-django = callPackage ../development/python-modules/pytest-django { };
@@ -22195,7 +22197,7 @@ in {
       homepage = "https://github.com/goinnn/django-multiselectfield";
     };
   };
-  
+
   reviewboard = buildPythonPackage rec {
     name = "ReviewBoard-2.5.1.1";
 

From 1745b7e949d563f01f9bb92ac872374ec7ca3a70 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 7 May 2017 17:54:36 +0300
Subject: [PATCH 008/206] nbstripout: init at 0.3.0

---
 .../version-management/nbstripout/default.nix | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/version-management/nbstripout/default.nix

diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
new file mode 100644
index 00000000000..3029d17e170
--- /dev/null
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -0,0 +1,32 @@
+{lib, python2Packages, git, mercurial}:
+
+with python2Packages;
+buildPythonApplication rec {
+  name = "${pname}-${version}";
+  version = "0.3.0";
+  pname = "nbstripout";
+
+  # Mercurial should be added as a build input but because it's a Python
+  # application, it would mess up the Python environment. Thus, don't add it
+  # here, instead add it to PATH when running unit tests
+  buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ];
+  propagatedBuildInputs = [ ipython nbformat ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "126xhjma4a0k7gq58hbqglhb3rai0a576azz7g8gmqjr3kl0264v";
+  };
+
+  # ignore flake8 tests for the nix wrapped setup.py
+  checkPhase = ''
+    PATH=$PATH:$out/bin:${mercurial}/bin pytest --ignore=nix_run_setup.py .
+  '';
+
+  meta = {
+    inherit version;
+    description = "Strip output from Jupyter and IPython notebooks";
+    homepage = https://github.com/kynan/nbstripout;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ccfed6d8d7..4507010d7e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11382,7 +11382,7 @@ with pkgs;
   b43Firmware_6_30_163_46 = callPackage ../os-specific/linux/firmware/b43-firmware/6.30.163.46.nix { };
 
   b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { };
-  
+
   bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { };
 
   broadcom-bt-firmware = callPackage ../os-specific/linux/firmware/broadcom-bt-firmware { };
@@ -14851,6 +14851,8 @@ with pkgs;
 
   clerk = callPackage ../applications/audio/clerk { };
 
+  nbstripout = callPackage ../applications/version-management/nbstripout { };
+
   ncmpc = callPackage ../applications/audio/ncmpc { };
 
   ncmpcpp = callPackage ../applications/audio/ncmpcpp { };

From 9d1db321feecd7eee73a73f17a1dc187fac52a71 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 7 May 2017 13:55:56 +0200
Subject: [PATCH 009/206] services.xserver.xautolock: add module

---
 nixos/modules/module-list.nix            |  1 +
 nixos/modules/services/x11/xautolock.nix | 72 ++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 nixos/modules/services/x11/xautolock.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9e1166af094..0158f51d100 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -610,6 +610,7 @@
   ./services/x11/window-managers/windowlab.nix
   ./services/x11/window-managers/wmii.nix
   ./services/x11/window-managers/xmonad.nix
+  ./services/x11/xautolock.nix
   ./services/x11/xbanish.nix
   ./services/x11/xfs.nix
   ./services/x11/xserver.nix
diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix
new file mode 100644
index 00000000000..60ce9e6ed5c
--- /dev/null
+++ b/nixos/modules/services/x11/xautolock.nix
@@ -0,0 +1,72 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.xautolock;
+in
+  {
+    options = {
+      services.xserver.xautolock = {
+        enable = mkEnableOption "xautolock";
+        enableNotifier = mkEnableOption "xautolock.notify" // {
+          description = ''
+            Whether to enable the notifier feature of xautolock.
+            This publishes a notification before the autolock.
+          '';
+        };
+
+        time = mkOption {
+          default = 15;
+          type = types.int;
+
+          description = ''
+            Idle time to wait until xautolock locks the computer.
+          '';
+        };
+
+        locker = mkOption {
+          default = "xlock"; # default according to `man xautolock`
+          example = "i3lock -i /path/to/img";
+          type = types.string;
+
+          description = ''
+            The script to use when locking the computer.
+          '';
+        };
+
+        notify = mkOption {
+          default = 10;
+          type = types.int;
+
+          description = ''
+            Time (in seconds) before the actual lock when the notification about the pending lock should be published.
+          '';
+        };
+
+        notifier = mkOption {
+          default = "notify-send 'Locking in 10 seconds'";
+          type = types.string;
+
+          description = ''
+            Notification script to be used to warn about the pending autolock.
+          '';
+        };
+      };
+    };
+
+    config = mkIf cfg.enable {
+      environment.systemPackages = with pkgs; [ xautolock ];
+
+      services.xserver.displayManager.sessionCommands = with builtins; with pkgs; ''
+        ${xautolock}/bin/xautolock \
+          ${concatStringsSep " \\\n" ([
+            "-time ${toString(cfg.time)}"
+            "-locker ${cfg.locker}"
+          ] ++ optional cfg.enableNotifier (concatStringsSep " " [ 
+            "-notify ${toString(cfg.notify)}"
+            "-notifier \"${cfg.notifier}\""
+          ]))} &
+      '';
+    };
+  }

From 6e50243d989475bc642963cccc70e0d4cf45cc8c Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 9 May 2017 16:58:39 +0200
Subject: [PATCH 010/206] wireguard: preshared-key is now an attribute of the
 peer

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 .../modules/services/networking/wireguard.nix | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 368d89e2e32..62ff708d244 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -27,18 +27,6 @@ let
         description = "Base64 private key generated by wg genkey.";
       };
 
-      presharedKey = mkOption {
-        default = null;
-        example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I=";
-        type = with types; nullOr str;
-        description = ''
-          base64 preshared key generated by wg genpsk. Optional,
-          and may be omitted. This option adds an additional layer of
-          symmetric-key cryptography to be mixed into the already existing
-          public-key  cryptography, for post-quantum resistance.
-        '';
-      };
-
       listenPort = mkOption {
         default = null;
         type = with types; nullOr int;
@@ -98,6 +86,18 @@ let
         description = "The base64 public key the peer.";
       };
 
+      presharedKey = mkOption {
+        default = null;
+        example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I=";
+        type = with types; nullOr str;
+        description = ''
+          base64 preshared key generated by wg genpsk. Optional,
+          and may be omitted. This option adds an additional layer of
+          symmetric-key cryptography to be mixed into the already existing
+          public-key cryptography, for post-quantum resistance.
+        '';
+      };
+
       allowedIPs = mkOption {
         example = [ "10.192.122.3/32" "10.192.124.1/24" ];
         type = with types; listOf str;
@@ -137,12 +137,12 @@ let
   generateConf = name: values: pkgs.writeText "wireguard-${name}.conf" ''
     [Interface]
     PrivateKey = ${values.privateKey}
-    ${optionalString (values.presharedKey != null) "PresharedKey = ${values.presharedKey}"}
     ${optionalString (values.listenPort != null)   "ListenPort = ${toString values.listenPort}"}
 
     ${concatStringsSep "\n\n" (map (peer: ''
     [Peer]
     PublicKey = ${peer.publicKey}
+    ${optionalString (peer.presharedKey != null) "PresharedKey = ${peer.presharedKey}"}
     ${optionalString (peer.allowedIPs != []) "AllowedIPs = ${concatStringsSep ", " peer.allowedIPs}"}
     ${optionalString (peer.endpoint != null) "Endpoint = ${peer.endpoint}"}
     ${optionalString (peer.persistentKeepalive != null) "PersistentKeepalive = ${toString peer.persistentKeepalive}"}

From 976d811ad4ba0e1f3fb75be8c1c0779f8c9117f9 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 6 May 2017 21:20:25 +0300
Subject: [PATCH 011/206] pythonPackages.piexif: init at 1.0.12

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

diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix
new file mode 100644
index 00000000000..e21593993cd
--- /dev/null
+++ b/pkgs/development/python-modules/piexif/default.nix
@@ -0,0 +1,24 @@
+{lib, buildPythonPackage, fetchurl, pillow}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "piexif";
+  version = "1.0.12";
+
+  # pillow needed for unit tests
+  buildInputs = [ pillow ];
+
+  # No .tar.gz source available at PyPI, only .zip source, so need to use
+  # fetchurl because fetchPypi doesn't support .zip.
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.zip";
+    sha256 = "15dvdr7b5xxsbsq5k6kq8h0xnzrkqzc08dzlih48a21x27i02bii";
+  };
+
+  meta = {
+    description = "Simplify Exif manipulations with Python";
+    homepage = https://github.com/hMatoba/Piexif;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b6f8c4ffc8c..054a3cfb535 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18371,6 +18371,8 @@ in {
     };
   };
 
+  piexif = callPackage ../development/python-modules/piexif { };
+
   pip = buildPythonPackage rec {
     pname = "pip";
     version = "9.0.1";

From 26294f40c34188e088ca49eeee175b96e93b5ae7 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Sun, 7 May 2017 18:53:12 +0200
Subject: [PATCH 012/206] bcachefs-tools: init at a588eb0

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

diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
new file mode 100644
index 00000000000..75fb00f6fb7
--- /dev/null
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils, liburcu, zlib, libaio }:
+
+stdenv.mkDerivation rec {
+  name = "bcachefs-tools-${version}";
+  version = "git";
+
+  src = fetchgit {
+    url = "https://evilpiepirate.org/git/bcachefs-tools.git";
+    rev = "a588eb0d9e30dffa4b319a4715c1454ee1d911f1 ";
+    sha256 = "1xpiwp6n6jp3zc70i648xpp54cd5yay4si28czn350bxwljbwpsy";
+  };
+
+  buildInputs = [ pkgconfig attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ];
+
+  preConfigure = ''
+    substituteInPlace cmd_migrate.c --replace /usr/include/dirent.h ${stdenv.glibc.dev}/include/dirent.h
+  '';
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Tool for managing bcachefs filesystems";
+    homepage = "http://bcachefs.org/";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ davidak ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c6295ef5c5..6714de46503 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -518,6 +518,8 @@ with pkgs;
 
   autorevision = callPackage ../tools/misc/autorevision { };
 
+  bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };
+
   bonnie = callPackage ../tools/filesystems/bonnie { };
 
   djmount = callPackage ../tools/filesystems/djmount { };

From 549a9df9aa3e124da112a3f1fb54f357a5cf0eed Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Thu, 11 May 2017 00:01:20 +0200
Subject: [PATCH 013/206] kdevelop: Fix shell integration (issue 25559)

---
 pkgs/applications/editors/kdevelop5/kdevelop.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index facd1206a00..9191d7a6653 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
-, qtquickcontrols, qtwebkit, qttools
+, qtquickcontrols, qtwebkit, qttools, kde-cli-tools
 , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
 , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
 , threadweaver, kxmlgui, kwindowsystem, grantlee
@@ -36,7 +36,16 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapQtProgram "$out/bin/kdevelop"
-    wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin"
+    
+    # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
+    wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin:${kde-cli-tools}/bin"
+    
+    # Fix the (now wrapped) kdevelop! to find things in right places:
+    # - Make KDEV_BASEDIR point to bin directory of kdevplatform.
+    kdev_fixup_sed="s|^export KDEV_BASEDIR=.*$|export KDEV_BASEDIR=${kdevplatform}/bin|"
+    # - Fixup the one use where KDEV_BASEDIR is assumed to contain kdevelop.
+    kdev_fixup_sed+=";s|\\\$KDEV_BASEDIR/kdevelop|$out/bin/kdevelop|"
+    sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped"
   '';
 
   meta = with stdenv.lib; {

From 0dbf5b02b9fbfb34eb706da223dc5391a7ef0182 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Thu, 11 May 2017 12:08:25 -0400
Subject: [PATCH 014/206] fltk: 1.3.3 -> 1.3.4

This incidentally fixes the build on darwin.
---
 pkgs/development/libraries/fltk/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index 6f906d52502..a1e4bb8274e 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -6,21 +6,15 @@
 
 let inherit (composableDerivation) edf; in
 
-let version = "1.3.3"; in
+let version = "1.3.4"; in
 composableDerivation.composableDerivation {} {
   name = "fltk-${version}";
 
   src = fetchurl {
     url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
-    sha256 = "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq";
+    sha256 = "13y57pnayrkfzm8azdfvysm8b77ysac8zhhdsh8kxmb0x3203ay8";
   };
 
-  # http://www.fltk.org/str.php?L3156
-  postPatch = ''
-    substituteInPlace FL/x.H \
-      --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand'
-  '';
-
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
 
   nativeBuildInputs = [ pkgconfig ];

From 8aa756b64a8370f032e4d96c495d232930eebf73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= <michal.palka@chalmers.se>
Date: Fri, 12 May 2017 06:52:33 +0000
Subject: [PATCH 015/206] gitlab service: fix uploading artifacts from
 gitlab-runner

Add the binaries from gitlab-workhorse to the path of the
gitlab-workhorse service, as gitlab-zip-metadata is needed
by the service
---
 nixos/modules/services/misc/gitlab.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index ee881edb5ab..0ed5a539e7d 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -440,6 +440,7 @@ in {
       path = with pkgs; [
         gitAndTools.git
         openssh
+        gitlab-workhorse
       ];
       preStart = ''
         mkdir -p /run/gitlab

From a6bcf148d778a89df4f9f8a661c7bfa7c2ff6409 Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Fri, 12 May 2017 09:44:30 -0400
Subject: [PATCH 016/206] buildbot: 0.9.6 -> 0.9.7

---
 .../tools/build-managers/buildbot/default.nix  | 18 +++---------------
 .../tools/build-managers/buildbot/plugins.nix  | 16 ++++++++--------
 .../tools/build-managers/buildbot/worker.nix   |  4 ++--
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index a4fb9a8b8bf..64ab960c88b 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -13,11 +13,11 @@ let
   package = pythonPackages.buildPythonApplication (rec {
     name = "${pname}-${version}";
     pname = "buildbot";
-    version = "0.9.6";
+    version = "0.9.7";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0d6ys1wjwsv4jg4bja1cqhy279hhrl1c9kwyx126srf45slcvg1w";
+      sha256 = "0cwy39ap2v9kni3zm92633cnqf7qsnb4zlargx060pbfagkg1jwg";
     };
 
     buildInputs = with pythonPackages; [
@@ -70,25 +70,13 @@ let
     ];
 
     patches = [
-      # This patch disables the test that tries to reat /etc/os-release which
+      # This patch disables the test that tries to read /etc/os-release which
       # is not accessible in sandboxed builds.
       ./skip_test_linux_distro.patch
     ];
 
     postPatch = ''
       substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
-
-      # NOTE: secrets management tests currently broken
-      rm -fv buildbot/test/integration/test_integration_secrets.py
-      rm -fv buildbot/test/integration/test_integration_secrets_with_vault.py
-      rm -fv buildbot/test/unit/test_fake_secrets_manager.py
-      rm -fv buildbot/test/unit/test_interpolate_secrets.py
-      rm -fv buildbot/test/unit/test_secret_in_file.py
-      rm -fv buildbot/test/unit/test_secret_in_vault.py
-
-      # Remove this line after next update. See
-      # https://github.com/buildbot/buildbot/commit/e7fc8c8eba903c2aa6d7e6393499e5b9bffc2334
-      rm -fv buildbot/test/unit/test_mq_wamp.py
     '';
 
     passthru = { inherit withPlugins; };
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index 77e97ed7ac3..3c15e256a3f 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -4,11 +4,11 @@ let
   buildbot-pkg = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-pkg";
-    version = "0.9.5";
+    version = "0.9.7";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1xpi4w0lc6z97pmmms85dvdspacbzlvs8zi3kv1r4rypk3znwmi1";
+      sha256 = "0p351r10y42gwgxb2qg7xlsbhmnzdmqp6h4922l0yfii3pzmrdzv";
     };
 
     propagatedBuildInputs = with pythonPackages; [ setuptools ];
@@ -25,14 +25,14 @@ in {
   www = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot_www";
-    version = "0.9.5";
+    version = "0.9.7";
 
     # NOTE: wheel is used due to buildbot circular dependency
     format = "wheel";
 
     src = pythonPackages.fetchPypi {
       inherit pname version format;
-      sha256 = "1d7yjxka6slflm3wbdpq4sr1kagmgbqdv2zgx9bq77jvjh7ga0py";
+      sha256 = "1wf2spnilm0dkyw95vf57lca453sbly4r6ak3lxa8bpwhxb6lkdn";
     };
 
     meta = with stdenv.lib; {
@@ -46,11 +46,11 @@ in {
   console-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-console-view";
-    version = "0.9.5";
+    version = "0.9.7";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1s6mvw955dsgk7hvb1xa32bbd7w2yma62py5s0vmi5shv8nwq3hb";
+      sha256 = "1iv77886rbbn0wlzl5qiqc08rgbymxirqh3vmimqwsabbh7fhzkm";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -66,11 +66,11 @@ in {
   waterfall-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-waterfall-view";
-    version = "0.9.5";
+    version = "0.9.7";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "116846d987wp1bz78f0h4lypqcns5073vzhb4vsqbf08sppgr67k";
+      sha256 = "1q42l25cryx0yp6lbbl0mxnxkb9h24wawhzhi1wkc3kj8zs5sifn";
     };
 
     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 145221c6353..28fb719d84a 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 = "0.9.5";
+  version = "0.9.7";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "1al7jam351sf781axj4kfhj70cc0g21zv81ynk410kdccjyxp2dy";
+    sha256 = "0s62i808l13a8dprmrb2dikh7d1xvvdnw3pfhl6im0i9fc64w6x4";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];

From f46b3a038f6ab448ee65a255076d0dc181824c35 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 11 May 2017 20:31:06 +0200
Subject: [PATCH 017/206] users-groups module: add per-user packages

---
 nixos/modules/config/users-groups.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 57e4940378b..0e7ffbd3c2e 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -244,6 +244,17 @@ let
         '';
       };
 
+      packages = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        example = literalExample "[ pkgs.firefox pkgs.thunderbird ]";
+        description = ''
+          The set of packages that should be made availabe to the user.
+          This is in contrast to <option>environment.systemPackages</option>,
+          which adds packages to all users.
+        '';
+      };
+
     };
 
     config = mkMerge
@@ -568,5 +579,17 @@ in {
   imports =
     [ (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
       (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])
+      {
+        environment = {
+          etc = mapAttrs' (name: { packages, ... }: {
+            name = "per-user-pkgs/${name}";
+            value.source = pkgs.symlinkJoin {
+              name = "per-user-pkgs.${name}";
+              paths = packages;
+            };
+          }) (filterAttrs (_: { packages, ... }: packages != []) cfg.users);
+          profiles = ["/etc/per-user-pkgs/$LOGNAME"];
+        };
+      }
     ];
 }

From f97180c012d822f06bf3907efaafea4119f756ce Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Sat, 13 May 2017 00:11:48 +0200
Subject: [PATCH 018/206] pythonPackages.rfc3986: 0.2.2 -> 0.4.1

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

diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix
new file mode 100644
index 00000000000..dde36e7592e
--- /dev/null
+++ b/pkgs/development/python-modules/rfc3986/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi,
+  pytest }:
+
+buildPythonPackage rec {
+  pname = "rfc3986";
+  version = "0.4.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5ac85eb132fae7bbd811fa48d11984ae3104be30d44d397a351d004c633a68d2";
+  };
+
+  buildInputs = [ pytest ];
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://rfc3986.readthedocs.org";
+    license = licenses.asl20;
+    description = "Validating URI References per RFC 3986";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 07bb85632cc..1b198084af7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16442,23 +16442,7 @@ in {
     buildInputs = with self; [ oslotest mock coverage simplejson oslo-i18n ];
   };
 
-  rfc3986 = buildPythonPackage rec {
-    name = "rfc3986-${version}";
-    version = "0.2.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/rfc3986/rfc3986-0.2.2.tar.gz";
-      sha256 = "0yvzz7gp84qqdadbjdh9ch7dz4w19nmhwa704s9m11bljgp3hqmn";
-    };
-
-    LC_ALL = "en_US.UTF-8";
-    buildInputs = [ pkgs.glibcLocales ];
-
-    meta = with stdenv.lib; {
-      description = "rfc3986";
-      homepage = https://rfc3986.rtfd.org;
-    };
-  };
+  rfc3986 = callPackage ../development/python-modules/rfc3986 { };
 
   pycadf = buildPythonPackage rec {
     name = "pycadf-${version}";

From f016fa3ce3adb9d057c3eac44d625de60e12bbdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 13 May 2017 07:20:27 +0100
Subject: [PATCH 019/206] iana-etc: 20170417 -> 20170512

---
 pkgs/data/misc/iana-etc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index ed70de517ab..842b031c6be 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "iana-etc-${version}";
-  version = "20170417";
+  version = "20170512";
 
   src = fetchurl {
     url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
-    sha256 = "0gzv8ldyf3g70m4k3m50p2gbqwvxa343v2q4xcnl1jqfgw9db5wf";
+    sha256 = "0zx2ag894qldvrv8f4hs84644kdcp8a83gjg33xsw8rrn38gll2a";
   };
 
   installPhase = ''

From 9237fdd1d0599d2618db24df3b52ddb7b465d5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 13 May 2017 09:38:19 +0100
Subject: [PATCH 020/206] openbrf: fix build

---
 pkgs/applications/misc/openbrf/default.nix | 24 ++++++++++++++++------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index 36218b6d507..50c8fc7bcec 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchFromGitHub, qt4, qmake4Hook, vcg, glew }:
+{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmakeHook, makeQtWrapper, mesa }:
+
 
 stdenv.mkDerivation {
-  name = "openbrf-2016-01-09";
+  name = "openbrf-unstable-2016-01-09";
 
   src = fetchFromGitHub {
     owner = "cfcohen";
     repo = "openbrf";
-    rev = "c18d7431e1d499cee11586f4a035fb5fdc0d3330";
-    sha256 = "0laikpz0ljz7l5fgapwj09ygizmvj1iywnpfgfd0i14j46s134xb";
+    rev = "4bdc66e38def5e5184f5379c84a7558b7484c70a";
+    sha256 = "16254cnr60ihcn7bki7wl1qm6gkvzb99cn66md1pnb7za8nvzf4j";
   };
 
-  buildInputs = [ qt4 qmake4Hook vcg glew ];
+  buildInputs = [ qtbase vcg glew ];
+  nativeBuildInputs = [ qmakeHook makeQtWrapper ];
 
   enableParallelBuilding = true;
 
@@ -21,9 +23,19 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    install -Dm755 openBrf $out/bin/openBrf
+    install -Dm755 openBrf $out/share/openBrf/openBrf
+    install -Dm644 carry_positions.txt $out/share/openBrf/carry_positions.txt
+    install -Dm644 reference.brf $out/share/openBrf/reference.brf
+
+    patchelf  \
+      --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc mesa ]}" \
+      $out/share/openBrf/openBrf
+
+    makeQtWrapper "$out/share/openBrf/openBrf" "$out/bin/openBrf"
   '';
 
+  dontPatchELF = true;
+
   meta = with stdenv.lib; {
     description = "A tool to edit resource files (BRF)";
     homepage = "https://github.com/cfcohen/openbrf";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c508f7f6ef2..c5177932fda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15134,7 +15134,7 @@ with pkgs;
 
   openbox-menu = callPackage ../applications/misc/openbox-menu { };
 
-  openbrf = callPackage ../applications/misc/openbrf { };
+  openbrf = libsForQt5.callPackage ../applications/misc/openbrf { };
 
   opencpn = callPackage ../applications/misc/opencpn { };
 

From 867e7f4dcfc4b649cc02bf70af795593a3b91a56 Mon Sep 17 00:00:00 2001
From: George Whewell <georgerw@gmail.com>
Date: Fri, 12 May 2017 16:09:12 +0100
Subject: [PATCH 021/206] fix dosfstools build on darwin

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

diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index d6a4e83a533..2eeb2003a19 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "dosfstools-${version}";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1a2zn1655d5f1m6jp9vpn3bp8yfxhcmxx3mx23ai9hmxiydiykr1";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ]
+    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
 
   configureFlags = [ "--enable-compat-symlinks" ];
 
@@ -19,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "Utilities for creating and checking FAT and VFAT file systems";
     repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git;
     homepage = http://www.daniel-baumann.ch/software/dosfstools/;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }

From d88faa261dfaaad0183c96337ee6de9c1be8e624 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Sat, 13 May 2017 10:55:59 +0200
Subject: [PATCH 022/206] weechat: 1.7.1 -> 1.8

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

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 00d1c8d9bc9..17816e6a735 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -21,12 +21,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "1.7.1";
+  version = "1.8";
   name = "weechat-${version}";
 
   src = fetchurl {
     url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
-    sha256 = "1020m1lsm8lg9n0dlxgp2wbn9b0r11g8r0namnzi2x6gvxn7iyf0";
+    sha256 = "10km0437lg9ms6f16h20s89l2w9f9g597rykybxb16s95ql48z08";
   };
 
   outputs = [ "out" "doc" ];

From a06781877fc7f91016e20c313a2630bf3e5e791f Mon Sep 17 00:00:00 2001
From: georgewhewell <georgerw@gmail.com>
Date: Sat, 1 Apr 2017 18:38:40 +0100
Subject: [PATCH 023/206] fwup: init at 0.14.2

---
 lib/maintainers.nix                           |  1 +
 pkgs/tools/misc/fwup/default.nix              | 36 +++++++++++++++++++
 .../misc/fwup/fix-testrunner-darwin.patch     | 25 +++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 64 insertions(+)
 create mode 100644 pkgs/tools/misc/fwup/default.nix
 create mode 100644 pkgs/tools/misc/fwup/fix-testrunner-darwin.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e31a193a77b..b264938ea17 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -196,6 +196,7 @@
   garrison = "Jim Garrison <jim@garrison.cc>";
   gavin = "Gavin Rogers <gavin@praxeology.co.uk>";
   gebner = "Gabriel Ebner <gebner@gebner.org>";
+  georgewhewell = "George Whewell <georgerw@gmail.com>";
   gilligan = "Tobias Pflug <tobias.pflug@gmail.com>";
   giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
   gleber = "Gleb Peregud <gleber.p@gmail.com>";
diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
new file mode 100644
index 00000000000..5d2b96d3261
--- /dev/null
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig
+, zlib, lzma, bzip2, mtools, dosfstools, zip, unzip, libconfuse, libsodium
+, libarchive, darwin, coreutils }:
+
+stdenv.mkDerivation rec {
+  name = "fwup-${version}";
+  version = "0.14.2";
+
+  src = fetchFromGitHub {
+    owner = "fhunleth";
+    repo = "fwup";
+    rev = "v${version}";
+    sha256 = "0ddyiprq4qnqpdhh48bivl8c5yrh21p4r99qs0d1rjiwx5h9p21l";
+  };
+
+  doCheck = true;
+  patches = lib.optional stdenv.isDarwin [ ./fix-testrunner-darwin.patch ];
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ];
+  buildInputs = [ zlib lzma bzip2 libconfuse libsodium libarchive ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.DiskArbitration
+    ];
+  propagatedBuildInputs = [ zip unzip mtools dosfstools coreutils ];
+
+  # segfaults on darwin without
+  NIX_LDFLAGS = lib.optional stdenv.isDarwin "-F/System/Library/Frameworks";
+
+  meta = with stdenv.lib; {
+    description = "Configurable embedded Linux firmware update creator and runner";
+    homepage = https://github.com/fhunleth/fwup;
+    license = licenses.asl20;
+    maintainers = [ maintainers.georgewhewell ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch b/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch
new file mode 100644
index 00000000000..b04b436ff5b
--- /dev/null
+++ b/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch
@@ -0,0 +1,25 @@
+diff --git a/tests/common-orig.sh b/tests/common.sh
+index 1f2673f..79dcf74 100755
+--- a/tests/common-orig.sh
++++ b/tests/common.sh
+@@ -21,20 +21,6 @@ else
+ fi
+ 
+ case "$HOST_OS" in
+-    Darwin)
+-	# BSD stat
+-        STAT_FILESIZE_FLAGS="-f %z"
+-
+-	# Not -d?
+-        BASE64_DECODE=-D
+-
+-        READLINK=/usr/local/bin/greadlink
+-        [ -e $READLINK ] || ( echo "Please run 'brew install coreutils' to install greadlink"; exit 1 )
+-        [ -e /usr/local/bin/mdir ] || ( echo "Please run 'brew install mtools' to install mdir"; exit 1 )
+-
+-        FSCK_FAT=fsck_msdos
+-        TIMEOUT=gtimeout
+-        ;;
+     FreeBSD|NetBSD|OpenBSD|DragonFly)
+ 	# BSD stat
+         STAT_FILESIZE_FLAGS="-f %z"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5177932fda..fad4b903687 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -952,6 +952,8 @@ with pkgs;
 
   fsmark = callPackage ../tools/misc/fsmark { };
 
+  fwup = callPackage ../tools/misc/fwup { };
+
   fzf = callPackage ../tools/misc/fzf { };
 
   fzy = callPackage ../tools/misc/fzy { };

From cb245f228ff921d05c0df337ae5758cace83fe0b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 14 May 2017 02:36:04 +0300
Subject: [PATCH 024/206] stepmania: 5.0.10 -> 5.0.12

---
 pkgs/games/stepmania/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 9ba78c0ab14..cd59f96037f 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -1,24 +1,24 @@
 { stdenv, lib, fetchpatch, fetchFromGitHub, cmake, nasm
 , gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis
-, glew, libpulseaudio
+, glew, libpulseaudio, udev
 }:
 
 stdenv.mkDerivation rec {
   name = "stepmania-${version}";
-  version = "5.0.10";
+  version = "5.0.12";
 
   src = fetchFromGitHub {
     owner = "stepmania";
     repo  = "stepmania";
     rev   = "v${version}";
-    sha256 = "174gzvk42gwm56hpkz51csad9xi4dg466xv0mf1z39xd7mqd5j5w";
+    sha256 = "0ig5pnw78j45b35kfr76phaqbac9b2f6wg3c63l6mf0nrq17wslz";
   };
 
   nativeBuildInputs = [ cmake nasm ];
 
   buildInputs = [
     gtk2 glib ffmpeg alsaLib libmad libogg libvorbis
-    glew libpulseaudio
+    glew libpulseaudio udev
   ];
 
   cmakeFlags = [
@@ -27,14 +27,6 @@ stdenv.mkDerivation rec {
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
   ];
 
-  patches = [
-    # Fix compilation on i686
-    (fetchpatch {
-      url = "https://github.com/stepmania/stepmania/commit/f1e114aa03c90884946427bb43a75badec21f163.patch";
-      sha256 = "1cm14w92dilqvlyqfffiihf09ra97hxzgfal5gx08brc3j1yyzdw";
-    })
-  ];
-
   postInstall = ''
     mkdir -p $out/bin
     ln -s $out/stepmania-5.0/stepmania $out/bin/stepmania

From e1805301afe3bad6df3b139db429b4d1c4f59314 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 14 May 2017 04:14:32 +0300
Subject: [PATCH 025/206] afl: 2.35b -> 2.41b

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

diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index d07396319d8..252be087675 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "2.35b";
+  version = "2.41b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "1smwc3j0mrpnhqq7li2ry42fxcmq3q2kl568dpq9r9npg996fqar";
+    sha256 = "13wnjk0rklcjglj7dmpahv67vig9azifxgnggj56hki66lrb2w06";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup

From 68f335c6cdf0b73db00fb941e798ea568a443d7a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 14 May 2017 11:21:47 +0800
Subject: [PATCH 026/206] virtmanager-qt: 0.42.67 -> 0.43.70

---
 pkgs/applications/virtualization/virt-manager/qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index 1952102e71a..25a70ee9bce 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "virt-manager-qt-${version}";
-  version = "0.42.67";
+  version = "0.43.70";
 
   src = fetchFromGitHub {
     owner  = "F1ash";
     repo   = "qt-virt-manager";
     rev    = "${version}";
-    sha256 = "0hskaffc84wf8h9qck5xg840jw8x2krfy6cw4hqnq946z9lbyanr";
+    sha256 = "0d8g0pg15cyi450qgkgi7fh83wkxcqfpphgsh5q10r6jjl87166x";
   };
 
   cmakeFlags = [

From f33ca4edc6884e2625db00debc338d2e4b0ce02e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 13 May 2017 23:45:02 -0500
Subject: [PATCH 027/206] xapian: fixup darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The configure script is detecting that __exp10 is available even
though it isn’t on latest versions. This is the best fix I can find
for now.
---
 pkgs/development/libraries/xapian/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 145ebdec8e5..764200c89f5 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -18,6 +18,13 @@ let
 
     doCheck = true;
 
+    # the configure script thinks that Darwin has ___exp10
+    # but it’s not available on my systems (or hydra apparently)
+    postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace config.h \
+        --replace "#define HAVE___EXP10 1" "#undef HAVE___EXP10"
+    '';
+
     meta = with stdenv.lib; {
       description = "Search engine library";
       homepage = http://xapian.org/;

From 4b06293597c64097e588571ee37cfd8be4f647bb Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sun, 14 May 2017 02:15:30 -0500
Subject: [PATCH 028/206] checkbashisms: simplify and set platforms to unix
 (#25773)

- adds version to name
- also adds "unix" as platform (anything with perl should work)
---
 .../tools/misc/checkbashisms/default.nix      | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix
index b00b9cc9910..563d7693088 100644
--- a/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -1,33 +1,26 @@
 { stdenv, fetchurl, perl }:
 stdenv.mkDerivation rec {
-  inherit perl;
-
-  name = "checkbashisms";
   version = "2.0.0.2";
+  name = "checkbashisms-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/checkbaskisms/${version}/${name}";
+    url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms";
     sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd";
   };
 
+  buildInputs = [ perl ];
+
   # The link returns directly the script. No need for unpacking
   unpackPhase = "true";
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp $src $out/bin/checkbashisms
-    chmod 755 $out/bin/checkbashisms
-  '';
-
-  # Makes sure to point to the proper perl version
-  fixupPhase = ''
-    sed -e "s#/usr/bin/perl#$perl/bin/perl#" -i $out/bin/checkbashisms
+    install -D -m755 $src $out/bin/checkbashisms
   '';
 
   meta = {
     homepage = http://sourceforge.net/projects/checkbaskisms/;
     description = "Check shell scripts for non-portable syntax";
     license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 34de62409f6e698a4ebc149b524b316ebf9afb70 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 14 May 2017 15:33:32 +0800
Subject: [PATCH 029/206] qtox: 1.10.0 -> 1.10.1

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

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index ea12bc4bc8c..bb5e26f3310 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "qtox-${version}";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner  = "tux3";
     repo   = "qTox";
     rev    = "v${version}";
-    sha256 = "00pbb788147qxpzj3kfp6x6a9w2h8rmz0sdwfzzdjh1qyb43d4q0";
+    sha256 = "1c5y7fwhsq1f6z8208xl1jd6bl1r6k8g0fjqxf0z10373c9395jq";
   };
 
   buildInputs = [

From 096c00803656ad60a22b2750dde7c0a07c4ba8f6 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@mayflower.de>
Date: Sat, 13 May 2017 23:14:43 +0200
Subject: [PATCH 030/206] Fix #25723: Remove old GNU libstdc++ for qtbase

---
 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index e11d9dd1f29..88684d9a753 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
       AGL AppKit ApplicationServices Carbon Cocoa
       CoreAudio CoreBluetooth CoreLocation CoreServices
       DiskArbitration Foundation OpenGL
-      darwin.cf-private darwin.apple_sdk.sdk darwin.libobjc libiconv
+      darwin.cf-private darwin.libobjc libiconv
     ]);
 
   buildInputs = [ ]

From b5d2c81514f2c0542128a3c631d23057d0c71bad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 May 2017 11:39:08 +0200
Subject: [PATCH 031/206] Remove broken haskell-tools overrides.

These overrides no longer evaluate correctly and as a result break Nixpkgs
evaluation.

ping @shlevy
---
 .../haskell-modules/configuration-common.nix  | 32 +------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b54a5b72235..d277d5dbed4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -860,34 +860,4 @@ self: super: {
 
   # https://github.com/danidiaz/tailfile-hinotify/issues/2
   tailfile-hinotify = dontCheck super.tailfile-hinotify;
-} // (let scope' = self: super: {
-            haskell-tools-ast = super.haskell-tools-ast_0_6_0_0;
-            haskell-tools-backend-ghc = super.haskell-tools-backend-ghc_0_6_0_0;
-            haskell-tools-cli = super.haskell-tools-cli_0_6_0_0;
-            haskell-tools-daemon = super.haskell-tools-daemon_0_6_0_0;
-            haskell-tools-debug = super.haskell-tools-debug_0_6_0_0;
-            haskell-tools-demo = super.haskell-tools-demo_0_6_0_0;
-            haskell-tools-prettyprint = super.haskell-tools-prettyprint_0_6_0_0;
-            haskell-tools-refactor = super.haskell-tools-refactor_0_6_0_0;
-            haskell-tools-rewrite = super.haskell-tools-rewrite_0_6_0_0;
-          };
-      in {
-        haskell-tools-ast_0_6_0_0 =
-          super.haskell-tools-ast_0_6_0_0.overrideScope scope';
-        haskell-tools-backend-ghc_0_6_0_0 =
-          super.haskell-tools-backend-ghc_0_6_0_0.overrideScope scope';
-        haskell-tools-cli_0_6_0_0 =
-          dontCheck (super.haskell-tools-cli_0_6_0_0.overrideScope scope');
-        haskell-tools-daemon_0_6_0_0 =
-          dontCheck (super.haskell-tools-daemon_0_6_0_0.overrideScope scope');
-        haskell-tools-debug_0_6_0_0 =
-          super.haskell-tools-debug_0_6_0_0.overrideScope scope';
-        haskell-tools-demo_0_6_0_0 =
-          super.haskell-tools-demo_0_6_0_0.overrideScope scope';
-        haskell-tools-prettyprint_0_6_0_0 =
-          super.haskell-tools-prettyprint_0_6_0_0.overrideScope scope';
-        haskell-tools-refactor_0_6_0_0 =
-          super.haskell-tools-refactor_0_6_0_0.overrideScope scope';
-        haskell-tools-rewrite_0_6_0_0 =
-          super.haskell-tools-rewrite_0_6_0_0.overrideScope scope';
-     })
+}

From 5052ac8d2572cd5820bc3a136e74531b15789f19 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 May 2017 11:43:15 +0200
Subject: [PATCH 032/206] git-annex: fix hash for new version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d277d5dbed4..67fe4415787 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -66,7 +66,7 @@ self: super: {
     src = pkgs.fetchgit {
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "0irvzwpwxxdy6qs7jj81r6qk7i1gkkqyaza4wcm0phyyn07yh2sz";
+      sha256 = "0i08zxk68kbg6k0d9af97r9nr5vidsy63hx22fdp7c5jp64f967q";
     };
   }))).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From 5d6c76dd50344753c611b0e73d705695e5c6cfca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 May 2017 12:26:08 +0200
Subject: [PATCH 033/206] git-annex: make sure the test suite runs with
 git-annex-shell in $PATH

---
 pkgs/development/haskell-modules/hackage-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f7969b977a4..1ad74866c1d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -74123,9 +74123,13 @@ self: {
          bup curl git gnupg lsof openssh perl rsync wget which
        ];
        preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
-       postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
        installPhase = "make PREFIX=$out BUILDER=: install";
-       checkPhase = "./git-annex test";
+       checkPhase = ''
+         ln -sf dist/build/git-annex/git-annex git-annex
+         ln -sf git-annex git-annex-shell
+         export PATH+=":$PWD"
+         git-annex test
+       '';
        enableSharedExecutables = false;
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";

From d22b1d0ba14329853af18869447a78419f1e5a6d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 14 May 2017 13:46:21 +0300
Subject: [PATCH 034/206] hdparm: 9.51 -> 9.52

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

diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix
index ab40099fc2c..fa63cddfcdb 100644
--- a/pkgs/os-specific/linux/hdparm/default.nix
+++ b/pkgs/os-specific/linux/hdparm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hdparm-9.51";
+  name = "hdparm-9.52";
 
   src = fetchurl {
     url = "mirror://sourceforge/hdparm/${name}.tar.gz";
-    sha256 = "14ax5lyzhigx58ing7adbfyzisv0fqajbmzphg149rnb3s4xiyhs";
+    sha256 = "1djgxhfadd865dcrl6dp7dvjxpaisy7mk17mbdbglwg24ga9qhn3";
 
   };
 

From f2eb770e330e15ff7b4b80afefd355c0985f8e20 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 14 May 2017 15:17:37 +0300
Subject: [PATCH 035/206] ethtool: 4.6 -> 4.10

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

diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 363aaf3f389..eba2e82911b 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ethtool-${version}";
-  version = "4.6";
+  version = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "e90589a9349d008cce8c0510ac4e8878efdc0ddb1b732a9a4cc333b101313415";
+    sha256 = "1fklbjwr41cvd5b7d1qvpl3bqzc4aak732r3m2wjhhgkxhk9f07h";
   };
 
   meta = with stdenv.lib; {

From 640d434ddb4d6f197333e484ebaa606563fee056 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 14 May 2017 15:20:43 +0300
Subject: [PATCH 036/206] sshfs-fuse: 2.7 -> 2.9

---
 pkgs/tools/filesystems/sshfs-fuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 3a460241daa..dd49b19358c 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pkgconfig, glib, fuse, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "2.7";
+  version = "2.9";
   name = "sshfs-fuse-${version}";
   
   src = fetchFromGitHub {
     repo = "sshfs";
     owner = "libfuse";
     rev = "sshfs-${version}";
-    sha256 = "17l9b89zy5qzfcknw3krk74rfrqaa8q1r8jwdsahaqajsy09h4x4";
+    sha256 = "1n0cq72ps4dzsh72fgfprqn8vcfr7ilrkvhzpy5500wjg88diapv";
   };
   
   buildInputs = [ pkgconfig glib fuse autoreconfHook ];

From f7580a1f0659a0d44e3f9925bbbab82741ae1e8a Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Sat, 13 May 2017 20:34:38 +0200
Subject: [PATCH 037/206] samba: 4.5.3 -> 4.5.8

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

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 31867bee105..98e798dd1bd 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -19,11 +19,11 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "samba-${version}";
-  version = "4.5.3";
+  version = "4.5.8";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "1jif95684swssqwp9v3i2r08cn3r2iddf6ly68db4wmvl5ac8vgh";
+    sha256 = "1w41pxszv5z6gjclg6zymn47mk8n51lnpgcx1k2q18i3i1nnafzn";
   };
 
   outputs = [ "out" "dev" "man" ];

From e6c65ecb12c58cfa043d9cfa6db31b9920603588 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 12 May 2017 18:38:27 +0200
Subject: [PATCH 038/206] tree-wide: remove uses of features.grsecurity

---
 nixos/modules/config/sysctl.nix                   | 5 +----
 pkgs/development/libraries/accelio/default.nix    | 3 +--
 pkgs/os-specific/linux/batman-adv/default.nix     | 1 -
 pkgs/os-specific/linux/kernel-headers/default.nix | 2 --
 pkgs/os-specific/linux/lttng-modules/default.nix  | 1 -
 pkgs/os-specific/linux/rtl8723bs/default.nix      | 3 +--
 pkgs/os-specific/linux/rtl8812au/default.nix      | 1 -
 pkgs/servers/openafs-client/default.nix           | 3 +--
 8 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index a3f7e8f722f..2114fb2b9d4 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -60,10 +60,7 @@ in
 
     # Hide kernel pointers (e.g. in /proc/modules) for unprivileged
     # users as these make it easier to exploit kernel vulnerabilities.
-    #
-    # Removed under grsecurity.
-    boot.kernel.sysctl."kernel.kptr_restrict" =
-      if (config.boot.kernelPackages.kernel.features.grsecurity or false) then null else 1;
+    boot.kernel.sysctl."kernel.kptr_restrict" = 1;
 
     # Disable YAMA by default to allow easy debugging.
     boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0;
diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix
index 002b26078f5..a1f229ca5fb 100644
--- a/pkgs/development/libraries/accelio/default.nix
+++ b/pkgs/development/libraries/accelio/default.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ wkennington ];
     # kernel 4.2 is the most recent supported kernel
     broken = kernel != null &&
-      (builtins.compareVersions kernel.version "4.2" == 1 ||
-       (kernel.features.grsecurity or false));
+      (builtins.compareVersions kernel.version "4.2" == 1);
   };
 }
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 1449d85fc16..a48909685d7 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -26,6 +26,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
     platforms = with stdenv.lib.platforms; linux;
-    broken = (kernel.features.grsecurity or false);
   };
 }
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index da9f3009474..a33d24fc847 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -1,7 +1,5 @@
 { stdenv, kernel, perl }:
 
-assert (!(kernel.features.grsecurity or false));
-
 let
   baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ];
 in stdenv.mkDerivation {
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 3bb61227fe4..2f5b50b3b58 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.bjornfor ];
     broken =
       (builtins.compareVersions kernel.version "3.18" == -1) ||
-      (kernel.features.grsecurity or false) ||
       (kernel.features.chromiumos or false);
   };
 
diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix
index 05dd0f8ebb9..eb90ac30344 100644
--- a/pkgs/os-specific/linux/rtl8723bs/default.nix
+++ b/pkgs/os-specific/linux/rtl8723bs/default.nix
@@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/hadess/rtl8723bs";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
-    broken = (! versionAtLeast kernel.version "3.19")
-      || (kernel.features.grsecurity or false);
+    broken = (! versionAtLeast kernel.version "3.19");
     maintainers = with maintainers; [ elitak ];
   };
 }
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 6b1e93e59df..93c8e5b7ae4 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -31,6 +31,5 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Grawp/rtl8812au_rtl8821au";
     license = stdenv.lib.licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];
-    broken = (kernel.features.grsecurity or false);
   };
 }
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index 6383ce12bc1..fe7a34e0be8 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.z77z ];
     broken =
       (builtins.compareVersions kernel.version  "3.18" == -1) ||
-      (builtins.compareVersions kernel.version "4.4" != -1) ||
-      (kernel.features.grsecurity or false);
+      (builtins.compareVersions kernel.version "4.4" != -1);
   };
 }

From dea66a1cb3980e98d51f6d9244aab941793d9106 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 14 May 2017 14:40:11 +0200
Subject: [PATCH 039/206] sxiv: fix version string

name would end up as "sxiv-v".
---
 pkgs/applications/graphics/sxiv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index fe8911273de..e2d5357f814 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "sxiv-${version}";
-  version = "v1.3.2";
-  #https://github.com/muennich/sxiv/archive/v1.3.2.zip
+  version = "1.3.2";
+
   src = fetchFromGitHub {
     owner = "muennich";
     repo = "sxiv";
-    rev = version;
+    rev = "v${version}";
     sha256 = "1f4gz1qjhb44bbb3q5fqk439zyipkwnr19zhg89yq2pgmzzzqr2h";
   };
 

From 6e497974a623b60f6f81621479de912ba1f7127e Mon Sep 17 00:00:00 2001
From: Henri Bourcereau <henri.bourcereau@gmail.com>
Date: Sun, 14 May 2017 15:15:57 +0200
Subject: [PATCH 040/206] shaarli: 0.8.1 -> 0.8.4

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

diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 32eae53420a..26e3f92931b 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "shaarli-${version}";
-  version = "0.8.1";
+  version = "0.8.4";
 
   src = fetchurl {
     url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
-    sha256 = "17p8bmkgmlan6vbvh955idddckr5kyf00gp8apjfcnm4b2awma8x";
+    sha256 = "1p6yljl8v8p74n71az1h68nnsvffw2hkcfk9p2dldspi4k51vnb7";
   };
 
   outputs = [ "out" "doc" ];

From 2a6edacc4ee3379135a30d6cd6e7b3399db42af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 14 May 2017 17:10:06 +0200
Subject: [PATCH 041/206] firefox: disable content sandboxing - not ready yet

Details: https://github.com/NixOS/nixpkgs/issues/24295#issuecomment-300588575
---
 pkgs/applications/networking/browsers/firefox/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 8d8217e33a2..2244ee571b0 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -113,7 +113,7 @@ stdenv.mkDerivation (rec {
     "--enable-system-sqlite"
     #"--enable-system-cairo"
     "--enable-startup-notification"
-    "--enable-content-sandbox" # available since 26.0, but not much info available
+    #"--enable-content-sandbox" # TODO: probably enable after 54
     "--disable-tests"
     "--disable-necko-wifi" # maybe we want to enable this at some point
     "--disable-updater"

From c163b782bc839d58dbd6e9b25c1c8ff11b62e016 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 14 May 2017 02:47:06 -0400
Subject: [PATCH 042/206] openafs: 1.6.20 -> 1.6.20.2

---
 pkgs/servers/openafs-client/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index fe7a34e0be8..ebbd10e8fa2 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "openafs-${version}-${kernel.version}";
-  version = "1.6.20";
+  version = "1.6.20.2";
 
   src = fetchurl {
     url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
-    sha256 = "0qar94k9x9dkws4clrnlw789q1ha9qjk06356s86hh78qwywc1ki";
+    sha256 = "50234820c3da9752d2ca05fb7e83b7dc5c96a0e96a0b875ebc7ae3c835607614";
   };
 
   nativeBuildInputs = [ autoconf automake flex yacc perl which ];
@@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.z77z ];
     broken =
-      (builtins.compareVersions kernel.version  "3.18" == -1) ||
-      (builtins.compareVersions kernel.version "4.4" != -1);
+      (builtins.compareVersions kernel.version  "3.18" == -1);
   };
 }

From 8a68e4c7f6ae76f3a872142e452370fc300bb429 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 14 May 2017 21:05:50 +0300
Subject: [PATCH 043/206] pythonPackages.natsort: 5.0.1 -> 5.0.3

* pythonPackages.natsort: refactor config

* pythonPackages.natsort: 5.0.1 -> 5.0.3

* pythonPackages.natsort: fix broken
---
 .../python-modules/natsort/default.nix        | 54 +++++++++++++++++++
 .../python-modules/natsort/setup.patch        | 20 +++++++
 pkgs/top-level/python-packages.nix            | 29 +---------
 3 files changed, 75 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/python-modules/natsort/default.nix
 create mode 100644 pkgs/development/python-modules/natsort/setup.patch

diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
new file mode 100644
index 00000000000..79ec9f5bd89
--- /dev/null
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, hypothesis
+, pytestcache
+, pytestcov
+, pytestflakes
+, pytestpep8
+, pytest
+, glibcLocales
+, mock ? null
+, pathlib ? null
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "natsort";
+  version = "5.0.3";
+
+  buildInputs = [
+    hypothesis
+    pytestcache
+    pytestcov
+    pytestflakes
+    pytestpep8
+    pytest
+    glibcLocales
+  ]
+  # pathlib was made part of standard library in 3.5:
+  ++ (lib.optionals (pythonOlder "3.4") [ pathlib ])
+  # based on testing-requirements.txt:
+  ++ (lib.optionals (pythonOlder "3.3") [ mock ]);
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1h87n0jcsi6mgjx1pws6g1lmcn8jwabwxj8hq334jvziaq0plyym";
+  };
+
+  # do not run checks on nix_run_setup.py
+  patches = [ ./setup.patch ];
+
+  # testing based on project's tox.ini
+  checkPhase = ''
+    pytest --doctest-modules natsort
+    pytest --flakes --pep8 --cov natsort --cov-report term-missing
+  '';
+
+  meta = {
+    description = "Natural sorting for python";
+    homepage = https://github.com/SethMMorton/natsort;
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/natsort/setup.patch b/pkgs/development/python-modules/natsort/setup.patch
new file mode 100644
index 00000000000..4c52b740152
--- /dev/null
+++ b/pkgs/development/python-modules/natsort/setup.patch
@@ -0,0 +1,20 @@
+diff --git a/setup.cfg b/setup.cfg
+index 604994d..e38c3ec 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -6,6 +6,7 @@ formats = gztar
+ 
+ [tool:pytest]
+ flakes-ignore = 
++	nix_run_setup.py ALL
+ 	natsort/compat/py23.py UndefinedName
+ 	natsort/__init__.py UnusedImport
+ 	natsort/compat/* UnusedImport
+@@ -14,6 +15,7 @@ flakes-ignore =
+ 	test_natsort/test_locale_help.py UnusedImport RedefinedWhileUnused
+ 	test_natsort/compat/* UnusedImport
+ pep8ignore = 
++	nix_run_setup.py ALL
+ 	natsort/ns_enum.py E126 E241 E123 E221
+ 	test_natsort/test_*.py E501 E241 E221
+ 	test_natsort/test_natsort_keygen.py E501 E241 E221 E701
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 07bb85632cc..db52731f0b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8193,34 +8193,7 @@ in {
     };
   };
 
-  natsort = buildPythonPackage rec {
-    name = "natsort-5.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/natsort/${name}.tar.gz";
-      sha256 = "4ad6b4d1153451e345967989bd3ca30abf33f615b116eeadfcc51a456e6974a9";
-    };
-
-    buildInputs = with self;
-      [
-        hypothesis
-        pytestcache
-        pytestcov
-        pytestflakes
-        pytestpep8
-        pytest
-        mock
-      ]
-      # pathlib was made part of standard library in 3.5:
-      ++ (optionals (pythonOlder "3.4") [ pathlib ]);
-
-    meta = {
-      description = "Natural sorting for python";
-      homepage = https://github.com/SethMMorton/natsort;
-      license = licenses.mit;
-      broken = true;
-    };
-  };
+  natsort = callPackage ../development/python-modules/natsort { };
 
   logster = buildPythonPackage {
     name = "logster-7475c53822";

From 88a5082edf54a5ec3ae70aedfdfb143f245393bb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 10 May 2017 15:57:24 -0500
Subject: [PATCH 044/206] Revert "qt58: ignore NIX_PROFILES environment
 variable"

This reverts commit 6169bd98f51429d7da4f2fc296357d8e6d828751.
---
 .../qtbase/nix-profiles-library-paths.patch   | 20 +++++++++++++++++
 .../libraries/qt-5/5.6/qtbase/series          |  1 +
 .../qtbase/nix-profiles-library-paths.patch   | 22 +++++++++++++++++++
 .../libraries/qt-5/5.8/qtbase/series          |  1 +
 4 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch

diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
new file mode 100644
index 00000000000..68163fc0c31
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
@@ -0,0 +1,20 @@
+Index: qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp
+===================================================================
+--- qtbase-opensource-src-5.6.2.orig/src/corelib/kernel/qcoreapplication.cpp
++++ qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp
+@@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPat
+         QStringList *app_libpaths = new QStringList;
+         coreappdata()->app_libpaths.reset(app_libpaths);
+ 
++        // Add library paths derived from NIX_PROFILES.
++        const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
++        const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
++        for (const QByteArray &profile: profiles) {
++            if (!profile.isEmpty()) {
++                app_libpaths->append(QFile::decodeName(profile) + plugindir);
++            }
++        }
++
+         const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
+         if (!libPathEnv.isEmpty()) {
+             QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series
index 9ef8c998c66..2196d838375 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series
@@ -4,5 +4,6 @@ dlopen-libXcursor.patch
 dlopen-openssl.patch
 dlopen-dbus.patch
 xdg-config-dirs.patch
+nix-profiles-library-paths.patch
 compose-search-path.patch
 libressl.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
new file mode 100644
index 00000000000..c5d91066d8f
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
@@ -0,0 +1,22 @@
+Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/kernel/qcoreapplication.cpp
++++ qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
+@@ -2476,7 +2476,17 @@ QStringList QCoreApplication::libraryPat
+         QStringList *app_libpaths = new QStringList;
+         coreappdata()->app_libpaths.reset(app_libpaths);
+ 
++        // Add library paths derived from NIX_PROFILES.
++        const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
++        const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
++        for (const QByteArray &profile: profiles) {
++            if (!profile.isEmpty()) {
++                app_libpaths->append(QFile::decodeName(profile) + plugindir);
++            }
++        }
++
+         const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
++        qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes
+         if (!libPathEnv.isEmpty()) {
+             QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
+             for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 0378ca1f503..6f6942b4444 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -2,6 +2,7 @@ dlopen-resolv.patch
 tzdir.patch
 dlopen-libXcursor.patch
 xdg-config-dirs.patch
+nix-profiles-library-paths.patch
 libressl.patch
 qpa-plugin-path.patch
 dlopen-gl.patch

From 7c338b7df8e35fab4c08a494bff6018f8fb1be72 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 13 May 2017 09:16:13 -0500
Subject: [PATCH 045/206] qtbase: search platform plugin paths before other
 plugin paths

---
 .../libraries/qt-5/5.6/qtbase/default.nix     |  2 +
 .../5.6/qtbase/qpa-platform-plugin-path.patch | 43 +++++++++++++++++++
 .../libraries/qt-5/5.6/qtbase/series          |  1 +
 .../libraries/qt-5/5.8/qtbase/default.nix     |  2 +-
 .../qtbase/nix-profiles-library-paths.patch   |  4 +-
 .../5.8/qtbase/qpa-platform-plugin-path.patch | 43 +++++++++++++++++++
 .../qt-5/5.8/qtbase/qpa-plugin-path.patch     | 15 -------
 .../libraries/qt-5/5.8/qtbase/series          |  2 +-
 8 files changed, 92 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/qpa-platform-plugin-path.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch

diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
index b26fc7faf9d..289a1bbac6c 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -104,6 +104,8 @@ stdenv.mkDerivation {
         -importdir $out/lib/qt5/imports \
         -qmldir $out/lib/qt5/qml \
         -docdir $out/share/doc/qt5"
+
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/lib/qt5/plugins/platforms\""
   '';
 
   prefixKey = "-prefix ";
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/qpa-platform-plugin-path.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/qpa-platform-plugin-path.patch
new file mode 100644
index 00000000000..32d9dcad622
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/qpa-platform-plugin-path.patch
@@ -0,0 +1,43 @@
+Index: qtbase-opensource-src-5.6.2/src/gui/kernel/qplatformintegrationfactory.cpp
+===================================================================
+--- qtbase-opensource-src-5.6.2.orig/src/gui/kernel/qplatformintegrationfactory.cpp
++++ qtbase-opensource-src-5.6.2/src/gui/kernel/qplatformintegrationfactory.cpp
+@@ -67,9 +67,10 @@ QPlatformIntegration *QPlatformIntegrati
+     // Try loading the plugin from platformPluginPath first:
+     if (!platformPluginPath.isEmpty()) {
+         QCoreApplication::addLibraryPath(platformPluginPath);
+-        if (QPlatformIntegration *ret = loadIntegration(directLoader(), platform, paramList, argc, argv))
+-            return ret;
+     }
++    QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
++    if (QPlatformIntegration *ret = loadIntegration(directLoader(), platform, paramList, argc, argv))
++        return ret;
+     if (QPlatformIntegration *ret = loadIntegration(loader(), platform, paramList, argc, argv))
+         return ret;
+ #else
+@@ -95,15 +96,16 @@ QStringList QPlatformIntegrationFactory:
+     QStringList list;
+     if (!platformPluginPath.isEmpty()) {
+         QCoreApplication::addLibraryPath(platformPluginPath);
+-        list = directLoader()->keyMap().values();
+-        if (!list.isEmpty()) {
+-            const QString postFix = QStringLiteral(" (from ")
+-                                    + QDir::toNativeSeparators(platformPluginPath)
+-                                    + QLatin1Char(')');
+-            const QStringList::iterator end = list.end();
+-            for (QStringList::iterator it = list.begin(); it != end; ++it)
+-                (*it).append(postFix);
+-        }
++    }
++    QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
++    list = directLoader()->keyMap().values();
++    if (!list.isEmpty()) {
++        const QString postFix = QStringLiteral(" (from ")
++            + QDir::toNativeSeparators(platformPluginPath)
++            + QLatin1Char(')');
++        const QStringList::iterator end = list.end();
++        for (QStringList::iterator it = list.begin(); it != end; ++it)
++            (*it).append(postFix);
+     }
+     list.append(loader()->keyMap().values());
+     return list;
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series
index 2196d838375..3527a91c84d 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series
@@ -7,3 +7,4 @@ xdg-config-dirs.patch
 nix-profiles-library-paths.patch
 compose-search-path.patch
 libressl.patch
+qpa-platform-plugin-path.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index e11d9dd1f29..403c7f2636b 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -128,7 +128,7 @@ stdenv.mkDerivation {
         -qmldir $out/lib/qt5/qml \
         -docdir $out/share/doc/qt5"
 
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/lib/qt5/plugins\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/lib/qt5/plugins/platforms\""
   '';
 
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
index c5d91066d8f..553c71d0ace 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
@@ -2,7 +2,7 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
 ===================================================================
 --- qtbase-opensource-src-5.8.0.orig/src/corelib/kernel/qcoreapplication.cpp
 +++ qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
-@@ -2476,7 +2476,17 @@ QStringList QCoreApplication::libraryPat
+@@ -2476,6 +2476,15 @@ QStringList QCoreApplication::libraryPat
          QStringList *app_libpaths = new QStringList;
          coreappdata()->app_libpaths.reset(app_libpaths);
  
@@ -16,7 +16,5 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
 +        }
 +
          const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
-+        qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes
          if (!libPathEnv.isEmpty()) {
              QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
-             for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
new file mode 100644
index 00000000000..270116e1978
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
@@ -0,0 +1,43 @@
+Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cpp
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/gui/kernel/qplatformintegrationfactory.cpp
++++ qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cpp
+@@ -62,9 +62,10 @@ QPlatformIntegration *QPlatformIntegrati
+     // Try loading the plugin from platformPluginPath first:
+     if (!platformPluginPath.isEmpty()) {
+         QCoreApplication::addLibraryPath(platformPluginPath);
+-        if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
+-            return ret;
+     }
++    QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
++    if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
++        return ret;
+ #else
+     Q_UNUSED(platformPluginPath);
+ #endif
+@@ -84,15 +85,16 @@ QStringList QPlatformIntegrationFactory:
+ #ifndef QT_NO_LIBRARY
+     if (!platformPluginPath.isEmpty()) {
+         QCoreApplication::addLibraryPath(platformPluginPath);
+-        list = directLoader()->keyMap().values();
+-        if (!list.isEmpty()) {
+-            const QString postFix = QLatin1String(" (from ")
+-                                    + QDir::toNativeSeparators(platformPluginPath)
+-                                    + QLatin1Char(')');
+-            const QStringList::iterator end = list.end();
+-            for (QStringList::iterator it = list.begin(); it != end; ++it)
+-                (*it).append(postFix);
+-        }
++    }
++    QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
++    list = directLoader()->keyMap().values();
++    if (!list.isEmpty()) {
++        const QString postFix = QLatin1String(" (from ")
++            + QDir::toNativeSeparators(platformPluginPath)
++            + QLatin1Char(')');
++        const QStringList::iterator end = list.end();
++        for (QStringList::iterator it = list.begin(); it != end; ++it)
++            (*it).append(postFix);
+     }
+ #else
+     Q_UNUSED(platformPluginPath);
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch
deleted file mode 100644
index 6d40ed19c00..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-plugin-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qguiapplication.cpp
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/gui/kernel/qguiapplication.cpp
-+++ qtbase-opensource-src-5.8.0/src/gui/kernel/qguiapplication.cpp
-@@ -1217,6 +1217,10 @@ void QGuiApplicationPrivate::createPlatf
- 
-     // Load the platform integration
-     QString platformPluginPath = QString::fromLocal8Bit(qgetenv("QT_QPA_PLATFORM_PLUGIN_PATH"));
-+    if (!platformPluginPath.isEmpty()) {
-+        platformPluginPath.append(QStringLiteral(":"));
-+    }
-+    platformPluginPath.append(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
- 
- 
-     QByteArray platformName;
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 6f6942b4444..47400cf7aa3 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -4,7 +4,7 @@ dlopen-libXcursor.patch
 xdg-config-dirs.patch
 nix-profiles-library-paths.patch
 libressl.patch
-qpa-plugin-path.patch
+qpa-platform-plugin-path.patch
 dlopen-gl.patch
 compose-search-path.patch
 cmake-paths.patch

From eacfdc38f4e4daf1752aa2e9a3a8f6a09a3b0f7d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 14 May 2017 22:13:14 +0300
Subject: [PATCH 046/206] cryptsetup: 1.7.3 -> 1.7.5

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

diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index f61a5497c4b..47f49a3da40 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -5,11 +5,11 @@
 assert enablePython -> python2 != null;
 
 stdenv.mkDerivation rec {
-  name = "cryptsetup-1.7.3";
+  name = "cryptsetup-1.7.5";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/cryptsetup/v1.7/${name}.tar.xz";
-    sha256 = "00nwd96m9yq4k3cayc04i5y7iakkzana35zxky6hpx2w8zl08axg";
+    sha256 = "1gail831j826lmpdx2gsc83lp3br6wfnwh3vqwxaa1nn1lfwsc1b";
   };
 
   configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ]

From 482f9862e5902a7fbf57fa363bdecf5e7c84fff8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 13 May 2017 16:43:16 +0200
Subject: [PATCH 047/206] matterircd: 0.11.3 -> 0.11.4

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

diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index 46b4f2ca3d4..549ec289d6b 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "matterircd-${version}";
-  version = "0.11.3";
+  version = "0.11.4";
 
   src = fetchFromGitHub {
     owner = "42wim";
     repo = "matterircd";
     rev = "v${version}";
-    sha256 = "10fmn6midfzmn6ylhrk00bvykn0zijypiqp5hjqn642kcdkrjc6i";
+    sha256 = "0mnfay6bh9ls2fi3k96hmw4gr7q11lw4rd466lidi4jyjpc7q42x";
   };
 
   goPackagePath = "github.com/42vim/matterircd";

From 0cd0581b75e3e1527f0b752ec70e64c1da6d9eb5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 11 May 2017 22:29:09 +0200
Subject: [PATCH 048/206] gitlab-runner service: only depend on docker if
 enabled

---
 .../services/continuous-integration/gitlab-runner.nix     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index ba90b1b1a2c..048343b3360 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -5,6 +5,7 @@ with lib;
 let
   cfg = config.services.gitlab-runner;
   configFile = pkgs.writeText "config.toml" cfg.configText;
+  hasDocker = config.virtualisation.docker.enable;
 in
 {
   options.services.gitlab-runner = {
@@ -33,8 +34,9 @@ in
   config = mkIf cfg.enable {
     systemd.services.gitlab-runner = {
       description = "Gitlab Runner";
-      after = [ "network.target" "docker.service" ];
-      requires = [ "docker.service" ];
+      after = [ "network.target" ]
+        ++ optional hasDocker "docker.service";
+      requires = optional hasDocker "docker.service";
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \
@@ -51,7 +53,7 @@ in
 
     users.extraUsers.gitlab-runner = {
       group = "gitlab-runner";
-      extraGroups = [ "docker" ];
+      extraGroups = optional hasDocker "docker";
       uid = config.ids.uids.gitlab-runner;
       home = cfg.workDir;
       createHome = true;

From 2ab474b4a7136e9a0bb4dcee389a6adac73ce6d8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 11 May 2017 23:16:31 +0200
Subject: [PATCH 049/206] gitlab-runner_1_11: add patch to fetch shells from
 system path

---
 .../gitlab-runner/v1-fix-shell-path.patch           | 13 +++++++++++++
 .../continuous-integration/gitlab-runner/v1.nix     |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/tools/continuous-integration/gitlab-runner/v1-fix-shell-path.patch

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1-fix-shell-path.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/v1-fix-shell-path.patch
new file mode 100644
index 00000000000..612c9a51f28
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/v1-fix-shell-path.patch
@@ -0,0 +1,13 @@
+diff --git a/shells/bash.go b/shells/bash.go
+index c9c8b68..c97dbb5 100644
+--- a/shells/bash.go
++++ b/shells/bash.go
+@@ -208,7 +208,7 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo
+ 	if info.User != "" {
+ 		script.Command = "su"
+ 		if runtime.GOOS == "linux" {
+-			script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell)
++			script.Arguments = append(script.Arguments, "-s", "/run/current-system/sw/bin/"+b.Shell)
+ 		}
+ 		script.Arguments = append(script.Arguments, info.User)
+ 		script.Arguments = append(script.Arguments, "-c", shellCommand)
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
index cfc952395c2..e0c3854740a 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
@@ -32,6 +32,8 @@ buildGoPackage rec {
     sha256 = "1sjvlb5981ykc8hr4kp1ibh9jw2wdjjp9zs2nqs9lpsav4nda5fr";
   };
 
+  patches = [ ./v1-fix-shell-path.patch ];
+
   buildInputs = [ go-bindata ];
 
   preBuild = ''

From 3d79d8c28b3ff0326f14257fd431df4b0c10bb5b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 14 May 2017 23:50:45 +0300
Subject: [PATCH 050/206] sd-image-*.nix: Drop minimal profile

It's annoying to not have manpages when installing.
---
 nixos/modules/installer/cd-dvd/sd-image-aarch64.nix              | 1 -
 nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 1 -
 nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix          | 1 -
 3 files changed, 3 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index c769bc80a48..063ffb191ee 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -10,7 +10,6 @@ let
 in
 {
   imports = [
-    ../../profiles/minimal.nix
     ../../profiles/installation-device.nix
     ./sd-image.nix
   ];
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index 118ed20d47f..1c664e02503 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -10,7 +10,6 @@ let
 in
 {
   imports = [
-    ../../profiles/minimal.nix
     ../../profiles/installation-device.nix
     ./sd-image.nix
   ];
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index 886ffd9a092..3f2970757bd 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -10,7 +10,6 @@ let
 in
 {
   imports = [
-    ../../profiles/minimal.nix
     ../../profiles/installation-device.nix
     ./sd-image.nix
   ];

From 14520e7b4b621bd8ecd53137789364f043c72e33 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 14 May 2017 16:44:11 -0400
Subject: [PATCH 051/206] awesome: Allows awesome to load svg images.

Awesome can load SVG images, just like it can do PNG, through gdk.

The support for SVG images through GDK needs librvsg.

This commits adds the plumbing necessary in the wrapper that makes
awesome be able to load SVG images.

Without this, awesome will not load SVG images. The related error message is:

 > Couldn't recognize the image file format for file

Which comes from gdk.
---
 pkgs/applications/window-managers/awesome/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index eccb1a19538..6f56ff98998 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
+{ stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf
 , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
 , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
 , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
@@ -30,7 +30,7 @@ with luaPackages; stdenv.mkDerivation rec {
   ];
    
   propagatedUserEnvPkgs = [ hicolor_icon_theme ];
-  buildInputs = [ cairo dbus gdk_pixbuf gobjectIntrospection
+  buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection
                   git lgi libpthreadstubs libstartup_notification
                   libxdg_basedir lua nettools pango xcb-util-cursor
                   xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
@@ -54,6 +54,7 @@ with luaPackages; stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/awesome \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
       --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \
       --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

From c441ae6feb21954f750a87240034fe515e3752a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 14 May 2017 22:07:26 +0100
Subject: [PATCH 052/206] gem-config: add pcaprub

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

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 83346037dad..514411f3c5d 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -21,7 +21,7 @@
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl
-, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc
+, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap
 }@args:
 
 let
@@ -135,6 +135,10 @@ in
     buildInputs = [ curl ];
   };
 
+  pcaprub = attrs: {
+    buildInputs = [ libpcap ];
+  };
+
   pg = attrs: {
     buildFlags = [
       "--with-pg-config=${postgresql}/bin/pg_config"

From ae9e73125f8ea5055ad8da63719831cab1c3e1f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 14 May 2017 22:13:55 +0100
Subject: [PATCH 053/206] gem-config: add rb-readline

---
 pkgs/development/ruby-modules/gem-config/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 514411f3c5d..d5595c04e3a 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -211,6 +211,14 @@ in
     '';
   };
 
+  rb-readline = attrs: {
+    dontBuild = false;
+    postPatch = ''
+      substituteInPlace lib/rbreadline.rb \
+        --replace 'infocmp' '${ncurses.dev}/bin/infocmp'
+    '';
+  };
+
   timfel-krb5-auth = attrs: {
     buildInputs = [ kerberos ];
   };

From ff3baddbd57b6b4664ddef2659a73edffd6f7e47 Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Fri, 12 May 2017 15:04:21 +0200
Subject: [PATCH 054/206] seth: init at 0.5.0

---
 pkgs/applications/altcoins/default.nix |  1 +
 pkgs/applications/altcoins/seth.nix    | 31 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  1 +
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/altcoins/seth.nix

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 4386ebe4a91..471d2a16ef7 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -36,6 +36,7 @@ rec {
 
   ethabi = callPackage ./ethabi.nix { };
   ethrun = callPackage ./ethrun.nix { };
+  seth = callPackage ./seth.nix { };
 
   primecoin  = callPackage ./primecoin.nix { withGui = true; };
   primecoind = callPackage ./primecoin.nix { withGui = false; };
diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix
new file mode 100644
index 00000000000..387f5594c62
--- /dev/null
+++ b/pkgs/applications/altcoins/seth.nix
@@ -0,0 +1,31 @@
+{ stdenv, makeWrapper, lib, fetchFromGitHub
+, bc, coreutils, curl, ethabi, git, gnused, jshon, solc, which }:
+
+stdenv.mkDerivation rec {
+  name = "seth-${version}";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "dapphub";
+    repo = "seth";
+    rev = "v${version}";
+    sha256 = "0bgygvilhbabb0y9pv9cn8cx7cj513w9is4vh6v69h2czknrjmgz";
+  };
+
+  nativeBuildInputs = [makeWrapper];
+  buildPhase = "true";
+  makeFlags = ["prefix=$(out)"];
+  postInstall = let path = lib.makeBinPath [
+    bc coreutils curl ethabi git gnused jshon solc which
+  ]; in ''
+    wrapProgram "$out/bin/seth" --prefix PATH : "${path}"
+  '';
+
+  meta = {
+    description = "Command-line client for talking to Ethereum nodes";
+    homepage = https://github.com/dapphub/seth/;
+    maintainers = [stdenv.lib.maintainers.dbrock];
+    license = lib.licenses.gpl3;
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8609b162558..3c8a360e5c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13062,6 +13062,7 @@ with pkgs;
   go-ethereum = self.altcoins.go-ethereum;
   ethabi = self.altcoins.ethabi;
   ethrun = self.altcoins.ethrun;
+  seth = self.altcoins.seth;
 
   stellar-core = self.altcoins.stellar-core;
 

From 2f1e6c8686f8e83efd181fca67fba559bc5ef3a1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 15 May 2017 01:27:30 +0300
Subject: [PATCH 055/206] kernel: 4.10.15 -> 4.10.16

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index 8711df4c1df..eb0bc519a5c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10.15";
+  version = "4.10.16";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0i943i7gp9fk5ic3dbm9w8ilgpmphav2m3rlj1i3c0r7y0824hfq";
+    sha256 = "02z0gzycjx0nkxazsfqh9dxhs1xd99z589i4qd8d3d740p2lgifw";
   };
 
   kernelPatches = args.kernelPatches;

From c230aee1212de5dd68bdb76d449ac065658634e8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 15 May 2017 01:27:41 +0300
Subject: [PATCH 056/206] kernel: 4.11 -> 4.11.1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix
index ee96cbee6cb..6d2056eff68 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11";
+  version = "4.11.1";
   extraMeta.branch = "4.11";
-  modDirVersion = "4.11.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "b67ecafd0a42b3383bf4d82f0850cbff92a7e72a215a6d02f42ddbafcf42a7d6";
+    sha256 = "027646ynwf4n8cb3h29a9qfm0cyw12bvaavzn2q44ych2vigjiky";
   };
 
   kernelPatches = args.kernelPatches;

From 8de08ff1458a961fa834c4629d0d848c43b52f95 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 15 May 2017 01:27:50 +0300
Subject: [PATCH 057/206] kernel: 4.4.67 -> 4.4.68

---
 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 8f804aaea81..970b4f9531c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.67";
+  version = "4.4.68";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "063vjskz6grjp3bmgcp056r8xzy578fwc2kmzdhb6lw5mih9r85f";
+    sha256 = "1lwh66db78xx1w30v01wn3jmdmh298zx5q4shjz3qswda70r1m1m";
   };
 
   kernelPatches = args.kernelPatches;

From ba585648e7dbab07483e3199d080bf6dffe9f353 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 15 May 2017 01:28:01 +0300
Subject: [PATCH 058/206] kernel: 4.9.27 -> 4.9.28

---
 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 5f3280c1ddc..5725045e493 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.27";
+  version = "4.9.28";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0wvhds3878sh7hphjy30aii7jm5b88d2qph29whc96zccx1rpxlm";
+    sha256 = "0a59lhl3qbsag8lgj635dl15ssfjni6876hz3sry8ls81lpz7l85";
   };
 
   kernelPatches = args.kernelPatches;

From 336b044dcb4c867430f5296eb483457769437aec Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 14 May 2017 22:03:14 -0400
Subject: [PATCH 059/206] linux-testing: 4.11-rc7 -> 4.12-rc1

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

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 2c4dbc7d20f..cd71d563a2f 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -214,7 +214,9 @@ with stdenv.lib;
   SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
   SND_HDA_INPUT_BEEP y # Support digital beep via input layer
   SND_USB_CAIAQ_INPUT y
-  PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+  ${optionalString (versionOlder version "4.12") ''
+    PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+  ''}
 
   # USB serial devices.
   USB_SERIAL_GENERIC y # USB Generic Serial Driver
@@ -495,7 +497,9 @@ with stdenv.lib;
   ${optionalString (versionAtLeast version "4.0") ''
     KVM_COMPAT? y
   ''}
-  KVM_DEVICE_ASSIGNMENT? y
+  ${optionalString (versionOlder version "4.12") ''
+    KVM_DEVICE_ASSIGNMENT? y
+  ''}
   ${optionalString (versionAtLeast version "4.0") ''
     KVM_GENERIC_DIRTYLOG_READ_PROTECT y
   ''}
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 932c6602842..2321187c96b 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11-rc7";
-  modDirVersion = "4.11.0-rc7";
-  extraMeta.branch = "4.11";
+  version = "4.12-rc1";
+  modDirVersion = "4.12.0-rc1";
+  extraMeta.branch = "4.12";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "0zifawlrc62gsqmg91858wxx7vbpz0drjbhzmmbpplj3j7pdlly5";
+    url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
+    sha256 = "13xyiqn7xv8ryqrfsx8b18qm1zj0qkfz92mdh611nqhhdlw7gcpk";
   };
 
   features.iwlwifi = true;

From fc0543cd88c0b94e2a3cf71e1e0f339875f4a8a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 15 May 2017 09:34:39 +0200
Subject: [PATCH 060/206] cabal2nix: include nix in the generated wrapper to
 ensure that nix-prefetch-url is in $PATH

Fixes https://github.com/NixOS/nixpkgs/issues/25718.
---
 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 c6d0dc74788..f45a0a87491 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -742,7 +742,9 @@ with pkgs;
       exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname}
       install -D $out/bin/${drv.pname} $exe
       rm -rf $out/{bin,lib,share}
-      makeWrapper $exe $out/bin/${drv.pname} --prefix PATH ":" "${nix-prefetch-scripts}/bin"
+      makeWrapper $exe $out/bin/${drv.pname} \
+        --prefix PATH ":" "${nix}/bin" \
+        --prefix PATH ":" "${nix-prefetch-scripts}/bin"
       mkdir -p $out/share/bash-completion/completions
       $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname}
     '';

From bdf88dd61ddabeef0a0a5cef028a0e5101150e15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 May 2017 12:41:32 +0200
Subject: [PATCH 061/206] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.2.1-1-gc33d81c from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/1f35de13eb31b3b78eddd7baf80752ac99eaef2c.
---
 .../haskell-modules/hackage-packages.nix      | 1167 +++++++++++++----
 1 file changed, 920 insertions(+), 247 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1ad74866c1d..13a06b33630 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5939,8 +5939,8 @@ self: {
      }:
      mkDerivation {
        pname = "GPipe";
-       version = "2.2";
-       sha256 = "960ef739287f3e3078a3257adbb9c74c22df6ea69ab269f5a365da0133c6245c";
+       version = "2.2.1";
+       sha256 = "8f8c2391b49dab16ae4b241ff7e4728f1c61c275ff422d42fc326c779508a7bc";
        libraryHaskellDepends = [
          base Boolean containers exception-transformers gl hashtables linear
          transformers
@@ -5988,8 +5988,8 @@ self: {
     ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }:
      mkDerivation {
        pname = "GPipe-GLFW";
-       version = "1.4.0";
-       sha256 = "5409922cc181e2f7d943afe63b6154a65799ee6eba318a6201f303987c1eb529";
+       version = "1.4.1";
+       sha256 = "6b86172c72c254c203a6bbab0848375538a52d90dc888ca1c517199d51714647";
        libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
        homepage = "https://github.com/plredmond/GPipe-GLFW";
        description = "GLFW OpenGL context creation for GPipe";
@@ -17903,6 +17903,28 @@ self: {
        license = "GPL";
      }) {};
 
+  "Villefort" = callPackage
+    ({ mkDerivation, base, FindBin, HDBC, HDBC-sqlite3, mtl, scotty
+     , split, text, time
+     }:
+     mkDerivation {
+       pname = "Villefort";
+       version = "0.1.0.6";
+       sha256 = "1d3f0293e020c48206f6ca6cdabbca4042edbc1a9ae1c14484f5c00087d247f8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base FindBin HDBC HDBC-sqlite3 mtl split time
+       ];
+       executableHaskellDepends = [
+         base HDBC HDBC-sqlite3 scotty split text time
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/Chrisr850/Villefort#readme";
+       description = "Villefort is a task manager and time tracker written in haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Vulkan" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -19898,8 +19920,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "acme-cofunctor";
-       version = "0.1.0.0";
-       sha256 = "d5ecbe477dd579fec0c6f6ad5d8f05d884de65af6570d519703896ecfe08311a";
+       version = "0.1.1.0";
+       sha256 = "9d3c87320b56a20b5d22c77f8ee7add4c725a44ea517352253b0d0b5c0b5b479";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jaspervdj/acme-cofunctor";
        description = "A Cofunctor is a structure from category theory dual to Functor";
@@ -20745,35 +20767,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson_0_11_3_0" = callPackage
-    ({ mkDerivation, attoparsec, base, base-orphans, bytestring
-     , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl
-     , QuickCheck, quickcheck-instances, scientific, syb, tagged
-     , template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "aeson";
-       version = "0.11.3.0";
-       sha256 = "f326fac57881c228d91f610a2c92f083a60e3830d9c7d35dfb0a16925c95ece9";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers deepseq dlist fail ghc-prim
-         hashable mtl scientific syb tagged template-haskell text time
-         transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         attoparsec base base-orphans bytestring containers ghc-prim
-         hashable HUnit QuickCheck quickcheck-instances tagged
-         template-haskell test-framework test-framework-hunit
-         test-framework-quickcheck2 text time unordered-containers vector
-       ];
-       homepage = "https://github.com/bos/aeson";
-       description = "Fast JSON parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "aeson" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, dlist
@@ -27412,8 +27405,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-core";
-       version = "0.7.0.2";
-       sha256 = "6872f0ca4a70c50942b239828621fda3923a3763921130150be20c568c40ff50";
+       version = "0.7.2.0";
+       sha256 = "25cc9902cc87845a569f48ec7b379d5ceb83b7fcf9751f2908e69b00aec3db39";
        libraryHaskellDepends = [
          aeson atlassian-connect-descriptor base base64-bytestring
          bytestring case-insensitive cipher-aes configurator containers
@@ -27435,8 +27428,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.4.4.2";
-       sha256 = "9352e134c720358694b7e839c5056ce62334303d0db9cb94e151c086da123598";
+       version = "0.4.5.0";
+       sha256 = "a05e750e20af9f0cf32ddd154215550a6fda5b44b8f9b120c3fd71158ee7fa37";
        libraryHaskellDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -29911,6 +29904,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-feature-macros" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-feature-macros";
+       version = "0.1";
+       sha256 = "be1ba0e207be3558f5b061785dd363fd63613034e00488b022be7655561d39ab";
+       revision = "1";
+       editedCabalFile = "d92172580179ae9338cb58504d1b05c058ce0d593ef4f67a88dbef842f693ae6";
+       libraryHaskellDepends = [ base ];
+       doHaddock = false;
+       description = "Semantic CPP feature macros for base";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "base-generics" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -33580,8 +33587,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6";
        sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3";
-       revision = "10";
-       editedCabalFile = "b3fca3e52b9662881d181fa39c63b5b5095f77f83f0fd223c2a4cfeffa05a486";
+       revision = "11";
+       editedCabalFile = "06e4ddd08f0655253a5e5129eeb8790e5667f679c8c806cd1133b3998870bad8";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
          containers data-default-class http-types kansas-comet mime-types
@@ -34982,22 +34989,23 @@ self: {
      }) {};
 
   "bound" = callPackage
-    ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad
-     , directory, doctest, filepath, hashable, hashable-extras
-     , prelude-extras, profunctors, template-haskell, transformers
-     , vector
+    ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
+     , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest
+     , functor-classes-compat, hashable, mmorph, profunctors
+     , template-haskell, transformers, transformers-compat, vector, void
      }:
      mkDerivation {
        pname = "bound";
-       version = "1.0.7";
-       sha256 = "ad0388ade83ca0b3cf02b182e663f553a83b3a8116ada8f39543318bf516340e";
+       version = "2";
+       sha256 = "5d08b02ae1f17764ced96d497510a60cb9937ecf2b1faf3fdf791039a799c37c";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         base bifunctors binary bytes cereal comonad hashable
-         hashable-extras prelude-extras profunctors template-haskell
-         transformers
+         base bifunctors binary bytes cereal comonad deepseq hashable mmorph
+         profunctors template-haskell transformers transformers-compat
        ];
        testHaskellDepends = [
-         base directory doctest filepath prelude-extras transformers vector
+         base deriving-compat doctest functor-classes-compat transformers
+         transformers-compat vector void
        ];
        homepage = "http://github.com/ekmett/bound/";
        description = "Making de Bruijn Succ Less";
@@ -37064,8 +37072,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-info";
-       version = "0.1.0.0";
-       sha256 = "d7623ce69cdf180f3266cc14fcf4e53f4d5b2c4d9cb359f145a730878096fc6d";
+       version = "0.2.1";
+       sha256 = "9484ab621cf0b502edea1430966919005cf323b30ad83c8aac8912930072c4bd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44947,6 +44955,23 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "concurrent-output_1_9_0" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+     , process, stm, terminal-size, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "concurrent-output";
+       version = "1.9.0";
+       sha256 = "2341d06e2bc51963a4f8d035c7cd7c7e9cf02f3d92001aa5ee586e3f00a64b72";
+       libraryHaskellDepends = [
+         ansi-terminal async base directory exceptions process stm
+         terminal-size text transformers unix
+       ];
+       description = "Ungarble output from several threads or commands";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-rpc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -47992,6 +48017,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "crdt" = callPackage
+    ({ mkDerivation, base, derive, QuickCheck, tasty, tasty-quickcheck
+     , vector
+     }:
+     mkDerivation {
+       pname = "crdt";
+       version = "0.1";
+       sha256 = "86de73b5c2f2c597de3203c7724ae9a73bb2db6b6d67daac24137c3a05b19880";
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [
+         base derive QuickCheck tasty tasty-quickcheck vector
+       ];
+       homepage = "https://github.com/cblp/crdt#readme";
+       description = "Conflict-free replicated data types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "creatur" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, cereal, cond
      , directory, exceptions, filepath, gray-extended, hdaemonize
@@ -49057,6 +49099,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
+  "cryptonite-openssl_0_6" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, memory, openssl
+     , tasty, tasty-hunit, tasty-kat, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cryptonite-openssl";
+       version = "0.6";
+       sha256 = "a8cb97c96bfb3e7b7ff8d59629317882dbf3cea12ba978d8475c96a6c28750a6";
+       libraryHaskellDepends = [ base bytestring cryptonite memory ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [
+         base bytestring cryptonite tasty tasty-hunit tasty-kat
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/haskell-crypto/cryptonite-openssl";
+       description = "Crypto stuff using OpenSSL cryptographic library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "cryptsy-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, either
      , http-client, http-client-tls, old-locale, pipes-attoparsec
@@ -49927,6 +49989,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "czipwith" = callPackage
+    ({ mkDerivation, base, template-haskell, transformers }:
+     mkDerivation {
+       pname = "czipwith";
+       version = "1.0.0.0";
+       sha256 = "45a2af0fd73f4cb7968c382465d8c5c6f4807d195d85e5b35bccef8f5e7c2ce1";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base transformers ];
+       homepage = "https://github.com/lspitzner/czipwith/";
+       description = "CZipWith class and deriving via TH";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "d-bus" = callPackage
     ({ mkDerivation, async, attoparsec, base, binary, blaze-builder
      , bytestring, conduit, conduit-extra, containers
@@ -51049,6 +51124,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-dword_0_3_1_1" = callPackage
+    ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty
+     , tasty-quickcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "data-dword";
+       version = "0.3.1.1";
+       sha256 = "f77cd3c4cad022a7d229f96511fbd88eb8b0f2c9a40b67dc8c971dbd3d18fa35";
+       libraryHaskellDepends = [
+         base data-bword ghc-prim hashable template-haskell
+       ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
+       homepage = "https://github.com/mvv/data-dword";
+       description = "Stick two binary words together to get a bigger one";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-easy" = callPackage
     ({ mkDerivation, base, containers, directory, errors
      , haskell-src-exts, hlint, hspec, HUnit, QuickCheck, safe, text
@@ -53432,6 +53525,8 @@ self: {
        pname = "deepseq-generics";
        version = "0.2.0.0";
        sha256 = "b0b3ef5546c0768ef9194519a90c629f8f2ba0348487e620bb89d512187c7c9d";
+       revision = "1";
+       editedCabalFile = "023d1de7ad38dc0f72f0e77c7620a036fc632a6ac5c07e9f9229a8834948b514";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [
          base deepseq ghc-prim HUnit test-framework test-framework-hunit
@@ -62238,6 +62333,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ersatz_0_4" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, containers, data-default, directory, doctest
+     , filepath, lens, mtl, parsec, process, temporary, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "ersatz";
+       version = "0.4";
+       sha256 = "8e9d11bb90e191eae3a4f4fc4a332ac5e0e4fb996889030c46a2ecb5db38739c";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         array attoparsec base bytestring containers data-default lens mtl
+         process temporary transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         array base containers lens mtl parsec
+       ];
+       testHaskellDepends = [ array base directory doctest filepath mtl ];
+       homepage = "http://github.com/ekmett/ersatz";
+       description = "A monad for expressing SAT or QSAT problems using observable sharing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ersatz-toysat" = callPackage
     ({ mkDerivation, array, base, containers, ersatz, toysolver
      , transformers
@@ -62922,6 +63044,152 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "eventful-core" = callPackage
+    ({ mkDerivation, aeson, base, containers, hlint, hspec
+     , http-api-data, HUnit, path-pieces, template-haskell, text
+     , transformers, uuid
+     }:
+     mkDerivation {
+       pname = "eventful-core";
+       version = "0.1.1";
+       sha256 = "ea7d123dd9510d72f651b4197cbc35d34dd4d737b4e567fc1f16571518c64583";
+       libraryHaskellDepends = [
+         aeson base containers http-api-data path-pieces template-haskell
+         text transformers uuid
+       ];
+       testHaskellDepends = [
+         aeson base containers hlint hspec http-api-data HUnit path-pieces
+         template-haskell text transformers uuid
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "Core module for eventful";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "eventful-dynamodb" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-dynamodb, base
+     , bytestring, conduit, eventful-core, eventful-test-helpers, hlint
+     , hspec, HUnit, lens, QuickCheck, quickcheck-instances, safe, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "eventful-dynamodb";
+       version = "0.1.1";
+       sha256 = "3431f60159b7c7dc6b3994c5fd3aa87e48d43cf54ea499d07b363cf79b39cc91";
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-dynamodb base bytestring conduit
+         eventful-core lens safe text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson amazonka amazonka-dynamodb base bytestring conduit
+         eventful-core eventful-test-helpers hlint hspec HUnit lens
+         QuickCheck quickcheck-instances safe text unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "Library for eventful DynamoDB event stores";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "eventful-memory" = callPackage
+    ({ mkDerivation, async, base, containers, eventful-core
+     , eventful-test-helpers, hlint, hspec, HUnit, mtl, safe, stm
+     }:
+     mkDerivation {
+       pname = "eventful-memory";
+       version = "0.1.1";
+       sha256 = "efd3b19092571ac0d669f511da8c2f5559277255f6f783de5473669c388442e6";
+       libraryHaskellDepends = [
+         async base containers eventful-core mtl safe stm
+       ];
+       testHaskellDepends = [
+         async base containers eventful-core eventful-test-helpers hlint
+         hspec HUnit mtl safe stm
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "In-memory implementations for eventful";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "eventful-postgresql" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, eventful-core
+     , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit
+     , mtl, persistent, persistent-postgresql, text
+     }:
+     mkDerivation {
+       pname = "eventful-postgresql";
+       version = "0.1.1";
+       sha256 = "9a2adf281dad1040204303dae81d3bfcf620626c54f6337209b24b1860da2c92";
+       libraryHaskellDepends = [
+         aeson base bytestring eventful-core eventful-sql-common mtl
+         persistent persistent-postgresql text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring eventful-core eventful-sql-common
+         eventful-test-helpers hlint hspec HUnit mtl persistent
+         persistent-postgresql text
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "Postgres implementations for eventful";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "eventful-sql-common" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl
+     , persistent, persistent-template, split, text, uuid
+     }:
+     mkDerivation {
+       pname = "eventful-sql-common";
+       version = "0.1.1";
+       sha256 = "60a1bcc0643a088697856a4962ee0ab99e65fd69ef1e598f5ab981c6c98866f6";
+       libraryHaskellDepends = [
+         aeson base bytestring eventful-core mtl persistent
+         persistent-template split text uuid
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "Common library for SQL event stores";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "eventful-sqlite" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, eventful-core
+     , eventful-sql-common, eventful-test-helpers, hlint, hspec, HUnit
+     , mtl, persistent, persistent-sqlite, text, uuid
+     }:
+     mkDerivation {
+       pname = "eventful-sqlite";
+       version = "0.1.1";
+       sha256 = "e4ebd1e761f60e1cadd033f44070fab21c96c43e923c2b22f292c96cd0dcdc2e";
+       libraryHaskellDepends = [
+         aeson base bytestring eventful-core eventful-sql-common mtl
+         persistent persistent-sqlite text uuid
+       ];
+       testHaskellDepends = [
+         aeson base bytestring eventful-core eventful-sql-common
+         eventful-test-helpers hlint hspec HUnit mtl persistent
+         persistent-sqlite text uuid
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "SQLite implementations for eventful";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "eventful-test-helpers" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra
+     , hspec, monad-logger
+     }:
+     mkDerivation {
+       pname = "eventful-test-helpers";
+       version = "0.1.1";
+       sha256 = "2fe935a290a66f7ecc5a52c33df06b1aa75e90fdf4212c4aa68c584b6a654356";
+       libraryHaskellDepends = [
+         aeson aeson-casing base eventful-core extra hspec monad-logger
+       ];
+       homepage = "https://github.com/jdreaver/eventful#readme";
+       description = "Common module used for eventful tests";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "eventloop" = callPackage
     ({ mkDerivation, aeson, base, bytestring, concurrent-utilities
      , deepseq, network, stm, suspend, text, timers, websockets
@@ -67972,8 +68240,8 @@ self: {
      }:
      mkDerivation {
        pname = "forest";
-       version = "0.1";
-       sha256 = "4de243b4eddddc534881617c6335e0658496ad67c2ebc65ba148b2965fe64460";
+       version = "0.1.1.1";
+       sha256 = "177b321ada64b8f396b643c1e9ada0e721ec7a02d408dda65d522a88e1fb243c";
        libraryHaskellDepends = [
          aeson base bifunctors deepseq hashable profunctors semigroupoids
        ];
@@ -86279,12 +86547,12 @@ self: {
      }) {};
 
   "haskeline-repl" = callPackage
-    ({ mkDerivation, ansi-terminal, base, haskeline, mtl }:
+    ({ mkDerivation, ansi-terminal, base, haskeline, mtl, safe }:
      mkDerivation {
        pname = "haskeline-repl";
-       version = "0.3.0.0";
-       sha256 = "0de972adbe908b3a6b3b2b681f5f3de0d4bb3deaa112179c643d4736e675e961";
-       libraryHaskellDepends = [ ansi-terminal base haskeline mtl ];
+       version = "0.4.0.0";
+       sha256 = "ee1fa50e447997eebc0a2218a1b6cb85e379054d22c016f6e248d7d6615e722d";
+       libraryHaskellDepends = [ ansi-terminal base haskeline mtl safe ];
        homepage = "https://github.com/githubuser/haskeline-repl#readme";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -89596,6 +89864,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haven" = callPackage
+    ({ mkDerivation, base, bytestring, containers, http-conduit
+     , http-types, mtl, SHA, xml
+     }:
+     mkDerivation {
+       pname = "haven";
+       version = "0.1.0.0";
+       sha256 = "0f1a0ae54594429d11fd11b6975aa2f115d0063f4687992a30048c8c75153598";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring containers http-conduit http-types mtl SHA xml
+       ];
+       description = "Recursively retrieve maven dependencies";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haverer" = callPackage
     ({ mkDerivation, base, basic-prelude, containers, errors, lens
      , MonadRandom, mtl, random-shuffle, tasty, tasty-hunit
@@ -90300,6 +90585,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hdaemonize_0_5_3" = callPackage
+    ({ mkDerivation, base, bytestring, extensible-exceptions, filepath
+     , hsyslog, mtl, unix
+     }:
+     mkDerivation {
+       pname = "hdaemonize";
+       version = "0.5.3";
+       sha256 = "a1884c7444ed11b86f4776dbfbabe42adff8a91de0a261747c30778ea50c6118";
+       libraryHaskellDepends = [
+         base bytestring extensible-exceptions filepath hsyslog mtl unix
+       ];
+       homepage = "http://github.com/greydot/hdaemonize";
+       description = "Library to handle the details of writing daemons for UNIX";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hdaemonize-buildfix" = callPackage
     ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog
      , mtl, unix
@@ -90600,8 +90902,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdo";
-       version = "0.4";
-       sha256 = "b15832e660ec0072d50aea07fab0324a107b090d221446961dce20babffd69d0";
+       version = "0.5";
+       sha256 = "5a55fbb3a92c1d98656ac9cb62218a68ba760d699eeaf874c005d44b24b43d5a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92013,8 +92315,8 @@ self: {
      }:
      mkDerivation {
        pname = "hexpat-lens";
-       version = "0.1.4";
-       sha256 = "35783e1bb8654ac74866b7910f7f58385a78d0005d05c26bc7efd36ca9827978";
+       version = "0.1.5";
+       sha256 = "cae65e389dbf69932e313cd45fec7fc2f7c45551c583773bc27059856a2f268d";
        libraryHaskellDepends = [
          base bytestring deepseq hexpat hexpat-tagsoup lens
        ];
@@ -96046,17 +96348,14 @@ self: {
 
   "hookup" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system
-     , network, openssl, socks, template-haskell
+     , network, openssl, socks
      }:
      mkDerivation {
        pname = "hookup";
-       version = "0.1.0.0";
-       sha256 = "0b321b470cb66f8b0d1611cbe26ec6d0c8904f984456bd2fbe292fb2efd8a580";
-       revision = "1";
-       editedCabalFile = "85316f17f206fc4fbff16d40ef7c50029b9abb1f1674298869be468b1d7eb7e3";
+       version = "0.1.1.0";
+       sha256 = "e5f0384d832304e4398b3fe7859962acbddbfbf5f2bd9d31ae5331cc459aeb85";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL HsOpenSSL-x509-system network socks
-         template-haskell
        ];
        librarySystemDepends = [ openssl ];
        homepage = "https://github.com/glguy/irc-core";
@@ -96778,8 +97077,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack-convert";
-       version = "0.14.6";
-       sha256 = "80a439b06603e48f338ad4a08b0ffc54c0f0f97584a265f5fab5b31d8c03cb1c";
+       version = "1.0.0";
+       sha256 = "b551821123c5ce2d96d97f2ca7a763cb742ea6d8efc051ccf68501eb0cd32051";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96989,6 +97288,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hpc-coveralls_1_0_10" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
+     , containers, curl, directory, directory-tree, hpc, HUnit, process
+     , pureMD5, regex-posix, retry, safe, split, transformers
+     }:
+     mkDerivation {
+       pname = "hpc-coveralls";
+       version = "1.0.10";
+       sha256 = "e222c0d36a6d266205957d0c71e1baeb1581847e79b0b5b9d883a4ef7381d0d9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal cmdargs containers curl directory
+         directory-tree hpc process pureMD5 retry safe split transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base bytestring Cabal cmdargs containers curl directory
+         directory-tree hpc process pureMD5 regex-posix retry safe split
+         transformers
+       ];
+       testHaskellDepends = [ base HUnit ];
+       homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
+       description = "Coveralls.io support for Haskell.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hpc-strobe" = callPackage
     ({ mkDerivation, base, filepath, hpc }:
      mkDerivation {
@@ -101140,8 +101466,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsudoku";
-       version = "0.1.0.0";
-       sha256 = "d4f82611b75c8da0c9ac4ede33c2e22bd23853e54fd09362adc4911047139e29";
+       version = "0.1.0.1";
+       sha256 = "867bbfeb6660321e5a2927091db581f160805315fac22d4a47a43da4e8aa49ac";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101305,6 +101631,23 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "hsyslog_5" = callPackage
+    ({ mkDerivation, base, doctest }:
+     mkDerivation {
+       pname = "hsyslog";
+       version = "5";
+       sha256 = "4d2fca67cec22c14379e35b3d03d5dd09ced4aefd253ef0c7489cb964e58f91a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/peti/hsyslog";
+       description = "FFI interface to syslog(3) from POSIX.1-2001";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "hsyslog-udp" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
      , time, unix
@@ -101849,37 +102192,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http-client_0_4_31_2" = callPackage
-    ({ mkDerivation, array, async, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, exceptions, filepath
-     , ghc-prim, hspec, http-types, mime-types, monad-control, network
-     , network-uri, random, streaming-commons, text, time, transformers
-     , zlib
-     }:
-     mkDerivation {
-       pname = "http-client";
-       version = "0.4.31.2";
-       sha256 = "16410148a9705677cdd89510192caf1abd3460db2a17ce0c2fafd7bd0c15d88b";
-       libraryHaskellDepends = [
-         array base base64-bytestring blaze-builder bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         exceptions filepath ghc-prim http-types mime-types network
-         network-uri random streaming-commons text time transformers
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring blaze-builder bytestring
-         case-insensitive containers deepseq directory hspec http-types
-         monad-control network network-uri streaming-commons text time
-         transformers zlib
-       ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "An HTTP client engine, intended as a base layer for more user-friendly packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "http-client" = callPackage
     ({ mkDerivation, array, async, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
@@ -102041,28 +102353,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http-client-tls_0_2_4_1" = callPackage
-    ({ mkDerivation, base, bytestring, connection, data-default-class
-     , hspec, http-client, http-types, network, tls
-     }:
-     mkDerivation {
-       pname = "http-client-tls";
-       version = "0.2.4.1";
-       sha256 = "8dc85884e15cd32f59a47e11861d78566c6ccb202e8d317403b784278f628ba3";
-       revision = "1";
-       editedCabalFile = "26f1b0cf1b449df4fce7c4531444ff06ccfacae528d20c5470461ecc4058f56c";
-       libraryHaskellDepends = [
-         base bytestring connection data-default-class http-client network
-         tls
-       ];
-       testHaskellDepends = [ base hspec http-client http-types ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "http-client backend using the connection package and tls library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "http-client-tls" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, connection
      , containers, criterion, cryptonite, data-default-class, exceptions
@@ -102086,6 +102376,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client-tls_0_3_4_2" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, connection
+     , containers, criterion, cryptonite, data-default-class, exceptions
+     , hspec, http-client, http-types, memory, network, network-uri
+     , text, tls, transformers
+     }:
+     mkDerivation {
+       pname = "http-client-tls";
+       version = "0.3.4.2";
+       sha256 = "e8bf82330a3c6bd802cc25ff142fb950a1f48eec3f7ad5b4a000445499fdfd4b";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive connection containers cryptonite
+         data-default-class exceptions http-client http-types memory network
+         network-uri text tls transformers
+       ];
+       testHaskellDepends = [ base hspec http-client http-types ];
+       benchmarkHaskellDepends = [ base criterion http-client ];
+       doCheck = false;
+       homepage = "https://github.com/snoyberg/http-client";
+       description = "http-client backend using the connection package and tls library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-common" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , case-insensitive, directory, mtl, network, text, transformers
@@ -102632,6 +102946,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "http-streams_0_8_5_3" = 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.3";
+       sha256 = "cadaf4f52af24bf14bc0b0991c1d040e315622301796db30000da5f67b2ee5e3";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-test" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client, lens
      , lens-aeson, mtl, tasty, tasty-hunit, text, time, wreq
@@ -108985,10 +109333,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "2.2.0.1";
-       sha256 = "6c160d1073ee40b12d294f1e4dbb4691aedb73150eebf027475db05ce1efa20a";
-       revision = "3";
-       editedCabalFile = "25efc74edbc492b37b04370b493ff942fc3d4223d3e1c2368d85c2ad3e166604";
+       version = "2.2.1";
+       sha256 = "ec6275f2076203b7060eb3dfed9b852849efbdf9aa791d1e59b341b5044b52e0";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring hashable primitive
          text time vector
@@ -110481,18 +110827,21 @@ self: {
 
   "jenga" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , http-conduit, http-types, text
+     , http-conduit, http-types, optparse-applicative, text, yaml
      }:
      mkDerivation {
        pname = "jenga";
-       version = "0.1.0.0";
-       sha256 = "4468d8a1c55009b146b8294ab9ed677b5c7a5e3d0fbae1825a5aebcd509412d0";
+       version = "0.1.1.0";
+       sha256 = "1339d5148f1715f9437ec839ffc3714e653005bd707db6a03e044f99f1971629";
+       revision = "1";
+       editedCabalFile = "641105037f2a906a5caa2779b29761381cbfffd522f92988a0743583d425e604";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers http-conduit http-types text
+         yaml
        ];
-       executableHaskellDepends = [ base text ];
+       executableHaskellDepends = [ base optparse-applicative text ];
        homepage = "https://github.com/erikd/jenga";
        description = "Generate a cabal freeze file from a stack.yaml";
        license = stdenv.lib.licenses.bsd2;
@@ -115208,6 +115557,36 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "language-dockerfile_0_3_6_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath, free
+     , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
+     , ShellCheck, split, template-haskell, test-framework
+     , test-framework-hunit, text, th-lift, th-lift-instances
+     , transformers, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "language-dockerfile";
+       version = "0.3.6.0";
+       sha256 = "f68edd01fdc2d779d7defd6c33663b7c7358c489988eae075b4a2d1cd0b71bb7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring directory filepath free Glob mtl parsec
+         pretty ShellCheck split template-haskell text th-lift
+         th-lift-instances transformers unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath free Glob hspec HUnit mtl
+         parsec pretty process QuickCheck ShellCheck split template-haskell
+         test-framework test-framework-hunit text th-lift th-lift-instances
+         transformers unordered-containers yaml
+       ];
+       homepage = "https://github.com/beijaflor-io/language-dockerfile#readme";
+       description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-dot" = callPackage
     ({ mkDerivation, base, mtl, parsec, pretty }:
      mkDerivation {
@@ -124465,8 +124844,8 @@ self: {
      }:
      mkDerivation {
        pname = "maxent-learner-hw";
-       version = "0.2.0";
-       sha256 = "b31cd10081f328599bc655374067ae87d65281ec4d9093d904b9113c85e8de82";
+       version = "0.2.1";
+       sha256 = "84cceef3f6c66ed3065fc7b82093790e46defb0d92e80d87faa321d7201d1101";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124490,8 +124869,8 @@ self: {
      }:
      mkDerivation {
        pname = "maxent-learner-hw-gui";
-       version = "0.2.0";
-       sha256 = "2aaa41682eea2b0c74c3b894ed67db96a467ed1217f098daab880f69e41290ce";
+       version = "0.2.1";
+       sha256 = "e88815835e1390970416e60e0f42a982a7abb891a992ba569c67f8db956fc448";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -126019,6 +126398,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "microformats2-parser_1_0_1_7" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base
+     , base-compat, blaze-html, blaze-markup, bytestring, containers
+     , data-default, either, errors, hspec
+     , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl
+     , network, network-uri, options, pcre-heavy, raw-strings-qq, safe
+     , scotty, tagsoup, template-haskell, text, time, transformers
+     , unordered-containers, vector, wai-cli, wai-extra, xml-lens
+     , xss-sanitize
+     }:
+     mkDerivation {
+       pname = "microformats2-parser";
+       version = "1.0.1.7";
+       sha256 = "def0a462fcfaa344629ee05ced7a93593bad2749148873b4f4c63e3f0c6758f1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-qq attoparsec base base-compat blaze-markup bytestring
+         containers data-default either errors html-conduit lens-aeson
+         network-uri pcre-heavy safe tagsoup text time transformers
+         unordered-containers vector xml-lens xss-sanitize
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base base-compat blaze-html blaze-markup
+         data-default network network-uri options scotty text wai-cli
+         wai-extra
+       ];
+       testHaskellDepends = [
+         aeson-qq base base-compat bytestring data-default hspec
+         hspec-expectations-pretty-diff html-conduit mtl network-uri
+         raw-strings-qq template-haskell text time xml-lens
+       ];
+       homepage = "https://github.com/myfreeweb/microformats2-parser";
+       description = "A Microformats 2 parser";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microformats2-types" = callPackage
     ({ mkDerivation, aeson, base, data-default-class, pandoc-types
      , setters, text, time
@@ -128114,6 +128531,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger-syslog_0_1_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, fast-logger, hsyslog
+     , monad-logger, text, transformers
+     }:
+     mkDerivation {
+       pname = "monad-logger-syslog";
+       version = "0.1.4.0";
+       sha256 = "052c3e13e235e7fb31caecc117e3ab4629e85bbfd3b35ec03f74d732acbc9ccb";
+       libraryHaskellDepends = [
+         base bytestring fast-logger hsyslog monad-logger text transformers
+       ];
+       homepage = "https://github.com/fpco/monad-logger-syslog";
+       description = "syslog output for monad-logger";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-loops" = callPackage
     ({ mkDerivation, base, tasty, tasty-hunit }:
      mkDerivation {
@@ -129623,6 +130057,19 @@ self: {
        license = "LGPL";
      }) {};
 
+  "moving-averages" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "moving-averages";
+       version = "0.2.0.0";
+       sha256 = "368915f86b19a3328ebd14adb2a0822670b5e3aa3dd4a6c07543dd602ae7798b";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/joshuaclayton/moving-averages#readme";
+       description = "This is a library for calculating moving averages on lists of numbers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mp" = callPackage
     ({ mkDerivation, base, binary, bytestring, ConfigFile, daemons
      , directory, filepath, glib, gstreamer, hgettext, MissingH, mtl
@@ -131226,6 +131673,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mustache_2_1_4" = callPackage
+    ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
+     , cmdargs, containers, directory, either, filepath, hspec, lens
+     , mtl, parsec, process, scientific, tar, template-haskell
+     , temporary, text, th-lift, unordered-containers, vector, wreq
+     , yaml, zlib
+     }:
+     mkDerivation {
+       pname = "mustache";
+       version = "2.1.4";
+       sha256 = "1c574cb80701a0acf91d65d8921f26cdc3228b747b7fb351a16da74d10f05cdb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory either filepath mtl
+         parsec scientific template-haskell text th-lift
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs filepath text yaml
+       ];
+       testHaskellDepends = [
+         aeson base base-unicode-symbols bytestring directory filepath hspec
+         lens process tar temporary text unordered-containers wreq yaml zlib
+       ];
+       homepage = "https://github.com/JustusAdam/mustache";
+       description = "A mustache template parser library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mustache-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory
      , optparse-applicative, parsec, pretty-show, scientific, text
@@ -137931,24 +138409,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "optparse-applicative_0_13_1_0" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "optparse-applicative";
-       version = "0.13.1.0";
-       sha256 = "f1fcf9d7e78ddf14083a07d8fe1aa65d75c5102e0d44df981585bce54c5c2a2b";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base process transformers transformers-compat
-       ];
-       testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/pcapriotti/optparse-applicative";
-       description = "Utilities and combinators for parsing command line options";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "optparse-applicative" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck
      , transformers, transformers-compat
@@ -138012,6 +138472,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "optparse-generic_1_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, optparse-applicative, semigroups
+     , system-filepath, text, time, transformers, void
+     }:
+     mkDerivation {
+       pname = "optparse-generic";
+       version = "1.2.0";
+       sha256 = "879295b1aa56f63079b7a776c132e4047d088d21a0120f5dd1d4429619cf1bfe";
+       libraryHaskellDepends = [
+         base bytestring optparse-applicative semigroups system-filepath
+         text time transformers void
+       ];
+       description = "Auto-generate a command-line parser for your datatype";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "optparse-helper" = callPackage
     ({ mkDerivation, base, optparse-applicative }:
      mkDerivation {
@@ -140574,6 +141051,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "partial-isomorphisms_0_2_2_1" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "partial-isomorphisms";
+       version = "0.2.2.1";
+       sha256 = "4c551fa69119e87de1ba0ec7b854f6ed13fb2fe2768db4afff2f8468f0f4a164";
+       libraryHaskellDepends = [ base template-haskell ];
+       homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse";
+       description = "Partial isomorphisms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "partial-lens" = callPackage
     ({ mkDerivation, base, comonad-transformers, data-lens
      , transformers
@@ -143366,6 +143856,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pinch_0_3_1_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "pinch";
+       version = "0.3.1.0";
+       sha256 = "6f8baa41a26fbe46b66a9b8b24886db7e7883e9cf175eb5690cdd043135d85bf";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq ghc-prim hashable text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec hspec-discover QuickCheck text
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/abhinav/pinch#readme";
+       description = "An alternative implementation of Thrift for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pinchot" = callPackage
     ({ mkDerivation, base, containers, Earley, lens, pretty-show
      , semigroups, template-haskell, transformers
@@ -143413,30 +143926,6 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "pipes_4_2_0" = callPackage
-    ({ mkDerivation, base, criterion, mmorph, mtl, optparse-applicative
-     , QuickCheck, test-framework, test-framework-quickcheck2
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pipes";
-       version = "4.2.0";
-       sha256 = "1e407197e94c3c8642fd2c7b4f8e5a3e537844dff2780c396464a47ae0ec0124";
-       revision = "1";
-       editedCabalFile = "1ce0aac0a280be337215bcf2a8b73b081a948bfb93e24045a7e3a3c3e6adfad0";
-       libraryHaskellDepends = [ base mmorph mtl transformers ];
-       testHaskellDepends = [
-         base mtl QuickCheck test-framework test-framework-quickcheck2
-         transformers
-       ];
-       benchmarkHaskellDepends = [
-         base criterion mtl optparse-applicative transformers
-       ];
-       description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "pipes" = callPackage
     ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
      , optparse-applicative, QuickCheck, test-framework
@@ -144069,8 +144558,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-lzma";
-       version = "0.1.1.0";
-       sha256 = "8d5af5806d20ac9b8e0b416a0c36cb6b8039ac55c0cb2831252a8f6c75da01f2";
+       version = "0.1.1.1";
+       sha256 = "24a78698af0437d6b7061141d50cd9ac83b98a81c1d42b5f32a214e87297cd26";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring lzma pipes ];
@@ -146774,8 +147263,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgrest-ws";
-       version = "0.2.0.0";
-       sha256 = "a774a73c7c0bb3ef10e5b96c66749323a9b9244d1e46bcdc3cbd513b9887d42a";
+       version = "0.3.1.0";
+       sha256 = "8216b0f87486335192bc7811dde9564527f03f8c24893af57e916f3b91c07881";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156128,7 +156617,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query-HDBC_0_6_1_0" = callPackage
+  "relational-query-HDBC_0_6_2_0" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, relational-query
      , relational-schemas, template-haskell, th-data-compat
@@ -156136,8 +156625,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.6.1.0";
-       sha256 = "377ce34c521df92099a82915a16b776aa14e9dc0a5c1e644a91150a0d3e29d0c";
+       version = "0.6.2.0";
+       sha256 = "23f792a3249de1dc516be8fa45f0302b7a06139788a423745c2cb1168b983871";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record relational-query relational-schemas
@@ -160782,8 +161271,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.2.0";
-       sha256 = "4964d3c77c2b9ddc0da60a2cbd26820628f796f463ca41d6fc243e3c93ad69bd";
+       version = "2.2.1";
+       sha256 = "1976f73f04b3115d765a475a10d1e92e936077cf484757210fc65ab0bffc49e1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -162326,6 +162815,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "search-algorithms_0_2_0" = callPackage
+    ({ mkDerivation, base, containers, doctest, hspec }:
+     mkDerivation {
+       pname = "search-algorithms";
+       version = "0.2.0";
+       sha256 = "73839172aa5cd99e99e39edada80126fc131f05069e46d0d31c9f3a9441988cf";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers doctest hspec ];
+       homepage = "https://github.com/devonhollowood/search-algorithms#readme";
+       description = "Common graph search algorithms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sec" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -162562,8 +163065,8 @@ self: {
        pname = "selda";
        version = "0.1.6.0";
        sha256 = "f9c615d3f37deb2eb2169d9a901198cb1216ceef576128f9f9b0e0363dd434bd";
-       revision = "1";
-       editedCabalFile = "2adda3c7bbe009fad6df92f2dee2384356e24d2ed0f05ef8c37608635167ab4d";
+       revision = "2";
+       editedCabalFile = "1984c9def6f245d8c7e20f578bbe0dd4217059dcd65901a36b298251f70ecb3f";
        libraryHaskellDepends = [
          base exceptions hashable mtl psqueues text time
          unordered-containers
@@ -164359,8 +164862,8 @@ self: {
        pname = "servant-js";
        version = "0.9.3";
        sha256 = "086905a2c5d8903910b415b71f007c28cb6de9bccc4ab273e7ed944ceeca2cc2";
-       revision = "1";
-       editedCabalFile = "d1012bbe974704eef8d067abd6051846b8262290911c54f87fb1f10f1d9e6dcf";
+       revision = "2";
+       editedCabalFile = "fc952cd50824cfaa61027f1b3addae7659f6ad4a757f1a07cbbce68284d28d54";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164647,6 +165150,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "servant-py" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bytestring, charset
+     , hspec, hspec-expectations, lens, QuickCheck, servant
+     , servant-foreign, text
+     }:
+     mkDerivation {
+       pname = "servant-py";
+       version = "0.1.0.4";
+       sha256 = "a6fb12ea493ea42fb26bfec0c6fa6db6292a1eb38876ad20e311f8e02d678431";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring charset lens servant servant-foreign text
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring hspec hspec-expectations lens
+         QuickCheck servant servant-foreign text
+       ];
+       homepage = "https://github.com/pellagic-puffbomb/servant-py#readme";
+       description = "Automatically derive python functions to query servant webservices";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-quickcheck" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , case-insensitive, clock, data-default-class, hspec, hspec-core
@@ -173379,18 +173905,18 @@ self: {
 
   "stack-run" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, Cabal
-     , conduit, conduit-extra, directory, filepath, MissingH
-     , projectroot, stm, terminal-size, time, vty
+     , conduit, conduit-extra, directory, filepath, MissingH, stm
+     , terminal-size, time, vty
      }:
      mkDerivation {
        pname = "stack-run";
-       version = "0.1.1.3";
-       sha256 = "5e70f11916ca2fe00e86b78ba0aa0762b8fe98b34881247035d25273f41ecaf7";
+       version = "0.1.1.4";
+       sha256 = "7366bb6519949fd7e929a8a6ba04b2877b0fa7a5a1aa1e594ebf0ac59b06ac9b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          ansi-terminal async base bytestring Cabal conduit conduit-extra
-         directory filepath MissingH projectroot stm terminal-size time vty
+         directory filepath MissingH stm terminal-size time vty
        ];
        homepage = "https://github.com/yamadapc/stack-run";
        description = "An equivalent to cabal run for stack";
@@ -174270,8 +174796,8 @@ self: {
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.1.4.0";
-       sha256 = "f09fd5ad180ddac974201de99eaf74ff6d63cc172857f9d41379eb1707eda09a";
+       version = "0.2.0.0";
+       sha256 = "f95cbd5547606c56f31dec76f89a2e33de8c8663fe36cbd55bfb8aa085a9a56b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -176286,14 +176812,18 @@ self: {
      }) {};
 
   "structs" = callPackage
-    ({ mkDerivation, base, deepseq, directory, doctest, filepath
-     , ghc-prim, hlint, parallel, primitive
+    ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory
+     , doctest, filepath, ghc-prim, hlint, parallel, primitive
+     , template-haskell
      }:
      mkDerivation {
        pname = "structs";
-       version = "0";
-       sha256 = "4ba635175f9db39b13d7ba7ecb2158c1c4228f33d0831e9dd48e5e247cda3970";
-       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+       version = "0.1";
+       sha256 = "1f0a20e43bed6a0a0c1e05e442a2f2ce0bd67c277b5e380aac2e17332e834f41";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base deepseq ghc-prim primitive template-haskell
+       ];
        testHaskellDepends = [
          base directory doctest filepath hlint parallel
        ];
@@ -183753,14 +184283,18 @@ self: {
      }) {};
 
   "threepenny-editors" = callPackage
-    ({ mkDerivation, base, profunctors, threepenny-gui }:
+    ({ mkDerivation, base, data-default, generics-sop, profunctors
+     , threepenny-gui
+     }:
      mkDerivation {
        pname = "threepenny-editors";
-       version = "0.2.0.2";
-       sha256 = "cbcfa4cea3f4f72c95fc334b02bda6e3c5657d0b8378b0e307feeb7f9237c95a";
+       version = "0.2.0.5";
+       sha256 = "905090859bd221d51aeba34b691ad84fb9193d52ddd98659093acba16fd5d970";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base profunctors threepenny-gui ];
+       libraryHaskellDepends = [
+         base data-default generics-sop profunctors threepenny-gui
+       ];
        homepage = "https://github.com/pepeiborra/threepenny-editors";
        description = "Composable algebraic editors";
        license = stdenv.lib.licenses.bsd3;
@@ -184316,14 +184850,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "time_1_8_0_1" = callPackage
+  "time_1_8_0_2" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck, random, tasty
      , tasty-hunit, tasty-quickcheck, unix
      }:
      mkDerivation {
        pname = "time";
-       version = "1.8.0.1";
-       sha256 = "2baa9fdc280604413ecaf9761f7fd3443fe69019eec6fdc3e0333501fe701701";
+       version = "1.8.0.2";
+       sha256 = "40642d965caca8c18950f0812e88ae061aa670fc2b3a8bf70e95b74927f11095";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck
@@ -185418,13 +185952,13 @@ self: {
      }:
      mkDerivation {
        pname = "tmapchan";
-       version = "0.0.1";
-       sha256 = "c9c5c7547d8cd430c118a64b794fdb0726284e5ac8b135f87dbf89e1ca514f03";
+       version = "0.0.3";
+       sha256 = "e86db4c2e6cdd373b0cbe91e01d2a223c95d5d36930f5a6c484c1586ae5011e0";
        libraryHaskellDepends = [
          base containers hashable stm unordered-containers
        ];
        homepage = "https://github.com/athanclark/tmapchan#readme";
-       description = "A time-ordered multimap which consumes values as you lookup";
+       description = "An insert-ordered multimap (indexed FIFO) which consumes values as you lookup";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -197104,35 +197638,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "websockets_0_9_8_2" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
-     , blaze-builder, bytestring, case-insensitive, containers, entropy
-     , HUnit, network, QuickCheck, random, SHA, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "websockets";
-       version = "0.9.8.2";
-       sha256 = "09ec17dfbf9f07da27575ce7853b0c80d87ad959c2b271f27be4c4e54615eca2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base base64-bytestring binary blaze-builder bytestring
-         case-insensitive containers entropy network random SHA text
-       ];
-       testHaskellDepends = [
-         attoparsec base base64-bytestring binary blaze-builder bytestring
-         case-insensitive containers entropy HUnit network QuickCheck random
-         SHA test-framework test-framework-hunit test-framework-quickcheck2
-         text
-       ];
-       doCheck = false;
-       homepage = "http://jaspervdj.be/websockets";
-       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "websockets" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, containers, entropy
@@ -197246,16 +197751,18 @@ self: {
 
   "websockets-simple" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, every, exceptions
-     , monad-control, stm, wai-transformers, websockets
+     , hspec, monad-control, stm, tasty, tasty-hspec, wai-transformers
+     , websockets
      }:
      mkDerivation {
        pname = "websockets-simple";
-       version = "0.0.5";
-       sha256 = "5cfcbd9d6d5fe4f6420d8e677dcd3761da53254f6267f6d480fc85ab87191a97";
+       version = "0.0.6";
+       sha256 = "dc1cc1b45c86f6448ff8b1749b6916f32cc2deef547389c27bbd55f5395798f8";
        libraryHaskellDepends = [
          aeson async base bytestring every exceptions monad-control stm
          wai-transformers websockets
        ];
+       testHaskellDepends = [ base hspec stm tasty tasty-hspec ];
        homepage = "https://github.com/athanclark/websockets-simple#readme";
        description = "Simpler interface to the websockets api";
        license = stdenv.lib.licenses.bsd3;
@@ -197278,6 +197785,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "websockets-snap_0_10_2_2" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
+     , mtl, snap-core, snap-server, websockets
+     }:
+     mkDerivation {
+       pname = "websockets-snap";
+       version = "0.10.2.2";
+       sha256 = "bcc3bbb7117a7ced50f83b6ddc31aeb9a1a4df6d1ce0d95662c45a3c577678d8";
+       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
@@ -199529,6 +200053,8 @@ self: {
        pname = "xdcc";
        version = "1.1.4";
        sha256 = "a9c4f4c904bb6d4c634b224eb0587babc60cbee51a9d7ed6a487f138df266464";
+       revision = "1";
+       editedCabalFile = "adf70fcc1a9a57f95976fd6a6b38671e939fb02b8c6f1a73740687e02d27e27e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -201526,6 +202052,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_22_1" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
+     , bytestring, conduit, containers, directory, filepath, hspec
+     , HUnit, libyaml, mockery, resourcet, scientific, semigroups
+     , template-haskell, temporary, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.22.1";
+       sha256 = "dd6c0ae5a641e7fbd1fd9b157a6c1bb9cac2db4701eaef6acbbbf6f41a807b6b";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         filepath resourcet scientific semigroups template-haskell text
+         transformers unordered-containers vector
+       ];
+       libraryPkgconfigDepends = [ libyaml ];
+       executableHaskellDepends = [ aeson base bytestring ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat bytestring conduit directory hspec
+         HUnit mockery resourcet temporary text transformers
+         unordered-containers vector
+       ];
+       homepage = "http://github.com/snoyberg/yaml/";
+       description = "Support for parsing and rendering YAML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libyaml;};
+
   "yaml-combinators" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
      , scientific, tasty, tasty-hunit, text, transformers
@@ -202121,6 +202679,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth_1_4_17_1" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptohash, data-default, email-validate, file-embed
+     , http-client, http-conduit, http-types, lifted-base, mime-mail
+     , network-uri, nonce, persistent, persistent-template, random
+     , resourcet, safe, shakespeare, template-haskell, text, time
+     , transformers, unordered-containers, wai, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.4.17.1";
+       sha256 = "f8787f7aa8550b7b60f0fbf8798a0be644a06fb3b8a47d1aa06bdccecfe43535";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup byteable bytestring conduit
+         conduit-extra containers cryptohash data-default email-validate
+         file-embed http-client http-conduit http-types lifted-base
+         mime-mail network-uri nonce persistent persistent-template random
+         resourcet safe shakespeare template-haskell text time transformers
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-account" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
      , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -202510,6 +203098,41 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-bin_1_5_2_3" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, Cabal, conduit, conduit-extra
+     , containers, data-default-class, deepseq, directory, file-embed
+     , filepath, fsnotify, http-client, http-client-tls
+     , http-reverse-proxy, http-types, lifted-base, network
+     , optparse-applicative, parsec, process, project-template
+     , resourcet, safe-exceptions, say, shakespeare, split, stm
+     , streaming-commons, tar, template-haskell, text, time
+     , transformers, transformers-compat, typed-process, unix-compat
+     , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "yesod-bin";
+       version = "1.5.2.3";
+       sha256 = "eeabc3579d7834c6fc0890c5bdf27c52f84cc2bd3b44b4153f4a9320d3d123f6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder bytestring
+         Cabal conduit conduit-extra containers data-default-class deepseq
+         directory file-embed filepath fsnotify http-client http-client-tls
+         http-reverse-proxy http-types lifted-base network
+         optparse-applicative parsec process project-template resourcet
+         safe-exceptions say shakespeare split stm streaming-commons tar
+         template-haskell text time transformers transformers-compat
+         typed-process unix-compat 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
@@ -202913,6 +203536,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form_1_4_12" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, template-haskell, text, time
+     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-form";
+       version = "1.4.12";
+       sha256 = "731638c1541b112f78ffeef05e11a57f518b6a6a15aa306779f6840e989b8a51";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html blaze-markup
+         byteable bytestring containers data-default email-validate
+         network-uri persistent resourcet semigroups shakespeare
+         template-haskell text time transformers wai xss-sanitize yesod-core
+         yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Form handling support for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
      , unordered-containers, yesod-core, yesod-form
@@ -205226,6 +205874,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "zip-stream" = callPackage
+    ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit
+     , conduit-extra, digest, directory, exceptions, filepath, mtl
+     , primitive, resourcet, time, transformers-base, zlib
+     }:
+     mkDerivation {
+       pname = "zip-stream";
+       version = "0.1";
+       sha256 = "9225a4cf754fad3e7ba96c589bd8fddc50dda42948e70981b1b4b784dba10e17";
+       revision = "1";
+       editedCabalFile = "575cbce9074afa5785c15eeac758e8d50614fb90eb36cb2150ee3e208fb3e979";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary binary-conduit bytestring conduit conduit-extra digest
+         exceptions mtl primitive resourcet time transformers-base zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring conduit conduit-extra directory filepath resourcet
+         time
+       ];
+       description = "ZIP archive streaming using conduits";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "zipedit" = callPackage
     ({ mkDerivation, base, directory, mtl, process }:
      mkDerivation {

From f2e2dde681b851323f885ce6c50e64a3a8cb81e4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 15 May 2017 04:47:38 +0300
Subject: [PATCH 062/206] raspberrypifw: 1.20170303 -> 1.20170427

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

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 50ffe7d25e6..8a6dfff3470 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "raspberrypi-firmware-${version}";
-  version = "1.20170303";
+  version = "1.20170427";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
     rev = version;
-    sha256 = "1s5dycgix97681vpq7ggpc27n865wgv9npzxvbr2q2bp3ia9mcim";
+    sha256 = "0n79nij0rlwjx3zqs4p3wcyrgrgg9gmsf1a526r91c689r5lpwvl";
   };
 
   dontStrip = true;    # Stripping breaks some of the binaries

From a35ec5dda688f6eedbb281671ee11261c769610e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 15 May 2017 05:07:17 +0300
Subject: [PATCH 063/206] linux_rpi: 1.20170303 -> 1.20170427

---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 8 +++++---
 pkgs/top-level/all-packages.nix             | 1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 264d4dffee1..9bc6feb3de2 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  modDirVersion = "4.4.50";
-  tag = "1.20170303";
+  modDirVersion = "4.9.24";
+  tag = "1.20170427";
 in
 stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
   version = "${modDirVersion}-${tag}";
@@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
     owner = "raspberrypi";
     repo = "linux";
     rev = "raspberrypi-kernel_${tag}-1";
-    sha256 = "1lvsr8zm8p1ng4b9vq0nkf2gn4gabla8dh6l60vifclqdcq2vwvx";
+    sha256 = "0f7p2jc3a9yvz7k1fig6fardgz2lvp5kawbb3rfsx2p53yjlhmf9";
   };
 
   features.iwlwifi = true;
@@ -36,6 +36,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
     }
 
     # I am not sure if all of these are correct...
+    copyDTB bcm2708-rpi-0-w.dts bcm2835-rpi-zero.dtb
     copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
     copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb
     copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb
@@ -45,5 +46,6 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
     copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb
     copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
     copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
+    # bcm2710-rpi-cm3.dts is yet unknown.
   '';
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f45a0a87491..88cbd5001ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11745,7 +11745,6 @@ with pkgs;
   linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
     kernelPatches = with kernelPatches; [
       bridge_stp_helper
-      DCCP_double_free_vulnerability_CVE-2017-6074
     ];
   };
 

From 04527cd84b4866bdafbee1141f14c90c1ea20622 Mon Sep 17 00:00:00 2001
From: Stefan Lau <stefan.lau@holidaycheck.com>
Date: Mon, 15 May 2017 12:21:21 +0200
Subject: [PATCH 064/206] chromedriver: allow to install on more systems

---
 .../tools/selenium/chromedriver/default.nix   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 488fefe62c4..66e3901c33e 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchurl, cairo, fontconfig, freetype, gdk_pixbuf, glib
 , glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf
-, libXi, libXrender, libXext
+, libXi, libXrender, libXext, lib
 }:
-
-# note: there is a i686 version available as well
-assert stdenv.system == "x86_64-linux";
-
+let
+  spec = if stdenv.system == "i686-linux" then { system="linux32"; sha256="5d267a8d59f18f1134966e312997b75976f8d816318b5b79b8357a3ac2c022da"; }
+    else if stdenv.system == "x86_64-linux" then { system="linux64"; sha256="d011749e76305b5591b5500897939b33fac460d705d9815b8c03c53b0e1ecc7c"; }
+    else if stdenv.system == "x86_64-darwin" then { system="mac64"; sha256="e95fb36ab85264e16c51d58dd9766624eca6b6339569da0460088f4c788c67ad"; }
+    else abort "missing chromedriver binary for ${stdenv.system}";
+in
 stdenv.mkDerivation rec {
-  product = "chromedriver_linux64";
-  name = "${product}-2.25";
+  name = "chromedriver-${version}";
   version = "2.25";
 
   src = fetchurl {
-    url = "http://chromedriver.storage.googleapis.com/${version}/${product}.zip";
-    sha256 = "0z6c3q73pi83iidq3n85sxhc9yikkf9rf22hnn8manrhfsg784fh";
+    url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";
+    sha256 = spec.sha256;
   };
 
   buildInputs = [ unzip makeWrapper ];
@@ -23,9 +24,9 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     mv chromedriver $out/bin
-    patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
-    wrapProgram "$out/bin/chromedriver" \
-      --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype gdk_pixbuf glib gtk2 libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH"
+    ${lib.optionalString (!stdenv.isDarwin) "patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver"}
+    ${lib.optionalString (!stdenv.isDarwin) ''wrapProgram "$out/bin/chromedriver" \
+      --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype gdk_pixbuf glib gtk2 libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH"''}
   '';
 
   meta = with stdenv.lib; {
@@ -33,6 +34,6 @@ stdenv.mkDerivation rec {
     description = "A WebDriver server for running Selenium tests on Chrome";
     license = licenses.bsd3;
     maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From e5a4da2ab8687c52d140653cc0fb17e2344f48a6 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 12 May 2017 08:36:25 +0200
Subject: [PATCH 065/206] python-pytest-xdist: fix tests

---
 .../python-modules/pytest-xdist/default.nix   | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +-----------
 2 files changed, 30 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytest-xdist/default.nix

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
new file mode 100644
index 00000000000..05f4d5bd1f2
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchzip, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pytest-xdist";
+  version = "1.14";
+
+  src = fetchzip {
+    url = "mirror://pypi/p/pytest-xdist/${name}.zip";
+    sha256 = "18j6jq4r47cbbgnci0bbp0kjr9w12hzw7fh4dmsbm072jmv8c0gx";
+  };
+
+  buildInputs = [ pytest setuptools_scm ];
+  propagatedBuildInputs = [ execnet ];
+
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    rm testing/acceptance_test.py testing/test_remote.py testing/test_slavemanage.py
+  '';
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
+    homepage = https://github.com/pytest-dev/pytest-xdist;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fcef975b048..4093dac55c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5297,23 +5297,7 @@ in {
     };
   };
 
-  pytest_xdist = buildPythonPackage rec {
-    name = "pytest-xdist-1.14";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest-xdist/${name}.zip";
-      sha256 = "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja";
-    };
-
-    buildInputs = with self; [ pytest setuptools_scm ];
-    propagatedBuildInputs = with self; [ execnet ];
-
-    meta = {
-      description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
-      homepage = https://github.com/pytest-dev/pytest-xdist;
-      license = licenses.mit;
-    };
-  };
+  pytest_xdist = callPackage ../development/python-modules/pytest-xdist { };
 
   pytest-localserver = buildPythonPackage rec {
     name = "pytest-localserver-${version}";

From f1ab9f3175c7b0fabe66115fd9473968a44a32fd Mon Sep 17 00:00:00 2001
From: Antonio Malara <antonio.malara@gmail.com>
Date: Mon, 15 May 2017 14:23:50 +0200
Subject: [PATCH 066/206] removing the advise to add virtualbox's guest
 additions in configuration.nix

... because `nixos-generate-config` currently understand it's running under virtualbox, and correctly adds the configuration in `/etc/nixos/hardware-configuration.nix`
---
 .../installation/installing-virtualbox-guest.xml       | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
index 8fe61a5fdfd..ee9680ced39 100644
--- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml
+++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
@@ -37,15 +37,7 @@
 </orderedlist>
 
 <para>
-  There are a few modifications you should make in configuration.nix. Enable
-  the virtualbox guest service in the main block:
-</para>
-
-<programlisting>
-virtualisation.virtualbox.guest.enable = true;
-</programlisting>
-
-<para>
+  There are a few modifications you should make in configuration.nix.
   Enable booting:
 </para>
 

From 37cb24a318f1c54f2a84cbca84c9bfb1d500289c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 15 May 2017 14:36:30 +0200
Subject: [PATCH 067/206] python.pkgs.pytest_xdist: 1.14 -> 1.16.0

---
 .../python-modules/pytest-xdist/default.nix    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 05f4d5bd1f2..b3577908cf9 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, fetchzip, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm }:
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-xdist";
-  version = "1.14";
+  version = "1.16.0";
 
-  src = fetchzip {
-    url = "mirror://pypi/p/pytest-xdist/${name}.zip";
-    sha256 = "18j6jq4r47cbbgnci0bbp0kjr9w12hzw7fh4dmsbm072jmv8c0gx";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "42e5a1e5da9d7cff3e74b07f8692598382f95624f234ff7e00a3b1237e0feba2";
   };
 
   buildInputs = [ pytest setuptools_scm ];
   propagatedBuildInputs = [ execnet ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = ''
     rm testing/acceptance_test.py testing/test_remote.py testing/test_slavemanage.py
   '';
 
   checkPhase = ''
-    py.test
+    py.test testing
   '';
 
+  # Only test on 3.x
+  # INTERNALERROR> AttributeError: 'NoneType' object has no attribute 'getconsumer'
+  doCheck = isPy3k;
+
   meta = with stdenv.lib; {
     description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
     homepage = https://github.com/pytest-dev/pytest-xdist;

From 72e50645a36264ab2ead636c6f547109879f78a2 Mon Sep 17 00:00:00 2001
From: Robin Stumm <serverkorken@gmail.com>
Date: Mon, 15 May 2017 15:09:50 +0200
Subject: [PATCH 068/206] znapzend service: fix autostart

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

diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index 35c0308c9dc..a980ac1b3b0 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -18,6 +18,7 @@ in
     systemd.services = {
       "znapzend" = {
         description = "ZnapZend - ZFS Backup System";
+        wantedBy    = [ "zfs.target" ];
         after       = [ "zfs.target" ];
 
         path = with pkgs; [ zfs mbuffer openssh ];
@@ -28,6 +29,5 @@ in
         };
       };
     };
-
   };
 }

From 9e4c74b20289ccd757a7979d1805864c9a6db307 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 15 May 2017 14:03:44 -0400
Subject: [PATCH 069/206] kubernetes-helm: 2.3.1 -> 2.4.1

---
 .../networking/cluster/helm/default.nix             | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 2a0616f3094..8268b3baa98 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -4,17 +4,18 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if stdenv.isLinux
-             then "17fya0d1v2w44df5n5xb99vr8qjbnbfjvicsi9p7yz4iz2mcymd6"
-             else "0299ffws37d60wim8kvdp4xrvqxa93sggrprgrsiclcp8bab0dcr";
-in
-stdenv.mkDerivation rec {
+             then "0vjkcilxzwvkgcczcbq58nl2j17ddqiysxm5yl13agnmxzvxw6r2"
+             else "1ga9gxzji48vhbaa0pkxd03h89zgjsbikbki9xla1qbvyvqjnw5g";
+
   pname = "helm";
-  version = "2.3.1";
+  version = "2.4.1";
+in
+stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://kubernetes-helm.storage.googleapis.com/helm-v${version}-${arch}.tar.gz";
-    sha256 = "${checksum}";
+    sha256 = checksum;
   };
 
   preferLocalBuild = true;

From 4187d31ab70202c00a677fb0b10aa702d59e9ad0 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 15 May 2017 20:10:45 +0200
Subject: [PATCH 070/206] elixir: 1.4.2 -> 1.4.4

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

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 31a58bcde11..0e77b2af252 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "elixir-${version}";
-  version = "1.4.2";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "elixir";
     rev = "v${version}";
-    sha256 = "0jqww3l5jgqvlqpp6lh8i55v23a5imw4giarr05gsl7imv2qqshz";
+    sha256 = "0m51cirkv1dahw4z2jlmz58cwmpy0dya88myx4wykq0v5bh1xbq8";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];

From b8e629e6645ac2162eb9e9842cd05d72738db5fd Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 15 May 2017 20:15:31 +0200
Subject: [PATCH 071/206] rustRegistry: 2017-05-03 -> 2017-05-15

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 4e57368fa1e..db147fa9ca9 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2017-05-03";
-  rev = "dbc41da97da0a504d83af656b5d354ab5cf033e6";
-  sha256 = "1kmy0hr155gcmilvwaj4ak5ppszrympyia7zxwhfihh00mip7xkb";
+  version = "2017-05-15";
+  rev = "c73d61e84a623168a1a9bfff9c71defcc3416631";
+  sha256 = "0c2f4f48bacx0lq33bjw806fq5r4nvbrxvl74n7gd2y44ldafnir";
 
   src = fetchFromGitHub {
       inherit rev;

From 56393d447100a379b963a41fb218e9c3f67d0f7f Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 15 May 2017 20:16:57 +0200
Subject: [PATCH 072/206] ripgrep: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index abcd616aef9..da7c5b593e3 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "ripgrep-${version}";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = "${version}";
-    sha256 = "1fbvc419gh1rix8v3bh9a63r993kvfizp49p5ps6y22wggpy0k77";
+    sha256 = "128sfczms14zgfbhgmf84jjlivd4q6i581rxirhz3kmpnnby18rz";
   };
 
-  depsSha256 = "0vyrcgcmlf3lbp15nip2cm8xv4n6qldfbl0iwy3jb69i2mazi6nm";
+  depsSha256 = "1kjmv4bn5sicx8g5gyzq2zhxmqsqlgckhcg4ypvnjmcyq1ifiv2m";
 
   preFixup = ''
     mkdir -p "$out/man/man1"

From cf726bc31abac068180173b0de8a899c2f3edd40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 14 May 2017 21:52:58 +0100
Subject: [PATCH 073/206] metasploit: 3.3.1 -> 4.14.17

use bundler env now

fixes #8870
---
 pkgs/tools/security/metasploit/Gemfile      |   4 +
 pkgs/tools/security/metasploit/Gemfile.lock | 264 ++++++++
 pkgs/tools/security/metasploit/default.nix  |  49 +-
 pkgs/tools/security/metasploit/gemset.nix   | 708 ++++++++++++++++++++
 pkgs/tools/security/metasploit/shell.nix    |  14 +
 5 files changed, 1023 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/tools/security/metasploit/Gemfile
 create mode 100644 pkgs/tools/security/metasploit/Gemfile.lock
 create mode 100644 pkgs/tools/security/metasploit/gemset.nix
 create mode 100644 pkgs/tools/security/metasploit/shell.nix

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
new file mode 100644
index 00000000000..52987d4bf8c
--- /dev/null
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+source "https://rubygems.org"
+
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/4.14.17"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
new file mode 100644
index 00000000000..f19dc8b068e
--- /dev/null
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -0,0 +1,264 @@
+GIT
+  remote: https://github.com/rapid7/metasploit-framework
+  revision: fd3da8f3350d6cf7f0449bf0ead4d51747525c0a
+  ref: refs/tags/4.14.17
+  specs:
+    metasploit-framework (4.14.17)
+      actionpack (~> 4.2.6)
+      activerecord (~> 4.2.6)
+      activesupport (~> 4.2.6)
+      bcrypt
+      bit-struct
+      filesize
+      jsobfu
+      json
+      metasm
+      metasploit-concern
+      metasploit-credential
+      metasploit-model
+      metasploit-payloads (= 1.2.29)
+      metasploit_data_models
+      metasploit_payloads-mettle (= 0.1.9)
+      msgpack
+      nessus_rest
+      net-ssh
+      network_interface
+      nexpose
+      nokogiri
+      octokit
+      openssl-ccm
+      openvas-omp
+      packetfu
+      patch_finder
+      pcaprub
+      pg
+      railties
+      rb-readline
+      recog
+      redcarpet
+      rex-arch (= 0.1.4)
+      rex-bin_tools
+      rex-core
+      rex-encoder
+      rex-exploitation
+      rex-java
+      rex-mime
+      rex-nop
+      rex-ole
+      rex-powershell
+      rex-random_identifier
+      rex-registry
+      rex-rop_builder
+      rex-socket
+      rex-sslscan
+      rex-struct2
+      rex-text
+      rex-zip
+      robots
+      ruby_smb
+      rubyntlm
+      rubyzip
+      sqlite3
+      sshkey
+      tzinfo
+      tzinfo-data
+      windows_error
+      xmlrpc
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
+      builder (~> 3.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
+      arel (~> 6.0)
+    activesupport (4.2.8)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    arel (6.0.4)
+    arel-helpers (2.3.0)
+      activerecord (>= 3.1.0, < 6)
+    bcrypt (3.1.11)
+    bindata (2.4.0)
+    bit-struct (0.16)
+    builder (3.2.3)
+    erubis (2.7.0)
+    faraday (0.12.1)
+      multipart-post (>= 1.2, < 3)
+    filesize (0.1.1)
+    i18n (0.8.1)
+    jsobfu (0.4.2)
+      rkelly-remix
+    json (2.1.0)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    metasm (1.0.3)
+    metasploit-concern (2.0.4)
+      activemodel (~> 4.2.6)
+      activesupport (~> 4.2.6)
+      railties (~> 4.2.6)
+    metasploit-credential (2.0.9)
+      metasploit-concern
+      metasploit-model
+      metasploit_data_models
+      pg
+      railties
+      rubyntlm
+      rubyzip
+    metasploit-model (2.0.4)
+      activemodel (~> 4.2.6)
+      activesupport (~> 4.2.6)
+      railties (~> 4.2.6)
+    metasploit-payloads (1.2.29)
+    metasploit_data_models (2.0.14)
+      activerecord (~> 4.2.6)
+      activesupport (~> 4.2.6)
+      arel-helpers
+      metasploit-concern
+      metasploit-model
+      pg
+      postgres_ext
+      railties (~> 4.2.6)
+      recog (~> 2.0)
+    metasploit_payloads-mettle (0.1.9)
+    mini_portile2 (2.1.0)
+    minitest (5.10.2)
+    msgpack (1.1.0)
+    multipart-post (2.0.0)
+    nessus_rest (0.1.6)
+    net-ssh (4.1.0)
+    network_interface (0.0.1)
+    nexpose (6.0.0)
+    nokogiri (1.7.2)
+      mini_portile2 (~> 2.1.0)
+    octokit (4.7.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    openssl-ccm (1.2.1)
+    openvas-omp (0.0.4)
+    packetfu (1.1.13)
+      pcaprub
+    patch_finder (1.0.2)
+    pcaprub (0.12.4)
+    pg (0.20.0)
+    pg_array_parser (0.0.9)
+    postgres_ext (3.0.0)
+      activerecord (>= 4.0.0)
+      arel (>= 4.0.1)
+      pg_array_parser (~> 0.0.9)
+    public_suffix (2.0.5)
+    rack (1.6.6)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    rb-readline (0.5.4)
+    recog (2.1.6)
+      nokogiri
+    redcarpet (3.4.0)
+    rex-arch (0.1.4)
+      rex-text
+    rex-bin_tools (0.1.3)
+      metasm
+      rex-arch
+      rex-core
+      rex-struct2
+      rex-text
+    rex-core (0.1.10)
+    rex-encoder (0.1.4)
+      metasm
+      rex-arch
+      rex-text
+    rex-exploitation (0.1.14)
+      jsobfu
+      metasm
+      rex-arch
+      rex-encoder
+      rex-text
+    rex-java (0.1.5)
+    rex-mime (0.1.5)
+      rex-text
+    rex-nop (0.1.1)
+      rex-arch
+    rex-ole (0.1.6)
+      rex-text
+    rex-powershell (0.1.72)
+      rex-random_identifier
+      rex-text
+    rex-random_identifier (0.1.2)
+      rex-text
+    rex-registry (0.1.3)
+    rex-rop_builder (0.1.3)
+      metasm
+      rex-core
+      rex-text
+    rex-socket (0.1.6)
+      rex-core
+    rex-sslscan (0.1.4)
+      rex-socket
+      rex-text
+    rex-struct2 (0.1.2)
+    rex-text (0.2.15)
+    rex-zip (0.1.3)
+      rex-text
+    rkelly-remix (0.0.7)
+    robots (0.10.1)
+    ruby_smb (0.0.12)
+      bindata
+      rubyntlm
+      windows_error
+    rubyntlm (0.6.2)
+    rubyzip (1.2.1)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    sqlite3 (1.3.13)
+    sshkey (1.9.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2017.2)
+      tzinfo (>= 1.0.0)
+    windows_error (0.1.2)
+    xmlrpc (0.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  metasploit-framework!
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 41d9934191d..5e21996caac 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -1,34 +1,51 @@
-{ stdenv, fetchurl, makeWrapper, ruby }:
+{ stdenv, fetchFromGitHub, makeWrapper, ruby, bundlerEnv, ncurses }:
 
-stdenv.mkDerivation rec {
+# Maintainer notes for updating:
+# 1. increment version number in expression and in Gemfile
+# 2. run $ nix-shell --command "bundler install && bundix"
+#    in metasploit in nixpkgs
+
+let
+  env = bundlerEnv {
+    inherit ruby;
+    name = "metasploit-bundler-env";
+    gemdir = ./.;
+  };
+in stdenv.mkDerivation rec {
   name = "metasploit-framework-${version}";
-  version = "3.3.1";
+  version = "4.14.17";
 
-  src = fetchurl {
-    url = "http://downloads.metasploit.com/data/releases/archive/framework-${version}.tar.bz2";
-    sha256 = "07clzw1zfnqjhyydsc4mza238isai58p7aygh653qxsqb9a0j7qw";
+  src = fetchFromGitHub {
+    owner = "rapid7";
+    repo = "metasploit-framework";
+    rev = version;
+    sha256 = "0g666lxin9f0v9vhfh3s913ym8fnh32rpfl1rpj8d8n1azch5fn0";
   };
 
-  buildInputs = [makeWrapper];
+  buildInputs = [ makeWrapper ];
+
+  dontPatchelf = true; # stay away from exploit executables
 
   installPhase = ''
-    mkdir -p $out/share/msf
-    mkdir -p $out/bin
+    mkdir -p $out/{bin,share/msf}
 
     cp -r * $out/share/msf
 
     for i in $out/share/msf/msf*; do
-        makeWrapper $i $out/bin/$(basename $i) --prefix RUBYLIB : $out/share/msf/lib
+      bin=$out/bin/$(basename $i)
+      cat > $bin <<EOF
+#!/bin/sh -e
+exec ${env}/bin/bundle exec ${ruby}/bin/ruby $i "\$@"
+EOF
+      chmod +x $bin
     done
   '';
 
-  postInstall = ''
-    patchShebangs $out/share/msf
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "Metasploit Framework - a collection of exploits";
     homepage = https://github.com/rapid7/metasploit-framework/wiki;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.makefu ];
   };
 }
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
new file mode 100644
index 00000000000..f4e4b91fcd9
--- /dev/null
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -0,0 +1,708 @@
+{
+  actionpack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09fbazl0ja80na2wadfp3fzmdmdy1lsb4wd2yg7anbj0zk0ap7a9";
+      type = "gem";
+    };
+    version = "4.2.8";
+  };
+  actionview = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mg4a8143q2wjhjq4mngl69jkv249z5jvg0jkdribdv4zkg586rp";
+      type = "gem";
+    };
+    version = "4.2.8";
+  };
+  activemodel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11vhh7zmp92880s5sx8r32v2p0b7xg039mfr92pjynpkz4q901ld";
+      type = "gem";
+    };
+    version = "4.2.8";
+  };
+  activerecord = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kk4dhn8jfhqfsf1dmb3a183gix6k46xr6cjkxj0rp51w2za1ns0";
+      type = "gem";
+    };
+    version = "4.2.8";
+  };
+  activesupport = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wibdzd2f5l5rlsw1a1y3j3fhw2imrrbkxggdraa6q9qbdnc66hi";
+      type = "gem";
+    };
+    version = "4.2.8";
+  };
+  addressable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh";
+      type = "gem";
+    };
+    version = "2.5.1";
+  };
+  arel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4";
+      type = "gem";
+    };
+    version = "6.0.4";
+  };
+  arel-helpers = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k8hqa2505b2s3w6gajh2lvi2mn832yqldiy2z4c55phzkmr08sr";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  bcrypt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d254sdhdj6mzak3fb5x3jam8b94pvl1srladvs53j05a89j5z50";
+      type = "gem";
+    };
+    version = "3.1.11";
+  };
+  bindata = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10sii2chgnkp2jw830sbr2wb20p8p1wcwrl9jhadkw94f505qcyg";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  bit-struct = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1w7x1fh4a6inpb46imhdf4xrq0z4d6zdpg7sdf8n98pif2hx50sx";
+      type = "gem";
+    };
+    version = "0.16";
+  };
+  builder = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
+      type = "gem";
+    };
+    version = "3.2.3";
+  };
+  erubis = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
+  faraday = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wkx9844vacsk2229xbc27djf6zw15kqd60ifr78whf9mp9v6l03";
+      type = "gem";
+    };
+    version = "0.12.1";
+  };
+  filesize = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "061qmg82mm9xnmnq3b7gbi24g28xk62w0b0nw86gybd07m1jn989";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  i18n = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s6971zmjxszdrp59vybns9gzxpdxzdklakc5lp8nl4fx5kpxkbp";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  jsobfu = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hchns89cfj0gggm2zbr7ghb630imxm2x2d21ffx2jlasn9xbkyk";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  loofah = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8";
+      type = "gem";
+    };
+    version = "2.0.3";
+  };
+  metasm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gss57q4lv6l0jkih77zffrpjjzgkdcsy7b9nvvawyzknis9w4s5";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  metasploit-concern = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kqby5ycxhr0jfzvjqkdgjbqqjrg8jlmcxw8myrm0875hybyl1mq";
+      type = "gem";
+    };
+    version = "2.0.4";
+  };
+  metasploit-credential = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y36f1f4nw0imhfbckl213ah7qgfldrkv2fpv2acslb6iqiaa3gk";
+      type = "gem";
+    };
+    version = "2.0.9";
+  };
+  metasploit-framework = {
+    source = {
+      fetchSubmodules = false;
+      rev = "fd3da8f3350d6cf7f0449bf0ead4d51747525c0a";
+      sha256 = "1r04drq34qfbhmhp0mqnm13vrycr7dcq670zk8xqiif5rhbij6qv";
+      type = "git";
+      url = "https://github.com/rapid7/metasploit-framework";
+    };
+    version = "4.14.17";
+  };
+  metasploit-model = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05pnai1cv00xw87rrz38dz4s3ss45s90290d0knsy1mq6rp8yvmw";
+      type = "gem";
+    };
+    version = "2.0.4";
+  };
+  metasploit-payloads = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c6wvnxgwdiryz5skzrp2wcfbxp57icaclckjcaxlw63v09wgjii";
+      type = "gem";
+    };
+    version = "1.2.29";
+  };
+  metasploit_data_models = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hb2wsz3d4xgjf6dlf7nzxlv6q7rcdgn1pj79xs3g8al38zi129g";
+      type = "gem";
+    };
+    version = "2.0.14";
+  };
+  metasploit_payloads-mettle = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "058ijqznh4xqx3d6dph5gwdsmj96z4n46rl1mm85fyxpgpkifqd1";
+      type = "gem";
+    };
+    version = "0.1.9";
+  };
+  mini_portile2 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  minitest = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11my86fnihvpndyknn3c14hc82nhsgggnhlxh8h3bdjpmfsvl0my";
+      type = "gem";
+    };
+    version = "5.10.2";
+  };
+  msgpack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ck7w17d6b4jbb8inh1q57bghi9cjkiaxql1d3glmj1yavbpmlh7";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  multipart-post = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  nessus_rest = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1allyrd4rll333zbmsi3hcyg6cw1dhc4bg347ibsw191nswnp8ci";
+      type = "gem";
+    };
+    version = "0.1.6";
+  };
+  net-ssh = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q";
+      type = "gem";
+    };
+    version = "4.1.0";
+  };
+  network_interface = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ir4c1vbz1y0gxyih024262i7ig1nji1lkylcrn9pjzx3798p97a";
+      type = "gem";
+    };
+    version = "0.0.1";
+  };
+  nexpose = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jdhhzzs3b3rav6imx8jn9920cjj83yjvz35q169y0ppla2xzqbg";
+      type = "gem";
+    };
+    version = "6.0.0";
+  };
+  nokogiri = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jd8q3pr5rkrxx1vklvhcqcgl8kmfv5c8ny36ni3z5mirw6cm70c";
+      type = "gem";
+    };
+    version = "1.7.2";
+  };
+  octokit = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h6cm7bi0y7ysjgwws3paaipqdld6c0m0niazrjahhpz88qqq1g4";
+      type = "gem";
+    };
+    version = "4.7.0";
+  };
+  openssl-ccm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18h5lxv0zh4j2f0wnhdmfz63x02vbzbq2k1clz6kzr0q83h8kj9c";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  openvas-omp = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14xf614vd76qjdjxjv14mmjar6s64fwp4cwb7bv5g1wc29srg28x";
+      type = "gem";
+    };
+    version = "0.0.4";
+  };
+  packetfu = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16ppq9wfxq4x2hss61l5brs3s6fmi8gb50mnp1nnnzb1asq4g8ll";
+      type = "gem";
+    };
+    version = "1.1.13";
+  };
+  patch_finder = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1md9scls55n1riw26vw1ak0ajq38dfygr36l0h00wqhv51cq745m";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  pcaprub = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pl4lqy7308185pfv0197n8b4v20fhd0zb3wlpz284rk8ssclkvz";
+      type = "gem";
+    };
+    version = "0.12.4";
+  };
+  pg = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03xcgwjs6faxis81jxf2plnlalg55dhhafqv3kvjxfr8ic7plpw5";
+      type = "gem";
+    };
+    version = "0.20.0";
+  };
+  pg_array_parser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1034dhg8h53j48sfm373js54skg4vpndjga6hzn2zylflikrrf3s";
+      type = "gem";
+    };
+    version = "0.0.9";
+  };
+  postgres_ext = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lbp1qf5s1addhznm7d4bzks9adh7jpilgcsr8k7mbd0a1ailcgc";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  public_suffix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+      type = "gem";
+    };
+    version = "2.0.5";
+  };
+  rack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "073d6rjgqfb4xjhbshyrflqgbdvxqvx4b907j2d4mi5qgbv8y2ax";
+      type = "gem";
+    };
+    version = "1.6.6";
+  };
+  rack-test = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
+      type = "gem";
+    };
+    version = "0.6.3";
+  };
+  rails-deprecated_sanitizer = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  rails-dom-testing = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ny7mbjxhq20rzg4pivvyvk14irmc7cn20kxfk3vc0z2r2c49p8r";
+      type = "gem";
+    };
+    version = "1.0.8";
+  };
+  rails-html-sanitizer = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  railties = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bavl4hj7bnl3ryqi9rvykm410kflplgingkcxasfv1gdilddh4g";
+      type = "gem";
+    };
+    version = "4.2.8";
+  };
+  rake = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
+      type = "gem";
+    };
+    version = "12.0.0";
+  };
+  rb-readline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "170m6d2298s9kfbd4y3zzj4irsnd15qlbgi6kk93m88lkh9qzy3a";
+      type = "gem";
+    };
+    version = "0.5.4";
+  };
+  recog = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08ypzrn40jbjbzwdbbjkcqdm74zlsc0yr2iqs0yn479fa5k8ajw4";
+      type = "gem";
+    };
+    version = "2.1.6";
+  };
+  redcarpet = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
+      type = "gem";
+    };
+    version = "3.4.0";
+  };
+  rex-arch = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y2mzv6wkqgclxl1x65mdq4d0lcgbbny4r1v24c16gi4jg9nsnc1";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  rex-bin_tools = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0skrbpyal6anh4g1nsaf9ypg5sd2ghxxmghasxw4p1s1i1xbmhwr";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
+  rex-core = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09xbslrwbc9d0rp24y1pdgc6650ciwicq4q7skjz74rprr9wj16f";
+      type = "gem";
+    };
+    version = "0.1.10";
+  };
+  rex-encoder = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zm5jdxgyyp8pkfqwin34izpxdrmglx6vmk20ifnvcsm55c9m70z";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  rex-exploitation = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gbj28jqaaldpk4qzysgcl6m0wcqx3gcldarqdk55p5z9zasrk19";
+      type = "gem";
+    };
+    version = "0.1.14";
+  };
+  rex-java = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j58k02p5g9snkpak64sb4aymkrvrh9xpqh8wsnya4w7b86w2y6i";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
+  rex-mime = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15a14kz429h7pn81ysa6av3qijxjmxagjff6dyss5v394fxzxf4a";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
+  rex-nop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0aigf9qsqsmiraa6zvfy1a7cyvf7zc3iyhzxi6fjv5sb8f64d6ny";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  rex-ole = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pnzbqfnvbs0vc0z0ryszk3fxhgxrjd6gzwqa937rhlphwp5jpww";
+      type = "gem";
+    };
+    version = "0.1.6";
+  };
+  rex-powershell = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nl60fdd1rlckk95d3s3y873w84vb0sgwvwxdzv414qxz8icpjnm";
+      type = "gem";
+    };
+    version = "0.1.72";
+  };
+  rex-random_identifier = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cksrljaw61mdjvbmj9vqqhd8nra7jv466w5nim47n73rj72jc19";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  rex-registry = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wv812ghnz143vx10ixmv32ypj1xrzr4rh4kgam8d8wwjwxsgw1q";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
+  rex-rop_builder = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xjd3d6wnbq4ym0d0m268md8fb16f2hbwrahvxnl14q63fj9i3wy";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
+  rex-socket = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0r39782f2qpq83wsi72213v344gq4rccch98i376fx8bayh0dygh";
+      type = "gem";
+    };
+    version = "0.1.6";
+  };
+  rex-sslscan = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0r5cy1kng1ggjycn7a8vpval7clhr0yxhd7rgn2hasxl2p3c7i8v";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  rex-struct2 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nbdn53264a20cr2m2nq2v4mg0n33dvrd1jj1sixl37qjzw2k452";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  rex-text = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "024miva867h4wv4y1lnxxrw2d7p51va32ismxqf3fsz4s9cqc88m";
+      type = "gem";
+    };
+    version = "0.2.15";
+  };
+  rex-zip = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mbfryyhcw47i7jb8cs8vilbyqgyiyjkfl1ngl6wdbf7d87dwdw7";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
+  rkelly-remix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g7hjl9nx7f953y7lncmfgp0xgxfxvgfm367q6da9niik6rp1y3j";
+      type = "gem";
+    };
+    version = "0.0.7";
+  };
+  robots = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "141gvihcr2c0dpzl3dqyh8kqc9121prfdql2iamaaw0mf9qs3njs";
+      type = "gem";
+    };
+    version = "0.10.1";
+  };
+  ruby_smb = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v2acyx6csndb08sidb1pbixn2dlx9s75cpnjv4riwj0qlp8blli";
+      type = "gem";
+    };
+    version = "0.0.12";
+  };
+  rubyntlm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy";
+      type = "gem";
+    };
+    version = "0.6.2";
+  };
+  rubyzip = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  sawyer = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  sqlite3 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
+      type = "gem";
+    };
+    version = "1.3.13";
+  };
+  sshkey = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
+  thor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns";
+      type = "gem";
+    };
+    version = "0.19.4";
+  };
+  thread_safe = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  tzinfo = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05r81lk7q7275rdq7xipfm0yxgqyd2ggh73xpc98ypngcclqcscl";
+      type = "gem";
+    };
+    version = "1.2.3";
+  };
+  tzinfo-data = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n83rmy476d4qmzq74qx0j7lbcpskbvrj1bmy3np4d5pydyw2yky";
+      type = "gem";
+    };
+    version = "1.2017.2";
+  };
+  windows_error = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kbcv9j5sc7pvjzf1dkp6h69i6lmj205zyy2arxcfgqg11bsz2kp";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  xmlrpc = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s744iwblw262gj357pky3d9fcx9hisvla7rnw29ysn5zsb6i683";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+}
diff --git a/pkgs/tools/security/metasploit/shell.nix b/pkgs/tools/security/metasploit/shell.nix
new file mode 100644
index 00000000000..7d1b66ba419
--- /dev/null
+++ b/pkgs/tools/security/metasploit/shell.nix
@@ -0,0 +1,14 @@
+# Env to update Gemfile.lock / gemset.nix
+with import <nixpkgs> {};
+stdenv.mkDerivation {
+  name = "env";
+  buildInputs = [
+    sqlite
+    libpcap
+    postgresql
+    libxml2
+    libxslt
+    pkgconfig
+    bundix
+  ];
+}

From ec6e29fa696b87ea5f8de3823a7a97df3c406c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 15 May 2017 21:48:13 +0100
Subject: [PATCH 074/206] msf: add metasploit alias

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5177932fda..27ac70a818f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3078,7 +3078,8 @@ with pkgs;
 
   mscgen = callPackage ../tools/graphics/mscgen { };
 
-  msf = callPackage ../tools/security/metasploit { };
+  metasploit = callPackage ../tools/security/metasploit { };
+  msf = metasploit;
 
   ms-sys = callPackage ../tools/misc/ms-sys { };
 

From b496ffbe55f1a0604bfcf0eeb92a48f2fd504d03 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Tue, 16 May 2017 04:45:52 +0800
Subject: [PATCH 075/206] opencv: Fix OpenCV build on non NixOS platform

OpenCV's CMakeFile will use libraries in /lib and /lib64 if it can
find libraries from those paths. However, it causes
build failure because nix detects impure paths being used.
---
 pkgs/development/libraries/opencv/3.x.nix     | 6 ++++++
 pkgs/development/libraries/opencv/default.nix | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 275c1cddab0..5c7972eb2fa 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -78,6 +78,12 @@ stdenv.mkDerivation rec {
         ln -s "${bootdescFiles}/$name" "$NIX_BUILD_TOP/opencv_contrib/xfeatures2d/src/$name"
       done
     '');
+
+  # This prevents cmake from using libraries in impure paths (which causes build failure on non NixOS)
+  postPatch = ''
+    sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
+  '';
+
   preConfigure =
     (let version  = "20151201";
          md5      = "808b791a6eac9ed78d32a7666804320e";
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 37b33c21a30..d7824dbed34 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
       ./no-build-info.patch
     ];
 
+  # This prevents cmake from using libraries in impure paths (which causes build failure on non NixOS)
+  postPatch = ''
+    sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
+  '';
+
   outputs = [ "out" "dev" ];
 
   buildInputs =

From 6303d4ecf7751124bb0bd4d22f710889b0f81a1a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 16 May 2017 11:28:09 +0800
Subject: [PATCH 076/206] terragrunt: update sha256

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

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 4e4c0d3b324..a343f1f951b 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "1khmxqzhhkr6km4zfn0q3zm55wgc92hrayvqkf9snzr816c1qzp3";
+    sha256 = "07xxk7r9wvjv3v0l95g7sy5yphypfxmlymxzi7yv3b8dznifwm0y";
   };
 
   goDeps = ./deps.nix;

From d9df350695d3e07319798b1f169434aee19058c3 Mon Sep 17 00:00:00 2001
From: jammerful <jammerful@gmail.com>
Date: Mon, 15 May 2017 23:49:43 -0400
Subject: [PATCH 077/206] ssh: Add Newline to KnownHostsText

SSH expects a new line at the end of known_hosts file.
Without a new line the next entry goes on the same line
as the last entry in known_hosts causing errors.
---
 nixos/modules/programs/ssh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 5f4d4dc9475..a00fc0dfd19 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -20,11 +20,11 @@ let
 
   knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
 
-  knownHostsText = flip (concatMapStringsSep "\n") knownHosts
+  knownHostsText = (flip (concatMapStringsSep "\n") knownHosts
     (h: assert h.hostNames != [];
       concatStringsSep "," h.hostNames + " "
       + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
-    );
+    )) + "\n";
 
 in
 {

From 9950707e9612a08648d1624d6c7045cb12472b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 16 May 2017 06:46:32 +0100
Subject: [PATCH 078/206] telegraf: 1.2.1 -> 1.3.0

---
 pkgs/servers/monitoring/telegraf/default.nix  |   4 +-
 .../{deps-1.2.1.nix => deps-1.3.0.nix}        | 348 +++++++++---------
 2 files changed, 176 insertions(+), 176 deletions(-)
 rename pkgs/servers/monitoring/telegraf/{deps-1.2.1.nix => deps-1.3.0.nix} (54%)

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 1412f76c25a..b34fc648531 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "telegraf-${version}";
-  version = "1.2.1";
+  version = "1.3.0";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "${version}";
-    sha256 = "0vfx87a9shhwyqrbdf1jc32jkg0ych8bd0p222v2rcd83l75r0kh";
+    sha256 = "0vcv4ylqzp4fvmpd3n5m0n2kxx39fcp9x62ny7cja4wraq36mdn0";
   };
 
   goDeps = ./. + builtins.toPath "/deps-${version}.nix";
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.2.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.3.0.nix
similarity index 54%
rename from pkgs/servers/monitoring/telegraf/deps-1.2.1.nix
rename to pkgs/servers/monitoring/telegraf/deps-1.3.0.nix
index a866881e53d..bb31a496603 100644
--- a/pkgs/servers/monitoring/telegraf/deps-1.2.1.nix
+++ b/pkgs/servers/monitoring/telegraf/deps-1.3.0.nix
@@ -1,12 +1,21 @@
-# This file was generated by go2nix.
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
 [
+  {
+    goPackagePath = "collectd.org";
+    fetch = {
+      type = "git";
+      url = "https://github.com/collectd/go-collectd";
+      rev = "2ce144541b8903101fb8f1483cc0497a68798122";
+      sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3";
+    };
+  }
   {
     goPackagePath = "github.com/Shopify/sarama";
     fetch = {
       type = "git";
       url = "https://github.com/Shopify/sarama";
-      rev = "8aadb476e66ca998f2f6bb3c993e9a2daa3666b9";
-      sha256 = "1ndaddqcll9r22jg9x36acanxv5ds3xwahrm4b6nmmg06670gksv";
+      rev = "574d3147eee384229bf96a5d12c207fe7b5234f3";
+      sha256 = "02ckm91bngkrbvkf4j7s5swrjjv3dr9kn9glwyc15apjv2ynkc4j";
     };
   }
   {
@@ -14,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/Sirupsen/logrus";
-      rev = "219c8cb75c258c552e999735be6df753ffc7afdc";
-      sha256 = "04v55846v1535dplldyjhr0yqxl6n1mr4kiy2vz3ragv92xpshr6";
+      rev = "61e43dc76f7ee59a82bdf3d71033dc12bea4c77d";
+      sha256 = "08kr7zvdgwv8vsakjzq1bla6cc6dlxlg1brlga69y69xw7cz5l9p";
     };
   }
   {
@@ -23,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aerospike/aerospike-client-go";
-      rev = "7f3a312c3b2a60ac083ec6da296091c52c795c63";
-      sha256 = "05ancqplckvni9xp6xd4bv2pgkfa4v23svfcg27m8xinzi4ry219";
+      rev = "95e1ad7791bdbca44707fedbb29be42024900d9c";
+      sha256 = "034pirm1dzdblwadcd829qk2jqkr8hg9gpfph8ax7z0b3h2ah8xf";
     };
   }
   {
@@ -32,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/amir/raidman";
-      rev = "53c1b967405155bfc8758557863bf2e14f814687";
-      sha256 = "08a6zz4akkm7lk02w53vfhkxdf0ikv32x41rc4jyi2qaf0wyw6b4";
+      rev = "c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985";
+      sha256 = "10lmpz5vf2ysw8gnl0z8ravl4vvy48nbh8xpk2zzgifb6yn3x192";
     };
   }
   {
@@ -41,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "13a12060f716145019378a10e2806c174356b857";
-      sha256 = "09yl85kk2y4ayk44af5rbnkq4vy82vbh2z5ac4vpl2vgv7zyh46h";
+      rev = "7524cb911daddd6e5c9195def8e59ae892bef8d9";
+      sha256 = "0dm8zfv3jdrbnhm1yyq6507v5lzi6wwhrpwkdswhf0ihgc9ca90z";
     };
   }
   {
@@ -50,8 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/beorn7/perks";
-      rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4";
-      sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r";
+      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
+      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
     };
   }
   {
@@ -59,8 +68,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/cenkalti/backoff";
-      rev = "4dc77674aceaabba2c7e3da25d4c823edfb73f99";
-      sha256 = "0icf4vrgzksr0g8h6y00rd92h1mym6waf3mbqpf890bkw60gnm0w";
+      rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3";
+      sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc";
     };
   }
   {
@@ -68,8 +77,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/couchbase/go-couchbase";
-      rev = "cb664315a324d87d19c879d9cc67fda6be8c2ac1";
-      sha256 = "1dfw1apwrlfwl7bahb6dy5g9z2vs431l4lpaj3k9bnm13p0awivr";
+      rev = "bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28";
+      sha256 = "0h59zzxcz3i8nd4ln89fi946ii8kscnqam67h3mxvjwvpnmcax9k";
     };
   }
   {
@@ -77,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/couchbase/gomemcached";
-      rev = "a5ea6356f648fec6ab89add00edd09151455b4b2";
-      sha256 = "00x57qqdv9ciyxiw2y6p4s65sfgi4cs6zi39qlqlw90nh133xnwi";
+      rev = "4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29";
+      sha256 = "12h0wsimwmr0f398538g9ngasik4gisnac9vpn0ldy8hqdpa334d";
     };
   }
   {
@@ -90,49 +99,22 @@
       sha256 = "15v5ps2i2y2hczwxs2ci4c2w4p3pn3bl7vc5wlaqnc7i14f9285c";
     };
   }
-  {
-    goPackagePath = "github.com/dancannon/gorethink";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dancannon/gorethink";
-      rev = "e7cac92ea2bc52638791a021f212145acfedb1fc";
-      sha256 = "0f9gwsqf93qzvfpdwgam7vcfzrrkcj2s9ms4p056kcyxv9snwq3g";
-    };
-  }
   {
     goPackagePath = "github.com/davecgh/go-spew";
     fetch = {
       type = "git";
       url = "https://github.com/davecgh/go-spew";
-      rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d";
-      sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk";
+      rev = "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
     };
   }
   {
-    goPackagePath = "github.com/docker/engine-api";
+    goPackagePath = "github.com/docker/docker";
     fetch = {
       type = "git";
-      url = "https://github.com/docker/engine-api";
-      rev = "8924d6900370b4c7e7984be5adc61f50a80d7537";
-      sha256 = "1klimc3d1a2vfgl14a7js20ricpghq5jzvh8l46kf87ycjwc0q4n";
-    };
-  }
-  {
-    goPackagePath = "github.com/docker/go-connections";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/go-connections";
-      rev = "f549a9393d05688dff0992ef3efd8bbe6c628aeb";
-      sha256 = "0k1yf4bimmwxc0qiz997nagfmddbm8nwb0c1q16387m8lgw1gbwg";
-    };
-  }
-  {
-    goPackagePath = "github.com/docker/go-units";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/go-units";
-      rev = "5d2041e26a699eaca682e2ea41c8f891e1060444";
-      sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i";
+      url = "https://github.com/docker/docker";
+      rev = "b89aff1afa1f61993ab2ba18fd62d9375a195f5d";
+      sha256 = "1lkj1wmv4nfj3vrrdc072p5iib8p1l0y52mlg55p94b20v18ph2m";
     };
   }
   {
@@ -144,13 +126,22 @@
       sha256 = "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21";
     };
   }
+  {
+    goPackagePath = "github.com/eapache/go-xerial-snappy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/eapache/go-xerial-snappy";
+      rev = "bb955e01b9346ac19dc29eb16586c90ded99a98c";
+      sha256 = "1zhxcil8hn88hvxr2d6rmj4cls5zgss1scj0ikwiqq89f8vcgwn4";
+    };
+  }
   {
     goPackagePath = "github.com/eapache/queue";
     fetch = {
       type = "git";
       url = "https://github.com/eapache/queue";
-      rev = "ded5959c0d4e360646dc9e9908cff48666781367";
-      sha256 = "0inclypw0kln8hsn34c5ww34h0qa9fcqwak93lac5dp59rz5430n";
+      rev = "44cc805cf13205b55f69e14bcb69867d1ae92f98";
+      sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg";
     };
   }
   {
@@ -158,8 +149,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/eclipse/paho.mqtt.golang";
-      rev = "0f7a459f04f13a41b7ed752d47944528d4bf9a86";
-      sha256 = "13l6mrx9z859r4r7kpa9rsbf4ni7dn6xgz8iyv2xnz53pqffanjh";
+      rev = "d4f545eb108a2d19f9b1a735689dbfb719bc21fb";
+      sha256 = "01cnca8y5caramqn6p8aigj6l5p6z0nrs2xqqv90658x584138kh";
     };
   }
   {
@@ -167,8 +158,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-sql-driver/mysql";
-      rev = "1fca743146605a172a266e1654e01e5cd5669bee";
-      sha256 = "02vbq8j4r3skg3fmiv1wvjqh1542dr515w8f3d42b5lpwc1fsn38";
+      rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034";
+      sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5";
     };
   }
   {
@@ -176,8 +167,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gobwas/glob";
-      rev = "49571a1557cd20e6a2410adc6421f85b66c730b5";
-      sha256 = "16j7pdxajqrl20a737p7kgsngr2f7gkkpgqxxmfkrmgckgkc8cvk";
+      rev = "bea32b9cd2d6f55753d94a28e959b13f0244797a";
+      sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q";
     };
   }
   {
@@ -185,8 +176,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "552c7b9542c194800fd493123b3798ef0a832032";
-      sha256 = "1zaw1xxnvgsvfcrv5xkn1f7p87vyh9i6mc44csl11fgc2hvqp6xm";
+      rev = "8ee79997227bf9b34611aee7946ae64735e6fd93";
+      sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8";
     };
   }
   {
@@ -194,17 +185,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/snappy";
-      rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
-      sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
-    };
-  }
-  {
-    goPackagePath = "github.com/gorilla/context";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorilla/context";
-      rev = "1ea25387ff6f684839d82767c1733ff4d4d15d0a";
-      sha256 = "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4";
+      rev = "7db9049039a047d955fe8c19b83c8ff5abd765c7";
+      sha256 = "09l3sc9z2fqnj5b040q320gwb4gqig6lnysxcayhwckrdp5bm8hs";
     };
   }
   {
@@ -212,8 +194,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/mux";
-      rev = "c9e326e2bdec29039a3761c07bece13133863e1e";
-      sha256 = "1bplp6v14isjdfpf8328k8bvkn35n451axkxlm822d9h5ccg47g6";
+      rev = "392c28fe23e1c45ddba891b0320b3b5df220beea";
+      sha256 = "0dmihkq34ls23by08r8p92qpf77imibjd9m9qvw344j4r2z7bd4d";
     };
   }
   {
@@ -230,35 +212,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/consul";
-      rev = "5aa90455ce78d4d41578bafc86305e6e6b28d7d2";
-      sha256 = "1xas814kkhwnjg5ghhlkgygcgi5p7h6dczmpbrzzh3yygbfdzxgw";
+      rev = "63d2fc68239b996096a1c55a0d4b400ea4c2583f";
+      sha256 = "0vx7jpi2a9374mlhn37b33780n7g950zh482z2sd4lsf29n4c580";
     };
   }
   {
-    goPackagePath = "github.com/hpcloud/tail";
+    goPackagePath = "github.com/influxdata/tail";
     fetch = {
       type = "git";
-      url = "https://github.com/hpcloud/tail";
-      rev = "b2940955ab8b26e19d43a43c4da0475dd81bdb56";
-      sha256 = "1x266pdfvcymsbdrdsns06qq5qfjb62z6h4512ylhakbm64qkn4s";
-    };
-  }
-  {
-    goPackagePath = "github.com/influxdata/config";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/config";
-      rev = "b79f6829346b8d6e78ba73544b1e1038f1f1c9da";
-      sha256 = "0k4iywy83n3kq2f58a41rjinj03wp1di67aacpf04p25qmf46c4z";
-    };
-  }
-  {
-    goPackagePath = "github.com/influxdata/influxdb";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/influxdb";
-      rev = "fc57c0f7c635df3873f3d64f0ed2100ddc94d5ae";
-      sha256 = "07cv1gryp4a84a2acgc8k8alr7jw4jwphf12cby8jjy1br35jrbq";
+      url = "https://github.com/influxdata/tail";
+      rev = "a395bf99fe07c233f41fba0735fa2b13b58588ea";
+      sha256 = "0bmkv932xhjpxwp8n74xy8wf34kiiknwq8agfbnz931apq6iw9b0";
     };
   }
   {
@@ -266,7 +230,7 @@
     fetch = {
       type = "git";
       url = "https://github.com/influxdata/toml";
-      rev = "af4df43894b16e3fd2b788d01bd27ad0776ef2d0";
+      rev = "5d1d907f22ead1cd47adde17ceec5bda9cacaf8f";
       sha256 = "1faf51s89sk1z41qfsazmddgwll7jq9xna67k3h3vry86c4vs2j4";
     };
   }
@@ -279,13 +243,22 @@
       sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl";
     };
   }
+  {
+    goPackagePath = "github.com/jackc/pgx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jackc/pgx";
+      rev = "b84338d7d62598f75859b2b146d830b22f1b9ec8";
+      sha256 = "13q763a31yya8ij6m5zbnri7wc88hjwwn1rw4v7dmwbwsrqn885c";
+    };
+  }
   {
     goPackagePath = "github.com/kardianos/osext";
     fetch = {
       type = "git";
       url = "https://github.com/kardianos/osext";
-      rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc";
-      sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a";
+      rev = "c2c54e542fb797ad986b31721e1baedf214ca413";
+      sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h";
     };
   }
   {
@@ -293,8 +266,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/kardianos/service";
-      rev = "5e335590050d6d00f3aa270217d288dda1c94d0a";
-      sha256 = "1g10qisgywfqj135yyiq63pnbjgr201gz929ydlgyzqq6yk3bn3h";
+      rev = "6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893";
+      sha256 = "1cgqg6zbwwsn6lz2ms094q4w37x84vd9ixs50wsh3037q4sfhyll";
     };
   }
   {
@@ -311,17 +284,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/klauspost/crc32";
-      rev = "19b0b332c9e4516a6370a0456e6182c3b5036720";
-      sha256 = "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r";
-    };
-  }
-  {
-    goPackagePath = "github.com/lib/pq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lib/pq";
-      rev = "e182dc4027e2ded4b19396d638610f2653295f36";
-      sha256 = "1636v3snixapjf7rbjq0xn1sbym7hwckqfla0dm5cr4a5q4fw5cj";
+      rev = "cb6bfca970f6908083f26f39a79009d608efd5cd";
+      sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n";
     };
   }
   {
@@ -329,8 +293,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/matttproud/golang_protobuf_extensions";
-      rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453";
-      sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r";
+      rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
     };
   }
   {
@@ -338,17 +302,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/miekg/dns";
-      rev = "cce6c130cdb92c752850880fd285bea1d64439dd";
-      sha256 = "098gadhfjiijlgq497gbccvf26xrmjvln1fws56m0ljcgszq3jdx";
-    };
-  }
-  {
-    goPackagePath = "github.com/mreiferson/go-snappystream";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mreiferson/go-snappystream";
-      rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504";
-      sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6";
+      rev = "99f84ae56e75126dd77e5de4fae2ea034a468ca1";
+      sha256 = "1v7rccng7mbzqh5qf8d8gqfppm127v32s8i1n3k50q3flv227byf";
     };
   }
   {
@@ -360,13 +315,22 @@
       sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6";
     };
   }
+  {
+    goPackagePath = "github.com/nats-io/go-nats";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nats-io/go-nats";
+      rev = "ea9585611a4ab58a205b9b125ebd74c389a6b898";
+      sha256 = "0i2whh6c8grzi9slrk2clh3dhykxzid4zn395wgysg6gfjrbd5i5";
+    };
+  }
   {
     goPackagePath = "github.com/nats-io/nats";
     fetch = {
       type = "git";
       url = "https://github.com/nats-io/nats";
-      rev = "ea8b4fd12ebb823073c0004b9f09ac8748f4f165";
-      sha256 = "0i5f6n9k0d2vzdy20sqygmss5j45y72irxsi80grjsh7qkxa6vn1";
+      rev = "ea9585611a4ab58a205b9b125ebd74c389a6b898";
+      sha256 = "0i2whh6c8grzi9slrk2clh3dhykxzid4zn395wgysg6gfjrbd5i5";
     };
   }
   {
@@ -374,8 +338,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nats-io/nuid";
-      rev = "a5152d67cf63cbfb5d992a395458722a45194715";
-      sha256 = "0fphar5bz735wwa7549j31nxnm5a9dyw472gs9zafz0cv7g8np40";
+      rev = "289cccf02c178dc782430d534e3c1f5b72af807f";
+      sha256 = "1dpk8qzl43gfdaj2nbw52a0xyrmpmq26a9v9dfl27vkijssb20p4";
     };
   }
   {
@@ -383,17 +347,26 @@
     fetch = {
       type = "git";
       url = "https://github.com/nsqio/go-nsq";
-      rev = "0b80d6f05e15ca1930e0c5e1d540ed627e299980";
-      sha256 = "1zi9jazjfzilp2g0xy30dlx9nd9g47cjqrnqxallly97mz9n01xr";
+      rev = "a53d495e81424aaf7a7665a9d32a97715c40e953";
+      sha256 = "04npqz6ajr4r2w5jfvfzppr307qrwr57w4c1ppq9p9ddf7hx3wpz";
     };
   }
   {
-    goPackagePath = "github.com/opencontainers/runc";
+    goPackagePath = "github.com/pierrec/lz4";
     fetch = {
       type = "git";
-      url = "https://github.com/opencontainers/runc";
-      rev = "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8";
-      sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1";
+      url = "https://github.com/pierrec/lz4";
+      rev = "5c9560bfa9ace2bf86080bf40d46b34ae44604df";
+      sha256 = "0j74a3xc48ispj8sb9c2sd1h53q99ws0f2x827b5p86xlpam8xyj";
+    };
+  }
+  {
+    goPackagePath = "github.com/pierrec/xxHash";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pierrec/xxHash";
+      rev = "5a004441f897722c627870a981d02b29924215fa";
+      sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja";
     };
   }
   {
@@ -401,8 +374,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_golang";
-      rev = "18acf9993a863f4c4b40612e19cdd243e7c86831";
-      sha256 = "1gyjvwnvgyl0fs4hd2vp5hj1dsafhwb2h55w8zgzdpshvhwrpmhv";
+      rev = "c317fb74746eac4fc65fe3909195f4cf67c5562a";
+      sha256 = "1c3rqwkajkmhk5wh6agc5jnjbbfvpfxbiy8cprpw89khch428khp";
     };
   }
   {
@@ -419,8 +392,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/common";
-      rev = "e8eabff8812b05acf522b45fdcd725a785188e37";
-      sha256 = "08magd2aw7dqaa8bbv85404zvy120ify61msfpy75az5rdl5anxq";
+      rev = "dd2f054febf4a6c00f2343686efb775948a8bff4";
+      sha256 = "0rhbgj51r105ax544mfg6wp4rsqpzn3776z1k82b21xwb3b51zr1";
     };
   }
   {
@@ -428,8 +401,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/procfs";
-      rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8";
-      sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8";
+      rev = "1878d9fbb537119d24b21ca07effd591627cd160";
+      sha256 = "0jqn5l31szmc0dv5invp5mdhndx3fcsda7zpy49zd7k95c1y20m7";
+    };
+  }
+  {
+    goPackagePath = "github.com/rcrowley/go-metrics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rcrowley/go-metrics";
+      rev = "1f30fe9094a513ce4c700b9a54458bbb0c96996c";
+      sha256 = "1hvbiaq4b6dqgjz6jkkxglfh9gf71zin6qsg508sh0r0ixfavrzj";
     };
   }
   {
@@ -437,8 +419,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/samuel/go-zookeeper";
-      rev = "218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f";
-      sha256 = "1v0m6wn83v4pbqz6hs7z1h5hbjk7k6npkpl7icvcxdcjd7rmyjp2";
+      rev = "1d7be4effb13d2d908342d349d71a284a7542693";
+      sha256 = "002s19109spms9ndfwykf3ryy3fnk7b56frxlqmmv37mlqgrd5v9";
+    };
+  }
+  {
+    goPackagePath = "github.com/satori/go.uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/satori/go.uuid";
+      rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b";
+      sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07";
     };
   }
   {
@@ -446,8 +437,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shirou/gopsutil";
-      rev = "1516eb9ddc5e61ba58874047a98f8b44b5e585e8";
-      sha256 = "1pnl1g2l1y5vmnraq97rbm0nirprqvfzxsp6h4xacn1429jdl5bv";
+      rev = "70693b6a3da51a8a686d31f1b346077bbc066062";
+      sha256 = "0mrmwfpq8irqbmcqx64x7n1dw0qpl9kz4vbwm7c8bpfpjqmmni6b";
     };
   }
   {
@@ -455,8 +446,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/soniah/gosnmp";
-      rev = "3fe3beb30fa9700988893c56a63b1df8e1b68c26";
-      sha256 = "0a0vlxx1plqj9fi863wd8ajbzl705wgma4qk75v949azgn1yx9ib";
+      rev = "5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15";
+      sha256 = "0dqz0w077xfk9fj5dd8xa6sqgdvjpb8vx997wnqpi3kbii1b9jnb";
     };
   }
   {
@@ -464,8 +455,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/streadway/amqp";
-      rev = "b4f3ceab0337f013208d31348b578d83c0064744";
-      sha256 = "1whcg2l6w2q7xrkk8q5y95i90ckq72bpgksii9ibrpyixbx7p5xp";
+      rev = "63795daa9a446c920826655f26ba31c81c860fd6";
+      sha256 = "1v6xwskb4dqyy2q1r7k12f9wky7v6cfb4f1mx94sr3qvx37zg2yj";
     };
   }
   {
@@ -473,8 +464,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "1f4a1643a57e798696635ea4c126e9127adb7d3c";
-      sha256 = "0nam9d68rn8ha8ldif22kkgv6k6ph3y88fp26159wdrs63ca3bzl";
+      rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
+      sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
     };
   }
   {
@@ -482,8 +473,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/vjeantet/grok";
-      rev = "83bfdfdfd1a8146795b28e547a8e3c8b28a466c2";
-      sha256 = "03zdcg9gy482gbasa7sw4cpw1k1n3dr2q06q80qnkqn268p7hp80";
+      rev = "d73e972b60935c7fec0b4ffbc904ed39ecaf7efe";
+      sha256 = "09p70h5inycwrw3dmn6c7lhx4m11fvw7449wzq1k5w2jcws7amd5";
     };
   }
   {
@@ -500,8 +491,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/wvanbergen/kazoo-go";
-      rev = "0f768712ae6f76454f987c3356177e138df258f8";
-      sha256 = "1paaayg03nknbnl3kdl0ybqv4llz7iwry7f29i0bh9srb6c87x16";
+      rev = "968957352185472eacb69215fa3dbfcfdbac1096";
+      sha256 = "07q37lmlc3vx620bklp93r368r73kgm2s9x7qcgcxk9701lqq7dc";
     };
   }
   {
@@ -509,8 +500,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/yuin/gopher-lua";
-      rev = "bf3808abd44b1e55143a2d7f08571aaa80db1808";
-      sha256 = "02m7ly5yzc3snvxlfl9j4ggwd7v0kpvy3pqgqbfr7scdjxdap4nm";
+      rev = "66c871e454fcf10251c61bf8eff02d0978cae75a";
+      sha256 = "1srcibhsl29cy8qih132iqigl4ss303nfmglrgc583nj9kz9sf8j";
     };
   }
   {
@@ -527,8 +518,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6";
-      sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp";
+      rev = "dc137beb6cce2043eb6b5f223ab8bf51c32459f4";
+      sha256 = "0kia3rd0g0vkb9pf102kbg1agr1xq27bi2shkpxy9l718yvy9jwd";
     };
   }
   {
@@ -536,8 +527,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "6acef71eb69611914f7a30939ea9f6e194c78172";
-      sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc";
+      rev = "f2499483f923065a842d38eb4c7f1927e6fc6e6d";
+      sha256 = "0q1ps8igfczfafk39hkp8gs57s6qxjvf2c48hiq00p873agz0x7s";
     };
   }
   {
@@ -545,8 +536,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34";
-      sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1";
+      rev = "506f9d5c962f284575e88337e7d9296d27e729d3";
+      sha256 = "1ghx5vv4zlkjzlx2gslvcwpvxjggpl6wz5n49nqxiz777psx218s";
     };
   }
   {
@@ -554,8 +545,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/dancannon/gorethink.v1";
-      rev = "7d1af5be49cb5ecc7b177bf387d232050299d6ef";
-      sha256 = "0036hcadshka19bcqmq4mm9ssl9qhsx1n96lj1y24mh9g1api8fi";
+      rev = "edc7a6a68e2d8015f5ffe1b2560eed989f8a45be";
+      sha256 = "0602082mfypdm98i963sdvij8l5ia5cw9r9cy7m6a60cvh1xmaka";
     };
   }
   {
@@ -563,8 +554,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/fatih/pool.v2";
-      rev = "cba550ebf9bce999a02e963296d4bc7a486cb715";
-      sha256 = "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0";
+      rev = "6e328e67893eb46323ad06f0e92cb9536babbabc";
+      sha256 = "1p1sljfpbg2bp4qv7ghvz1wcmmsbcfclsninxa97kr0v7na7jw5p";
     };
   }
   {
@@ -572,8 +563,17 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/mgo.v2";
-      rev = "d90005c5262a3463800497ea5a89aed5fe22c886";
-      sha256 = "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7";
+      rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655";
+      sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/olivere/elastic.v5";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/olivere/elastic.v5";
+      rev = "ee3ebceab960cf68ab9a89ee6d78c031ef5b4a4e";
+      sha256 = "0pby1b8s0h964cq6nld0arapkbfqb8vzm1k41cnxjq14ryh8adlh";
     };
   }
   {
@@ -581,8 +581,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
-      sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
+      rev = "4c78c975fe7c825c6d1466c42be594d1d6f3aba6";
+      sha256 = "1ddwvmsfijgl09pbqrcx73fy5kh8y3888dd29lh7i50ds5a088cx";
     };
   }
 ]

From 1aaeb94855d870c7c23b5cb1b8979493760975c9 Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Tue, 16 May 2017 15:40:36 +0900
Subject: [PATCH 079/206] 3to2: init at 1.1.1 (#25202)

* 3to2: init at 1.1.1

* add myself to maintainer list

* add mt-caret as maintainer
---
 lib/maintainers.nix                           |  1 +
 .../python-modules/3to2/default.nix           | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/3to2/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e31a193a77b..e8c1b364919 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -353,6 +353,7 @@
   msackman = "Matthew Sackman <matthew@wellquite.org>";
   mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>";
   msteen = "Matthijs Steen <emailmatthijs@gmail.com>";
+  mt-caret = "Masayuki Takeda <mtakeda.enigsol@gmail.com>";
   mtreskin = "Max Treskin <zerthurd@gmail.com>";
   mudri = "James Wood <lamudri@gmail.com>";
   muflax = "Stefan Dorn <mail@muflax.com>";
diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix
new file mode 100644
index 00000000000..4941db3c996
--- /dev/null
+++ b/pkgs/development/python-modules/3to2/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchurl
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "3to2";
+  version = "1.1.1";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://files.pythonhosted.org/packages/8f/ab/58a363eca982c40e9ee5a7ca439e8ffc5243dde2ae660ba1ffdd4868026b/${pname}-${version}.zip";
+    sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test lib3to2/tests
+  '';
+
+  # Test failing due to upstream issue (https://bitbucket.org/amentajo/lib3to2/issues/50/testsuite-fails-with-new-python-35)
+  doCheck = false;
+
+  meta = {
+    homepage = https://bitbucket.org/amentajo/lib3to2;
+    description = "Refactors valid 3.x syntax into valid 2.x syntax, if a syntactical conversion is possible";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ mt-caret ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4093dac55c8..893696516be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -112,6 +112,8 @@ in {
     };
   };
 
+  "3to2" = callPackage ../development/python-modules/3to2 { };
+
   aenum = callPackage ../development/python-modules/aenum { };
 
   agate = callPackage ../development/python-modules/agate { };

From 43941da85943b6321061b6362521e4d3a1af6636 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Tue, 16 May 2017 09:41:26 +0300
Subject: [PATCH 080/206] pythonPackages.PyRSS2Gen: fix sha256

The old hash caused version 1.0 version to be installed instead of 1.1, for some
reason.
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 893696516be..4c4f2e4a812 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20511,7 +20511,7 @@ in {
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "4929d022713129401160fd47550d5158931e4ea6a7136b5d8dfe3b13ac16f2f0";
+      sha256 = "1rvf5jw9hknqz02rp1vg8abgb1lpa0bc65l7ylmlillqx7bswq3r";
     };
 
     # No tests in archive

From a92bdc54e3d6893f737114c51170b386f8c7672e Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 10 May 2017 13:31:02 +0200
Subject: [PATCH 081/206] nixos/luks: Silence killall complain about
 non-existing cryptsetup processes

---
 nixos/modules/system/boot/luksroot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 6e867b67439..59ebb88582a 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -434,7 +434,7 @@ in
       #!$out/bin/sh -e
       if [ -e /.luksopen_args ]; then
         cryptsetup \$(cat /.luksopen_args)
-        killall cryptsetup
+        killall -q cryptsetup
       else
         echo "Passphrase is not requested now"
         exit 1

From 03d190d54f63eda9ae37fc350517957a596b9cb7 Mon Sep 17 00:00:00 2001
From: J M <jammerful@gmail.com>
Date: Tue, 16 May 2017 05:11:55 -0400
Subject: [PATCH 082/206] shibboleth: Add Myself as a Maintainer (#25817)

---
 lib/maintainers.nix                                  | 1 +
 nixos/modules/services/security/shibboleth-sp.nix    | 2 ++
 pkgs/development/libraries/log4shib/default.nix      | 3 ++-
 pkgs/development/libraries/opensaml-cpp/default.nix  | 1 +
 pkgs/development/libraries/shibboleth-sp/default.nix | 1 +
 pkgs/development/libraries/xml-tooling-c/default.nix | 1 +
 6 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e8c1b364919..af91ea5be24 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -227,6 +227,7 @@
   ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>";
   j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>";
   jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";
+  jammerful = "jammerful <jammerful@gmail.com>";
   jansol = "Jan Solanti <jan.solanti@paivola.fi>";
   javaguirre = "Javier Aguirre <contacto@javaguirre.net>";
   jb55 = "William Casarin <bill@casarin.me>";
diff --git a/nixos/modules/services/security/shibboleth-sp.nix b/nixos/modules/services/security/shibboleth-sp.nix
index 07acf27f0f6..5908f727d53 100644
--- a/nixos/modules/services/security/shibboleth-sp.nix
+++ b/nixos/modules/services/security/shibboleth-sp.nix
@@ -70,4 +70,6 @@ in {
       };
     };
   };
+
+  meta.maintainers = with lib.maintainers; [ jammerful ];
 }
diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix
index f9b68e1a0cf..7b672aebe44 100644
--- a/pkgs/development/libraries/log4shib/default.nix
+++ b/pkgs/development/libraries/log4shib/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A forked version of log4cpp that has been created for the Shibboleth project";
+    maintainers = [ maintainers.jammerful ];
   };
 }
diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix
index 9e3fbd15306..c2c102ccf9b 100644
--- a/pkgs/development/libraries/opensaml-cpp/default.nix
+++ b/pkgs/development/libraries/opensaml-cpp/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     description = "A low-level library written in C++ that provides support for producing and consuming SAML messages";
     platforms   = platforms.unix;
     license     = licenses.asl20;
+    maintainers = [ maintainers.jammerful ];
   };
 }
diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix
index de6d6544c13..f15c72498b2 100644
--- a/pkgs/development/libraries/shibboleth-sp/default.nix
+++ b/pkgs/development/libraries/shibboleth-sp/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     description = "Enables SSO and Federation web applications written with any programming language or framework";
     platforms   = platforms.unix;
     license     = licenses.asl20;
+    maintainers = [ maintainers.jammerful ];
   };
 }
diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix
index 139a4c8cccd..f2d7711c9f0 100644
--- a/pkgs/development/libraries/xml-tooling-c/default.nix
+++ b/pkgs/development/libraries/xml-tooling-c/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2";
     platforms   = platforms.unix;
     license     = licenses.asl20;
+    maintainers = [ maintainers.jammerful ];
   };
 }

From 3cd189c3bcf907ed80c945028746d9c453f1a8b6 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 16 May 2017 11:09:04 +0200
Subject: [PATCH 083/206] tor: 0.3.0.6 -> 0.3.0.7

Contains a fix for TROVE-2017-002, a remotely triggered crashing bug
affecting tor relays (clients & releases pre 0.3.0 unaffected).
---
 pkgs/tools/security/tor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 4a6095a0a54..6eea70797ab 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.3.0.6";
+  name = "tor-0.3.0.7";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${name}.tar.gz";
-    sha256 = "057vq8wagppmrlg85dgbsrk1v67yqpbi9n87s8gn0mdm7kli5rd3";
+    sha256 = "00kxa83bn0axh7479fynp6r8znq5wy26kvb8ghixgjpkir2c8h4n";
   };
 
   outputs = [ "out" "geoip" ];

From d5e18499d936c7a7cd22e96dc6ed957086a7b1ce Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Tue, 16 May 2017 12:40:09 +0200
Subject: [PATCH 084/206] on error, add a reference to the configuration file
 (#25825)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

error now adds the zone file in the output which makes 'reasonable' debugging possible!

[root@nixdoc:~/nixpkgs_nsd]# nixos-rebuild -I nixpkgs=. switch
building Nix...
building the system configuration...
these derivations will be built:
  /nix/store/318a7mhwlz1x0cy4hl1259n8x9z0jacy-nsd-env.drv
  /nix/store/fnbhk8grwk7vfdk3gby49bv6kml8hjcc-unit-script.drv
  /nix/store/xf80mq1f1c3pm37fci0vi5ixy4gb1rcp-unit-nsd.service.drv
  /nix/store/bfmkkykqksmvkhvh3ppl36k86lbw9v4i-system-units.drv
  /nix/store/ja97mwl2r0wdrxccl82dx8jln7jlmnyb-etc.drv
  /nix/store/yh8m6b3j8vapz2r1wzffq8zq09j56q8p-nixos-system-nixdoc.io-17.09.git.0afb6d7.drv
building path(s) ‘/nix/store/sg7w3k6qg2yr02a0sbrgbv5yiqn9pzcq-nsd-env’
created 2 symlinks in user environment
checking zone files
|- checking zone '/nix/store/sg7w3k6qg2yr02a0sbrgbv5yiqn9pzcq-nsd-env/zones/lastlog.de.'
[2017-05-16 10:30:34.628] nsd-checkzone[27696]: error: lastlog.de.:17: syntax error
[2017-05-16 10:30:34.628] nsd-checkzone[27696]: error: lastlog.de.:17: unrecognized RR type 'lastlog'
zone lastlog.de. file lastlog.de. has 2 errors
builder for ‘/nix/store/318a7mhwlz1x0cy4hl1259n8x9z0jacy-nsd-env.drv’ failed with exit code 1
cannot build derivation ‘/nix/store/xf80mq1f1c3pm37fci0vi5ixy4gb1rcp-unit-nsd.service.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/bfmkkykqksmvkhvh3ppl36k86lbw9v4i-system-units.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/ja97mwl2r0wdrxccl82dx8jln7jlmnyb-etc.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/yh8m6b3j8vapz2r1wzffq8zq09j56q8p-nixos-system-nixdoc.io-17.09.git.0afb6d7.drv’: 1 dependencies couldn't be built
error: build of ‘/nix/store/yh8m6b3j8vapz2r1wzffq8zq09j56q8p-nixos-system-nixdoc.io-17.09.git.0afb6d7.drv’ failed
---
 nixos/modules/services/networking/nsd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 481e267f6c3..0f01b9d4af0 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -30,6 +30,7 @@ let
       cd $out/zones
 
       for zoneFile in *; do
+        echo "|- checking zone '$out/zones/$zoneFile'"
         ${nsdPkg}/sbin/nsd-checkzone "$zoneFile" "$zoneFile" || {
           if grep -q \\\\\\$ "$zoneFile"; then
             echo zone "$zoneFile" contains escaped dollar signes \\\$

From 9d5038e326dcbcfc77a56f704b0c61f65f2209b1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 09:16:28 +0200
Subject: [PATCH 085/206] pythonPackages.scipy: 0.18.1 -> 0.19.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4c4f2e4a812..e00ef5ebe9b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22760,7 +22760,7 @@ in {
     gfortran = pkgs.gfortran;
   };
 
-  scipy = self.scipy_0_18;
+  scipy = self.scipy_0_19;
 
   scipy_0_17 = self.buildScipyPackage rec {
     version = "0.17.1";
@@ -22780,6 +22780,15 @@ in {
     numpy = self.numpy;
   };
 
+  scipy_0_19 = self.buildScipyPackage rec {
+    version = "0.19.0";
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/s/scipy/scipy-${version}.zip";
+      sha256 = "4190d34bf9a09626cd42100bbb12e3d96b2daf1a8a3244e991263eb693732122";
+    };
+    numpy = self.numpy;
+  };
+
   scikitimage = buildPythonPackage rec {
     name = "scikit-image-${version}";
     version = "0.12.3";

From b78940b8501b18f1cc1d7e7ea912be3dbec2effb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 09:16:42 +0200
Subject: [PATCH 086/206] pythonPackages.numpy: 1.11.3 -> 1.12.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e00ef5ebe9b..fed7e807045 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15816,7 +15816,7 @@ in {
     blas = pkgs.openblasCompat;
   };
 
-  numpy = self.numpy_1_11;
+  numpy = self.numpy_1_12;
 
   numpy_1_10 = self.buildNumpyPackage rec {
     version = "1.10.4";
@@ -15834,6 +15834,14 @@ in {
     };
   };
 
+  numpy_1_12 = self.buildNumpyPackage rec {
+    version = "1.12.1";
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/n/numpy/numpy-${version}.zip";
+      sha256 = "a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542";
+    };
+  };
+
   numpydoc = buildPythonPackage rec {
     pname = "numpydoc";
     name = "${pname}-${version}";

From 50fb47df49b1dd4c20651f643f4f5e271ea238c7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 18 Apr 2017 09:44:08 +0200
Subject: [PATCH 087/206] pythonPackages.cython: disable tests temporarily

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fed7e807045..d529473acb2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4282,6 +4282,10 @@ in {
         ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""}
     '';
 
+    # Disable tests temporarily
+    # https://github.com/cython/cython/issues/1676
+    doCheck = false;
+
     meta = {
       description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
       platforms = platforms.all;

From 9174bd253835527cf83aeb53c9bbd0aa937cc067 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 22 Apr 2017 23:44:00 +0200
Subject: [PATCH 088/206] pythonPackages.pandas: 0.19.2 -> 0.20.1

---
 .../python-modules/pandas/default.nix         | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 212a382a4b0..eb5b5987a40 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -1,8 +1,9 @@
 { buildPythonPackage
+, fetchPypi
 , python
 , stdenv
 , fetchurl
-, nose
+, pytest
 , glibcLocales
 , cython
 , dateutil
@@ -27,16 +28,16 @@ let
   inherit (stdenv) isDarwin;
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.19.2";
+  version = "0.20.1";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "6f0f4f598c2b16746803c8bafef7c721c57e4844da752d36240c0acf97658014";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "42707365577ef69f7c9c168ddcf045df2957595a9ee71bc13c7997eecb96b190";
   };
 
   LC_ALL = "en_US.UTF-8";
-  buildInputs = [ nose glibcLocales ] ++ optional isDarwin libcxx;
+  buildInputs = [ pytest glibcLocales ] ++ optional isDarwin libcxx;
   propagatedBuildInputs = [
     cython
     dateutil
@@ -70,14 +71,10 @@ in buildPythonPackage rec {
   '';
 
   # The flag `-A 'not network'` will disable tests that use internet.
-  # The `-e` flag disables a few problematic tests.
   checkPhase = ''
     runHook preCheck
-    # The flag `-w` provides the initial directory to search for tests.
-    # The flag `-A 'not network'` will disable tests that use internet.
-    nosetests -w $out/${python.sitePackages}/pandas --no-path-adjustment -A 'not slow and not network' \
-      --verbosity=3
-     runHook postCheck
+    py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network
+    runHook postCheck
   '';
 
   meta = {

From c9b4a2f319914fe31eb8eee866ad47052824c697 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 16 May 2017 09:22:07 +0200
Subject: [PATCH 089/206] python.pkgs.numpy: move and get rid of multiple
 versions

---
 .../{numpy.nix => numpy/default.nix}          | 27 +++++++++--------
 .../{ => numpy}/numpy-distutils-C++.patch     |  0
 pkgs/top-level/python-packages.nix            | 30 +------------------
 3 files changed, 15 insertions(+), 42 deletions(-)
 rename pkgs/development/python-modules/{numpy.nix => numpy/default.nix} (69%)
 rename pkgs/development/python-modules/{ => numpy}/numpy-distutils-C++.patch (100%)

diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy/default.nix
similarity index 69%
rename from pkgs/development/python-modules/numpy.nix
rename to pkgs/development/python-modules/numpy/default.nix
index 16c919eb4b2..d427a33f80f 100644
--- a/pkgs/development/python-modules/numpy.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -1,16 +1,17 @@
-{lib, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}:
+{lib, fetchurl, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}:
 
-args:
+buildPythonPackage rec {
+  pname = "numpy";
+  version = "1.12.1";
+  name = "${pname}-${version}";
 
-let
-  inherit (args) version;
-in buildPythonPackage (args // rec {
-
-  name = "numpy-${version}";
+  src = fetchurl {
+    url = "mirror://pypi/n/numpy/numpy-${version}.zip";
+    sha256 = "a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542";
+  };
 
   disabled = isPyPy;
-  buildInputs = args.buildInputs or [ gfortran nose ];
-  propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ];
+  buildInputs = [ gfortran nose blas ];
 
   patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
     # See cpython 2.7 patches.
@@ -26,8 +27,8 @@ in buildPythonPackage (args // rec {
     echo "Creating site.cfg file..."
     cat << EOF > site.cfg
     [openblas]
-    include_dirs = ${passthru.blas}/include
-    library_dirs = ${passthru.blas}/lib
+    include_dirs = ${blas}/include
+    library_dirs = ${blas}/lib
     EOF
   '';
 
@@ -56,5 +57,5 @@ in buildPythonPackage (args // rec {
     description = "Scientific tools for Python";
     homepage = "http://numpy.scipy.org/";
     maintainers = with lib.maintainers; [ fridh ];
-  } // (args.meta or {});
-})
+  };
+}
diff --git a/pkgs/development/python-modules/numpy-distutils-C++.patch b/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
similarity index 100%
rename from pkgs/development/python-modules/numpy-distutils-C++.patch
rename to pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d529473acb2..5904a9f8c8f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15814,38 +15814,10 @@ in {
     };
   };
 
-
-  buildNumpyPackage = callPackage ../development/python-modules/numpy.nix {
-    gfortran = pkgs.gfortran;
+  numpy = callPackage ../development/python-modules/numpy {
     blas = pkgs.openblasCompat;
   };
 
-  numpy = self.numpy_1_12;
-
-  numpy_1_10 = self.buildNumpyPackage rec {
-    version = "1.10.4";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/numpy/numpy-${version}.tar.gz";
-      sha256 = "7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b";
-    };
-  };
-
-  numpy_1_11 = self.buildNumpyPackage rec {
-    version = "1.11.3";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/numpy/numpy-${version}.zip";
-      sha256 = "2e0fc5248246a64628656fe14fcab0a959741a2820e003bd15538226501b82f7";
-    };
-  };
-
-  numpy_1_12 = self.buildNumpyPackage rec {
-    version = "1.12.1";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/numpy/numpy-${version}.zip";
-      sha256 = "a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542";
-    };
-  };
-
   numpydoc = buildPythonPackage rec {
     pname = "numpydoc";
     name = "${pname}-${version}";

From ea2c573b3b6a4c0f498cada3c1756f767162683c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 16 May 2017 09:22:46 +0200
Subject: [PATCH 090/206] python.pkgs.scipy: move expression and keep only a
 single version

---
 .../{scipy.nix => scipy/default.nix}          | 29 ++++++++--------
 pkgs/top-level/python-packages.nix            | 33 +------------------
 2 files changed, 16 insertions(+), 46 deletions(-)
 rename pkgs/development/python-modules/{scipy.nix => scipy/default.nix} (62%)

diff --git a/pkgs/development/python-modules/scipy.nix b/pkgs/development/python-modules/scipy/default.nix
similarity index 62%
rename from pkgs/development/python-modules/scipy.nix
rename to pkgs/development/python-modules/scipy/default.nix
index 023335a5e34..a7428f134a7 100644
--- a/pkgs/development/python-modules/scipy.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -1,16 +1,17 @@
-{lib, python, buildPythonPackage, isPyPy, gfortran, nose}:
+{lib, fetchurl, python, buildPythonPackage, isPyPy, gfortran, nose, numpy}:
 
-args:
+buildPythonPackage rec {
+  pname = "scipy";
+  version = "0.19.0";
+  name = "${pname}-${version}";
 
-let
-  inherit (args) version;
-  inherit (args) numpy;
-in buildPythonPackage (args // rec {
+  src = fetchurl {
+    url = "mirror://pypi/s/scipy/scipy-${version}.zip";
+    sha256 = "4190d34bf9a09626cd42100bbb12e3d96b2daf1a8a3244e991263eb693732122";
+  };
 
-  name = "scipy-${version}";
-
-  buildInputs = (args.buildInputs or [ gfortran nose ]);
-  propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]);
+  buildInputs = [ gfortran nose numpy.blas ];
+  propagatedBuildInputs = [ numpy ];
 
   # Remove tests because of broken wrapper
   prePatch = ''
@@ -25,8 +26,8 @@ in buildPythonPackage (args // rec {
     echo "Creating site.cfg file..."
     cat << EOF > site.cfg
     [openblas]
-    include_dirs = ${passthru.blas}/include
-    library_dirs = ${passthru.blas}/lib
+    include_dirs = ${numpy.blas}/include
+    library_dirs = ${numpy.blas}/lib
     EOF
   '';
 
@@ -48,5 +49,5 @@ in buildPythonPackage (args // rec {
     description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";
     homepage = http://www.scipy.org/;
     maintainers = with lib.maintainers; [ fridh ];
-  } // (args.meta or {});
-})
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5904a9f8c8f..1516ccaa94f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22740,38 +22740,7 @@ in {
     };
   };
 
-  buildScipyPackage = callPackage ../development/python-modules/scipy.nix {
-    gfortran = pkgs.gfortran;
-  };
-
-  scipy = self.scipy_0_19;
-
-  scipy_0_17 = self.buildScipyPackage rec {
-    version = "0.17.1";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
-      sha256 = "1b1qpfz2j2rvmlplsjbnznnxnqr9ckbmis506110ii1w07wd4k4w";
-    };
-    numpy = self.numpy;
-  };
-
-  scipy_0_18 = self.buildScipyPackage rec {
-    version = "0.18.1";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
-      sha256 = "8ab6e9c808bf2fb3e8576cd8cf07226d9cdc18b012c06d9708429a821ac6634e";
-    };
-    numpy = self.numpy;
-  };
-
-  scipy_0_19 = self.buildScipyPackage rec {
-    version = "0.19.0";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/scipy/scipy-${version}.zip";
-      sha256 = "4190d34bf9a09626cd42100bbb12e3d96b2daf1a8a3244e991263eb693732122";
-    };
-    numpy = self.numpy;
-  };
+  scipy = callPackage ../development/python-modules/scipy { };
 
   scikitimage = buildPythonPackage rec {
     name = "scikit-image-${version}";

From 685bfcee633774d730cd3da2fba6eb39a1b767b9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 5 May 2017 03:11:43 +0200
Subject: [PATCH 091/206] fira-code-symbols: init at 20160811

---
 pkgs/data/fonts/fira-code/symbols.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/data/fonts/fira-code/symbols.nix

diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix
new file mode 100644
index 00000000000..e8868764271
--- /dev/null
+++ b/pkgs/data/fonts/fira-code/symbols.nix
@@ -0,0 +1,24 @@
+{ stdenv, runCommand, fetchurl, unzip }:
+
+runCommand "fira-code-symbols-20160811" {
+  src = fetchurl {
+    url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip";
+    sha256 = "01sk8cmm50xg2vwf0ff212yi5gd2sxcb5l4i9g004alfrp7qaqxg";
+  };
+  buildInputs = [ unzip ];
+
+  meta = with stdenv.lib; {
+    description = "FiraCode unicode ligature glyphs in private use area";
+    longDescription = ''
+      FiraCode uses ligatures, which some editors don’t support.
+      This addition adds them as glyphs to the private unicode use area.
+      See https://github.com/tonsky/FiraCode/issues/211.
+    '';
+    license = licenses.ofl;
+    maintainers = [ maintainers.profpatsch ];
+    homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632";
+  };
+} ''
+  mkdir -p $out/share/fonts/opentype
+  unzip "$src" -d $out/share/fonts/opentype
+''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c49aeeda527..3fac1be8508 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12625,6 +12625,7 @@ with pkgs;
   fira = callPackage ../data/fonts/fira { };
 
   fira-code = callPackage ../data/fonts/fira-code { };
+  fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { };
 
   fira-mono = callPackage ../data/fonts/fira-mono { };
 

From 6b67f971ce5c12c2ca4e7ccfe8ba3c27e9ec6ee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 16 May 2017 15:55:11 +0100
Subject: [PATCH 092/206] dino: 2017-04-24 -> 2017-05-11

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

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 8bd6cfe6b0a..cdb9c142da6 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,13 +13,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2017-04-24";
+  name = "dino-unstable-2017-05-11";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "3eb9aa0fa79ea9fcebb5f702f81c2e54aafdc8cc";
-    sha256 = "0z9ql419q53f20bw4pfwsafxl4qqnz0ip91qibsf9jn5d56kcdwv";
+    rev = "b09a056a13de131a4f2f072ffa2f795a0bb2abe7";
+    sha256 = "1dis1kgaqb1925anmxlcy9n722zzyn5wvq8lmczi6h2h3j7wnnmz";
     fetchSubmodules = true;
   };
 
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
     glib_networking
     glib
     gnome3.libgee
+    gnome3.defaultIconTheme
     sqlite
     gdk_pixbuf
     gtk3

From f5b6c1e58dba2af70a8601ad555b84735fd8b5f3 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <git@spam.works>
Date: Tue, 16 May 2017 10:41:50 -0500
Subject: [PATCH 093/206] zerotierone: 1.2.2 -> 1.2.4

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

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 0202541da40..37812029c96 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.2";
+  version = "1.2.4";
   name = "zerotierone";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "058sy6yrprd23iyx7fxnwyvnp1xxsd55yapjv5m2n7dcb7l4005h";
+    sha256 = "0n035f2qslw1srxjlm0szrnvb3va3sspbpxqqhng08dp68vmn9wz";
   };
 
   preConfigure = ''
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "Create flat virtual Ethernet networks of almost unlimited size";
     homepage = https://www.zerotier.com;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ sjmackenzie zimbatm ];
+    maintainers = with maintainers; [ sjmackenzie zimbatm ehmry ];
     platforms = platforms.allBut [ "i686-linux" ];
   };
 }

From b0ec4b8cc7dc2ebc70a4d6b3a5530892845676cc Mon Sep 17 00:00:00 2001
From: Matthew Maurer <maurer@users.noreply.github.com>
Date: Tue, 16 May 2017 12:22:44 -0400
Subject: [PATCH 094/206] typo: powerManagment -> powerManagement (#25813)

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

diff --git a/nixos/modules/tasks/powertop.nix b/nixos/modules/tasks/powertop.nix
index 6f57f5f5c25..0ec4974789b 100644
--- a/nixos/modules/tasks/powertop.nix
+++ b/nixos/modules/tasks/powertop.nix
@@ -3,11 +3,11 @@
 with lib;
 
 let
-  cfg = config.powerManagment.powertop;
+  cfg = config.powerManagement.powertop;
 in {
   ###### interface
 
-  options.powerManagment.powertop.enable = mkEnableOption "powertop auto tuning on startup";
+  options.powerManagement.powertop.enable = mkEnableOption "powertop auto tuning on startup";
 
   ###### implementation
 

From 864ef0997bd7e3453707b6a4feb114e1f693c687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 16 May 2017 19:57:01 +0100
Subject: [PATCH 095/206] gnunet: enable conversation

fixes #25829
---
 pkgs/applications/networking/p2p/gnunet/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 54c232674bf..6b91956e5e3 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor
 , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring
-, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib }:
+, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib
+, libpulseaudio, libopus, libogg }:
 
 stdenv.mkDerivation rec {
   name = "gnunet-0.10.1";
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     adns curl gettext gmp gnutls libextractor libgcrypt libgnurl libidn
     libmicrohttpd libtool libunistring libxml2 makeWrapper ncurses
-    pkgconfig sqlite zlib
+    pkgconfig sqlite zlib libpulseaudio libopus libogg
   ];
 
   preConfigure = ''

From 3edc6108c59973e63436b39439d77b75afcdfbb1 Mon Sep 17 00:00:00 2001
From: Lukasz Czyzykowski <lukasz.czyzykowski@gmail.com>
Date: Tue, 16 May 2017 23:31:52 +0200
Subject: [PATCH 096/206] Enables rdkafka compilation on macOS

Without --disable-ssl librdkafka ./configure detects that OpenSSL is
installed but when it tries to link it fails because the default
version is incompatible (1.0.2 vs required 1.1.x).

https://github.com/edenhill/librdkafka/issues/49#issuecomment-280219158
---
 pkgs/development/libraries/rdkafka/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index c80c25381b3..cc7c7a31e1d 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
 
+  configureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--disable-ssl" ];
+
   postPatch = ''
     patchShebangs .
   '';
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "librdkafka - Apache Kafka C/C++ client library";
     homepage = "https://github.com/edenhill/librdkafka";
     license = licenses.bsd2;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ boothead wkennington ];
   };
 }

From d14d0ab9cebfa638aeb92ea6c0b718dd45a7e102 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 16 May 2017 19:35:21 -0300
Subject: [PATCH 097/206] flat-plat: 20170323 -> 20170515

---
 pkgs/misc/themes/flat-plat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix
index f231481f454..b858dfc2c5f 100644
--- a/pkgs/misc/themes/flat-plat/default.nix
+++ b/pkgs/misc/themes/flat-plat/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "flat-plat-gtk-theme-${version}";
-  version = "20170323";
+  version = "20170515";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "Flat-Plat";
     rev = "v${version}";
-    sha256 = "18s05x5qkl9cwywd01498xampyya1lnpjyyknj61qxxw5rsgay9y";
+    sha256 = "0z0l9ch6symcjhbfkj1q5i46ajbn7l7slhjgrcjm0ppqh05xc4y7";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 ];

From fb19aac85d9e630f3a8cd12621ff138f6a66da31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 17 May 2017 00:15:07 +0100
Subject: [PATCH 098/206] mc: remove unwanted build-dependency references

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

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 7ea7789687f..0828fea81e1 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -4,17 +4,22 @@
 stdenv.mkDerivation rec {
   name = "mc-${version}";
   version = "4.8.19";
-  
+
   src = fetchurl {
     url = "http://www.midnight-commander.org/downloads/${name}.tar.xz";
     sha256 = "1pzjq4nfxl2aakxipdjs5hq9n14374ly1l00s40kd2djnnxmd7pb";
   };
-  
+
   buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE
     libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
 
   configureFlags = [ "--enable-vfs-smb" ];
 
+  postFixup = ''
+    # remove unwanted build-dependency references
+    sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc
+  '';
+
   meta = {
     description = "File Manager and User Shell for the GNU Project";
     homepage = http://www.midnight-commander.org;

From ca34420a4c5fd5fb16926f413f33c4f91a5991ee Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 16 May 2017 20:28:32 -0400
Subject: [PATCH 099/206] atom: 1.16.0 -> 1.17.0

---
 pkgs/applications/editors/atom/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index e9546c16d62..2b068156910 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.16.0";
+  version = "1.17.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "10qzhfz34i7x7z5fv5a73a6aiwxvanyn0v825a6yz9qfc2mg4shd";
+    sha256 = "10m1sww8zkhnhs3frlnd6g3b6f4fimgp0512wcszgqhvlhjbf9ln";
     name = "${name}.deb";
   };
 
@@ -32,9 +32,6 @@ stdenv.mkDerivation rec {
       --set-rpath "${atomEnv.libPath}" \
       $out/share/atom/resources/app/apm/bin/node
 
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      $out/share/atom/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux
-
     find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
   '';
 

From 8037c5e0cfb7b052ce312409522123aaaa97baf2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 16 May 2017 20:39:42 -0400
Subject: [PATCH 100/206] ammonite: 0.8.4 -> 0.8.5

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

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 04916b1ef75..69f6fb47cb9 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "0.8.4";
+  version = "0.8.5";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "04kni08yd53w8dhkkgbydzkka4cnp31l2d8g23iinkn10ckmz5jm";
+    sha256 = "1n06w18wnkawfwd3xf37zv2010d6crldzgb78dqcjk91i5rdlnsx";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 4bca428d87cf55bbc60962a844ba3ecffb08ce27 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 16 May 2017 20:45:02 -0400
Subject: [PATCH 101/206] oh-my-zsh: 2017-03-30 -> 2017-05-03

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

diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index 8b83e9a37f6..41b834c18eb 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2017-03-30";
+  version = "2017-05-03";
   name = "oh-my-zsh-${version}";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "66bae5a5deb7a053adfb05b38a93fe47295841eb";
-    sha256 = "0rlk39shfh1mamif67smcw6wsc7p1kw64cvk9z3nvlysv6w02q1f";
+    rev = "291e96dcd034750fbe7473482508c08833b168e3";
+    sha256 = "0xy6ka5c8h3rh4n0436cn2f6zrbf959l2ypnnx5ddd0l723p1dzc";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From dfad5d3fedb5755a96b628abb8603eab70fe7604 Mon Sep 17 00:00:00 2001
From: Ruben Maher <r@rkm.id.au>
Date: Wed, 17 May 2017 10:26:35 +0930
Subject: [PATCH 102/206] sift: fix build for darwin

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

diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix
index 42a2ab852e1..c6f7284d01e 100644
--- a/pkgs/tools/text/sift/default.nix
+++ b/pkgs/tools/text/sift/default.nix
@@ -16,11 +16,15 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
+  postInstall = lib.optionalString stdenv.isDarwin ''
+    install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/sift
+  '';
+
   meta = with lib; {
     description = "sift is a fast and powerful alternative to grep";
     homepage = "https://sift-tool.org";
     maintainers = [ maintainers.carlsverre ];
     license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From e131edf04ba88670e0677c8a523d263f9eca86fe Mon Sep 17 00:00:00 2001
From: lufia <lufia@lufia.org>
Date: Wed, 17 May 2017 13:20:16 +0900
Subject: [PATCH 103/206] go-font: 2016-11-17 -> 2017-03-30

---
 pkgs/data/fonts/go-font/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix
index df96241542d..0c9dfa40982 100644
--- a/pkgs/data/fonts/go-font/default.nix
+++ b/pkgs/data/fonts/go-font/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "go-font-${version}";
-  version = "2016-11-17";
+  version = "2017-03-30";
 
   src = fetchgit {
     url = "https://go.googlesource.com/image";
-    rev = "d2f07f8aaaa906f1a64eee0e327fc681cdb2944f";
-    sha256 = "1kmsipa4cyrwx86acc695c281hchrz9k9ni8r7giyggvdi577iga";
+    rev = "f03a046406d4d7fbfd4ed29f554da8f6114049fc";
+    sha256 = "1aq6mnjayks55gd9ahavk6jfydlq5lm4xm0xk4pd5sqa74p5p74d";
   };
 
   installPhase = ''

From e95cb5d58a605ccee7c80aa72b4f509f7a25e543 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 17 May 2017 09:38:34 +0300
Subject: [PATCH 104/206] pythonPackages.cram: mark i686 broken

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

diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix
index 3ba861f1c87..4db709769a6 100644
--- a/pkgs/development/python-modules/cram/default.nix
+++ b/pkgs/development/python-modules/cram/default.nix
@@ -1,4 +1,4 @@
-{lib, buildPythonPackage, fetchPypi, coverage, bash, which, writeText}:
+{stdenv, lib, buildPythonPackage, fetchPypi, coverage, bash, which, writeText}:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
@@ -34,5 +34,7 @@ buildPythonPackage rec {
     homepage = https://bitheap.org/cram/;
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ jluttine ];
+    # Tests fail on i686: https://hydra.nixos.org/build/52896671/nixlog/4
+    broken = stdenv.isi686;
   };
 }

From e75297abbad98ca3325ee0e0a5e73a165345dc82 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Wed, 17 May 2017 00:08:22 -0400
Subject: [PATCH 105/206] icdiff: 1.7.3 -> 1.9.0

Also move to all-packages.nix,
because it is an application and not a library.
---
 pkgs/tools/text/icdiff/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix    | 2 ++
 pkgs/top-level/python-packages.nix | 2 --
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix
index 8469a151aa0..e2be6e9aca3 100644
--- a/pkgs/tools/text/icdiff/default.nix
+++ b/pkgs/tools/text/icdiff/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, buildPythonApplication }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "icdiff-${version}";
-  version = "1.7.3";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "jeffkaufman";
     repo = "icdiff";
     rev = "release-${version}";
-    sha256 = "1k7dlf2i40flsrvkma1k1vii9hsjwdmwryx65q0n0yj4frv7ky6k";
+    sha256 = "03gcgj3xsqasvgkr8r0q1ljbw2kd2xmfb21qpxhk9lqqm2gl11sv";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c49aeeda527..9929b4e9484 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -996,6 +996,8 @@ with pkgs;
 
   hr = callPackage ../applications/misc/hr { };
 
+  icdiff = callPackage ../tools/text/icdiff {};
+
   interlock = callPackage ../servers/interlock {};
 
   jbuilder = callPackage ../development/tools/ocaml/jbuilder { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4093dac55c8..000b1c572a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12610,8 +12610,6 @@ in {
     };
   };
 
-  icdiff = callPackage ../tools/text/icdiff {};
-
   imageio = buildPythonPackage rec {
     name = "imageio-${version}";
     version = "1.6";

From 4a9acbb79a6035333cc069b6ef1643c92c6518eb Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 17 May 2017 09:59:26 +0300
Subject: [PATCH 106/206] nbstripout: fix build on darwin

---
 .../version-management/nbstripout/default.nix             | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
index 3029d17e170..c3ed61f31a2 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -1,4 +1,4 @@
-{lib, python2Packages, git, mercurial}:
+{lib, python2Packages, git, mercurial, coreutils}:
 
 with python2Packages;
 buildPythonApplication rec {
@@ -17,6 +17,12 @@ buildPythonApplication rec {
     sha256 = "126xhjma4a0k7gq58hbqglhb3rai0a576azz7g8gmqjr3kl0264v";
   };
 
+  # for some reason, darwin uses /bin/sh echo native instead of echo binary, so
+  # force using the echo binary
+  postPatch = ''
+    substituteInPlace tests/test-git.t --replace "echo" "${coreutils}/bin/echo"
+  '';
+
   # ignore flake8 tests for the nix wrapped setup.py
   checkPhase = ''
     PATH=$PATH:$out/bin:${mercurial}/bin pytest --ignore=nix_run_setup.py .

From 24d4f1a6ae115b8e1e137d2ddc6a078631651341 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 17 May 2017 16:34:20 +0800
Subject: [PATCH 107/206] syncthing: 0.14.27 -> 0.14.28

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 5462c8bacdd..568f7359697 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.27";
+  version = "0.14.28";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "0i82r2ygcz63pidn1glxz9szgkb7yql6lhwwcqh8b1xnkrvvkz71";
+    sha256 = "0bb4ccyb5rjga651z633abiwlps5gy9hpalr5gi0wlrfxwbdivrb";
   };
 
   buildInputs = [ go removeReferencesTo ];

From d4b3c86a08e9090e2c700db7af23ac3c5821babe Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 17 May 2017 16:52:43 +0800
Subject: [PATCH 108/206] editorconfig-core-c: minor cleanups

---
 .../tools/misc/editorconfig-core-c/default.nix    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix
index aae4a2fd5a1..5509ededb07 100644
--- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix
+++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchgit, cmake, pcre, doxygen }:
 
 stdenv.mkDerivation rec {
-
   name = "editorconfig-core-c-${meta.version}";
 
   src = fetchgit {
     url = "https://github.com/editorconfig/editorconfig-core-c.git";
-    rev = "d1c2c881158dfb9faa4498a0b19593dcd105d6b8";
-    fetchSubmodules = true;
+    rev = "v${meta.version}";
     sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4";
+    fetchSubmodules = true;
     inherit name;
   };
 
-  buildInputs = [ cmake pcre doxygen ];
+  buildInputs = [ pcre ];
+  nativeBuildInputs = [ cmake doxygen ];
 
   meta = with stdenv.lib; {
-    homepage = "http://editorconfig.org/";
+    homepage = http://editorconfig.org/;
     description = "EditorConfig core library written in C";
     longDescription = ''
       EditorConfig makes it easy to maintain the correct coding style when
@@ -25,11 +25,10 @@ stdenv.mkDerivation rec {
       by those editors. For information on the file format and supported text
       editors, see the EditorConfig website.
     '';
-    downloadPage = "https://github.com/editorconfig/editorconfig-core-c";
+    downloadPage = https://github.com/editorconfig/editorconfig-core-c;
     license = with licenses; [ bsd2 bsd3 ];
     version = "0.12.1";
-    maintainers = [ maintainers.dochang ];
+    maintainers = with maintainers; [ dochang ];
     platforms = platforms.unix;
   };
-
 }

From 4fd23d73464a93981b6ae89979ccfbd4001a37e5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 17 May 2017 07:23:57 -0500
Subject: [PATCH 109/206] fontconfig-penultimate: 0.3.4 -> 0.3.5

The NixOS option `useEmbeddedBitmaps` is now correctly respected.
---
 pkgs/data/fonts/fontconfig-penultimate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix
index 13e833bfe36..360cacb551d 100644
--- a/pkgs/data/fonts/fontconfig-penultimate/default.nix
+++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "0.3.4"; in
+let version = "0.3.5"; in
 stdenv.mkDerivation {
   name = "fontconfig-penultimate-${version}";
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     owner = "ttuegel";
     repo = "fontconfig-penultimate";
     rev = version;
-    sha256 = "00vrw82dg1jyg65hhsg46rmg063rsls94hn6b8491mmvnzr0kgh2";
+    sha256 = "1xi664bs6n687s972nch87hi0iqkd6gr1l76zl58pymiw2132ks8";
   };
 
   installPhase = ''

From a19efc1e30e1662970b639a3e9f5573841d8e6c6 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Wed, 17 May 2017 12:19:35 +0100
Subject: [PATCH 110/206] xfce4-volumed-pulse: 0.2.0 -> 0.2.2.

---
 .../desktops/xfce/applications/xfce4-volumed-pulse.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
index 8cbb4cca93c..4344d34f13f 100644
--- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
@@ -4,12 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.0";
-  name = "xfce4-volumed-pulse-${version}";
+  p_name  = "xfce4-volumed-pulse";
+  ver_maj = "0.2";
+  ver_min = "2";
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = "https://launchpad.net/xfce4-volumed-pulse/trunk/${version}/+download/${name}.tar.bz2";
-    sha256 = "0l75gl96skm0zn10w70mwvsjd12p1zjshvn7yc3439dz61506c39";
+    url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "0xjcs1b6ix6rwj9xgr9n89h315r3yhdm8wh5bkincd4lhz6ibhqf";
   };
 
   buildInputs =

From 94c47b08841043ca2a8aa4341fd53bf5260a2d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 17 May 2017 14:27:09 +0200
Subject: [PATCH 111/206] vino: add missing gsettings schema

Fixes this:

  $ ./result/libexec/vino-server
  ...
  (vino-server:13915): GLib-GIO-ERROR **: Settings schema 'org.gnome.Vino' is not installed
---
 pkgs/desktops/gnome-3/3.22/core/vino/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix b/pkgs/desktops/gnome-3/3.22/core/vino/default.nix
index 52481395756..f0fbc9c348b 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/vino/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram "$out/libexec/vino-server" \
-      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$out/share:$out/share/gsettings-schemas/${name}:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From f9633c779153f58f231bf65c0e87fade3ebc3f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 17 May 2017 14:52:32 +0200
Subject: [PATCH 112/206] nixos/gnome3: fix screen sharing

Without this change there will be silent errors when enabling screen
sharing. The GUI thinks it enables the service when it in fact does not
(errors are seen in the system journal).

vino is already in the closure of gnome-control-center, so this is
basically free.

Configuration of screen sharing is done in GNOME control center.
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index be7071eadd7..dc9ed8acfe4 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -124,6 +124,7 @@ in {
     hardware.bluetooth.enable = mkDefault true;
     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 ];
 
     # If gnome3 is installed, build vim for gtk3 too.
     nixpkgs.config.vim.gui = "gtk3";

From d745dc21771c171361189a8a7e2364aecf1f5cd7 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 16 May 2017 03:12:26 +0900
Subject: [PATCH 113/206] thunderbird-bin: 52.1.0 -> 52.1.1

---
 .../mailreaders/thunderbird-bin/sources.nix   | 474 +++++++++---------
 1 file changed, 237 insertions(+), 237 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 51488ce9c0f..78084753974 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -1,595 +1,595 @@
 {
-  version = "52.1.0";
+  version = "52.1.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/ar/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ar/thunderbird-52.1.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "3d322ea4b6a37c1b9b50439dcede0ef2fbe8109b5b4918ccfd8fad479698f951c98e57e6a4a655fbd0d27dd5de038779c717f62d6fff3da1b923d147731656c2";
+      sha512 = "41e7b02fa088054e59d68abf636b376837519502273ff9e25ba18d220e8e35927db2a7795354f997ba0f980f33a74338128999666dc0ea730babb4cb3077c17f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/ast/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ast/thunderbird-52.1.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "21a1609e9b71fbfa9f4bc67f866d007c9fbddd69f59362d2eb93383c2d313bffed2dd181328b3452f4cf4f45a69a1194ce141b83b542f3bc33944f5dd3378aa1";
+      sha512 = "772e90be4cd4d10c1fc98df69d20509c954feb29c64a801d907f4944c429844d375ec241b8c45fdac375cfaeec3adfe7db81c2fd10e592cceb066b6c23c2c2e8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/be/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/be/thunderbird-52.1.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "8d8ebfd0839ad061d36cbdfa1f6805ffbb3310a32a370b9f1a67651a96ff2cb35adf8997572b69581514b8b03a9635396dbf8bfd280f6d9cc96b5954f161ec99";
+      sha512 = "76832c00106c68a9b48c4892a11f7b48384d7934e7cf410eb2d7891f79303af29a2a94a3ac377bcda36a0894baf9c3768cfc62c3ebef0c640291c1b70d23e55a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/bg/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/bg/thunderbird-52.1.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "5ec47e9d65bc07c69192631a78e4f9b2dc0668786aab46e0883a3f2a43b134bb41b16de7b42063b4a8a3ea9751e65ebb153dfb5e73331df9cf29142018b371dc";
+      sha512 = "a8776f1bb3c3d1c34b0a1d538cd70cfefb283031f372d0c7b1bc8bfe9dc39f240c746525a8a52968e060024282642a634488d7a8b30509b830232a63b3111fa9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/bn-BD/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/bn-BD/thunderbird-52.1.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "2b5f067124ed28252858d0f801cd5457a17912b1380c292bac2734cb69db123071f534aac9c7ba715a406cdf5e7b3e05d9b76a08efa11c9f7a9a75141b546ade";
+      sha512 = "e0596b70e52733a01f7cbc073f444b5798e7beeed42effcb329fffe8a74de25fd69636624ef74f0bc31aa27a078a6a5c763f203eb3fdc275f59c3eccf49e0cc5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/br/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/br/thunderbird-52.1.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "61570ca71bdd07e8299c7579bb7aa3cbb49fc190715261de8c1f3c74bc6cbafa66d030949a8e27299310f550bc7db8a5772b3fa22572340d5888be1b33909972";
+      sha512 = "12269d34c5ea1836f8fc12f7c163b966ee57afacf8bab7a010fd1ce2315193a8dbbba201fa474c9dd2e642f418ffb64eef608eaa37a5991168faaceda818aa49";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/ca/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ca/thunderbird-52.1.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "b90e4e220f1a27e53303412e3cee2d1e5b855cd9da2dce3bcff120a6d7d6c8d92e5ddf3e241f9dd5fcde9217afd2631953e8c34bb1ff76a13da23ff15b47fecd";
+      sha512 = "42180ce29e1e53aa08c22d71902cb792ffd212c42c7a3632d069907d7dfa1571d0beb16141ab5b91af9f637d10278a5f5f5a2bd56146ea848b7f88010655cb92";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/cs/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/cs/thunderbird-52.1.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "9846b281b50693fcc28a753f9200f3f232fee32f5353d37dc2eb041416dc35d19693a133b2cb7bbb0bd6c1858ca4e2eaaacdb52f08d2ac9957900caa11cfd07f";
+      sha512 = "63e4c8ba853a1289e977ffc27627e69f4509addbf9dcc294be3a49ed7030eb56181cdc6630e6dc3d207d50e2060ef80d5aeb3aa58c3ff95890ad54f0b88a8fea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/cy/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/cy/thunderbird-52.1.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "8e053f0b1974b35cea5e2161af7a45346f3070187f503b2ce1f7286a7d2b9c7eb4fc9e35d6b4774a1eaf34cabc935b08712f2fa94b1dc1a5457f8e93ce0b688b";
+      sha512 = "30110d9db650afb9b0d47efa25006f03b4a9d9863f7fd37a49d49cfc4f2d8b7735a27676d36c84ef390d8358e0069d4708e6ef9eceeb12a38d226f917c4a2c19";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/da/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/da/thunderbird-52.1.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "4bcc230f2466d7b4c4f138afd40e2e95253b0087afececcbcdeaf1a3a4fd489714ffef5bb1a9b461afaa17f115b1188a7d41d4520b3e49c840dc912897283e9c";
+      sha512 = "1b0d6727f72cb8547f6b09c78d9375a63121d73959666e9500c01aa72253e923bc8f85f7a7738d9a0426c9a9e85bacfde3ad3e35b3101ae0af2c132841c60fa2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/de/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/de/thunderbird-52.1.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "3edbaba5339c93a5cdfe237bf648ea1643c362d12733880f6795f9237699e8304667ecc73c7e4cb766b20d3d4a150ad8e5c230754813dad891b032f7ce684622";
+      sha512 = "4e9c924cd763c15627494f9f247c76ad69fa719e1fec0aae1650949d0e13abdf7d4bdb86bf53cba0db7a124e97f8bb66895c00bbded00f324f8de06c9d1e9b55";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/dsb/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/dsb/thunderbird-52.1.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "ada2c5fc8e71523ae86d3ffd2f51c700b127811d0e47146a500a103acc48c09af17f546fa97c655b27408ca1ac442c927a3023f1e6be3bcee644eacba39db27b";
+      sha512 = "b1b5fd7176a5743cb7064cfb9c74c78eb29873978551a6afd6c80bde92744d9793e53ff4bfca2af1bd06f9285305774d7be0d72d6fdd9ec38dd05e0c58fd537a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/el/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/el/thunderbird-52.1.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "e9498ce714276bd4585c611944865d4fd7eccd30892c910258f6362846fa3cee4c1f49bdf6b77e509aa4fcc6bf2652c5060567cb670d9d842373c69cf6f4d158";
+      sha512 = "f85bc8f35b59176c69e7dc8cfcd7dbbe649c54487d453e56f35c414ce98548127cdf973db7739f7481dca6476c0f9cc54cd42576a5b05abf03ca8a2a26fff229";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/en-GB/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/en-GB/thunderbird-52.1.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "47d12c3121e649d847fcace280d270313f23323e949adb9d3f66aeb9e9feeae6faa014588066d692ef1864b8459ca3834b2ae6d038e9b5338f822fafc9a4b6ea";
+      sha512 = "95249b37205cee0a1677c8fed8199b1a9a98d80b0dfbc513321d72e2a294a84e1d82f19b8732fe30189d9c508d9ebf98be9bf5deda87ddb83134f9b1e24834a3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/en-US/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/en-US/thunderbird-52.1.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "588381a6c0a324dcda7634d0fd431f3902fabfae58510b0b1a6787550a70598364bd463705fc089d79d2697e8996e066787dfd5827ac4d2a34ce9f150a3d54bf";
+      sha512 = "dd13cf3e5e8ca042583fd134172a4dbcbcbaf8fe923d7f2c19e1f66d2802edc9901fad3a2593e382305b97bc17ae3b1266f3c2176648f8255894749db55ac8fb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/es-AR/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/es-AR/thunderbird-52.1.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "5d60384202a3de2819491096df1c65c9838ca7645a30aa62ba49d28176fcbd3353affb7f5984be01b17a6f899a6b8cdcded034ee91ce092842330e19a665fa62";
+      sha512 = "ca300f267a36f1c5251c8eb5200d93ec558cebb22736c6939581f06bb3c00a9b617188be183bcde78afc6bef2c8a579c82d0085cb8cb0b8668c4975f3bd4578c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/es-ES/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/es-ES/thunderbird-52.1.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "23966c83592dcd00653683acb4a9f954c3b5fb67c2720a0f40ff4d39559f210354e1805ae2677a5e8bceaf2e09e439c1fc01309dda9ffba71ca91a6324baaa64";
+      sha512 = "050a9b2468db62c306ff94eca093c9bebb3b55227bda653f4355915264a73a3da4ee930f46fac27ad932e67d8b37f125b33895cc759f5aa213b8b5f432e82339";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/et/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/et/thunderbird-52.1.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "088d55020f599413466113a7aa464dc50526705a8a8b260c36298b5b5394582a708a5c66f09359fa71a4b7771f2a24c2f1ed015fd12696e069789cb106d3626c";
+      sha512 = "f07a8ddb278b697396a2988208cd28059fd1449044dfdce6330a058e060113c8748607c52443349bb59ee8851e6d17626830acb99a836f4102b30ba83e96d12e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/eu/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/eu/thunderbird-52.1.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "8aaec6db5457fc1464899aee22b9d797dbe7fa98c171ed9b7c30f61c550123fa66a0ad5f95ea9102dbae71cf91997b7f51cdfecd30e5138a7f30c9bc34c9ece4";
+      sha512 = "20d04d59df7689d515ecdfb64f118efec8964b7034e0e0bed0225e8b63c7f46228086f1d63b636eb3a549226aecc944db61e3d8fb1273ed5bf669f538f56017f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/fi/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fi/thunderbird-52.1.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "e9db01444b83d4f4e0d745599cfc5c976d4b2a1a5027bd800c6c60350172a4719e61f49e527a923d9a1c436a87dce48f582fb54e3f1aac4b091492e945a30762";
+      sha512 = "357ef2351d131fc4da8a4998cb3ca6147c3b2de638156d69a826d98c48d2fc8478905ba5c0a778280a2b29471f899d1851fa1cf8a7a010b0d7c7c8fcbf73f8c9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/fr/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fr/thunderbird-52.1.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "c6709a91ae730adcd2f21e4e639db17b78ce2c0edbc0790e46e177dfa4f676acfca6c3b242a438a9bba9e40565164cc927f2435be8a73f1f613459d5aa926681";
+      sha512 = "279e46c579577643adbd671455c3053b96c97fad626392b755ebd173b4c09e46ff9f2b52a829b90850e12ebbaea2afa0520c21b5376389b80e5e4f4b09b25ed7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/fy-NL/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fy-NL/thunderbird-52.1.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "41130e5dc138e0b396e50cdc74a096e4de65bcce0ca39a426cc572b077291a8b810543c700657ae8dbf64409d6346581ae44e24584b087f874ebe14fce125dda";
+      sha512 = "ab4f11659e682eb78d14952ca60a1394a8cb7a982d182eaffce9a6c97cd9e6a6cdd1cfe1e278caee66a91a9fa85a28e9cb8daf06f4efc40fd36daef77b0ec2cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/ga-IE/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ga-IE/thunderbird-52.1.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "bca05359f485c88c78d307affb42179c431f39e9eb164fda36c14713496eb8befe03ce36bf01ff1c27e172a86e69b712665d833f140b3b0574c33c83f8fd8151";
+      sha512 = "31e8294c81955b1bd512c46d11659e9d95ef6e421060e37296e4e27d3a810ea3201c5ef01bec34a4161bb4e0a980063c546c4c8a2f23bbb7628dc6762857afc8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/gd/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/gd/thunderbird-52.1.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "2bbb9f96ba9d23b77ff1584a3164a16cbb4b2218591db055b2aa3ad1e5e1f6a296cb953e9c6dd7bed3db0f6baf8113097de00ab6020d0b49a7208ce3d2060955";
+      sha512 = "88bf4276c8148e8e1809411706bfa3f5dbafaffee11d3a2e6cfe32e76a9c9d99c1d43aec5c9221d684ae446ec117704e501dce5790a1f16ce8c3ab6124df5bbf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/gl/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/gl/thunderbird-52.1.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "7cbe56d4ef86addbb2a1347744fb873cedb04b1d699dc25a3ff22e2469d2e287a5d2018ee88d6155dadc0f366091e0132f73382741245ca7054d8f6d7e6d90a0";
+      sha512 = "d19ccbf5cde54e6d4d9813803c33cf4b8bfdce14611e56c364bc2bbed0c65ab6bdb06b9c81e1e22f8b17f341552ea822a61eee431da815ab2b1ce21c32aa6d77";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/he/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/he/thunderbird-52.1.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "7d9574e77e30ccd5880323fa74550efbd7ad220bf1ca5215e6c9bbedc94010497f09b21a667cd64797cd8145a332932a65425c5fb86a4299af03d29e4e6b7865";
+      sha512 = "582654cd958b5ed3abe8a751dc085dcf47e3da92731512925144a9e7b77ac4efd05dc6414b61b63e107763f8149b9acb244913ab83014b45801da79c16d3ece4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/hr/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hr/thunderbird-52.1.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "09194dccd33136017a458924212bdcea7e8986992bd8ade29794b2a4bd2cf42a8da9510423e57f48ff69483f592aa44da5e837ae1413eb94d29748dd62a213a7";
+      sha512 = "61019566186e0d5c3ab8dc963472d010bff1d0ed705b2df17d3e545ebb7cb8d4caf1982cd11b530659413c5e7776b086da89df5fa52775654038eed1ba8826a1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/hsb/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hsb/thunderbird-52.1.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b1e686c60b37e909fd109b71f69467bec41dfa9e9cae37fb541bf34488a36f2f08ea1cd4023e94863ea62185d96d1c97f4b1209b7c5dbbc43f5a0d005148b0cc";
+      sha512 = "7b1987d86b6eb4d620b6989f3b40583db56653be1c9bba9ac7d2a3132267790fadfaa4c34755c8c0df2a0fdfae15f6b8e70fa81dee9fd3885699ab67518a2958";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/hu/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hu/thunderbird-52.1.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "d92362f40609242c78a89a652dda961ef174dadb551a9b8b677d06e96e4c557e3e08f8169bfe0f4554cd223e76d57bf1301f9603d8e297c5c66c16fef1514ea8";
+      sha512 = "89b902b9bc281db85ba11904dd1b422a65ffaadcb41d933ebd5fcd7b7b3f97c2d050a8fdb78a6da88b29b47f0f7643511e90a4af133e528c38f63db326d13e86";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/hy-AM/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hy-AM/thunderbird-52.1.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "7e94c115871e196aa0e2b616457fabae7b63715aca4602daf6d2d622ffa74920e26b10a539633fa93b39c56c09206962cb58ff823bd00e6044bf94a287147413";
+      sha512 = "0afb1d38f1e4ceec5ec0a9d28ea9ca41558d3cec0d1ad04691e11901996d875a2d7508440c6870264c05b12f3776b2d705470cbef83cb11a68c19ae923b75763";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/id/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/id/thunderbird-52.1.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "becb04e3e501ea23300f149b9326f3282c2ab60f70eb39c1a82ec2dc5ef65e7c8c00ae2a349378dcf215e118410c0ff1027f305bd8bdf6a1d5cefde64350ddc4";
+      sha512 = "34dd65c256900d0ad08db33272adc1761c190fc429de0e62d791f4160c241d9950d42efa03cd4e3aaa4ae5627b48ad2c9f0f0ad865f0d26233379d3b9a4e9f26";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/is/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/is/thunderbird-52.1.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "4bb30f257282db43f62ce50b4913ab5978f7cc8198b3c696d16631cb0f3369f474e1f1ecc91441a5762253be4e2506317b02ce9d30880f4d6e4ed792b6da95db";
+      sha512 = "1b651359c2ccf8249fa2ed951e69bc2d16bdef08db6d103dd5110305ec497cce4452d2764c814068c968bfdfe75bfaeea0d119f8457ba1d72c881097c22fd143";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/it/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/it/thunderbird-52.1.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "7ed5f13c42d8df83e8cbbc5e814c40c52ca46eb35254f5abf615ecfefe8a89d2bee56650f0358563de37c2503483fda272cc606e25bcc9dcb62100eb5885e66e";
+      sha512 = "15aaeacb1a0ab38297a179007039fb3fa5825618eae5e5d650f041bf5311e8f244dc0ef53d99b9513fc8e17b4f1d0a731cc06f08223b42d222be5e8f56b2a651";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/ja/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ja/thunderbird-52.1.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "8fc066d2b0da0de13d0fb069542c4336bcc8416c1b435d8541cda86b768afc8cd1156f0a8ba90d7c22d4dbb9a5f4a294d5a34af825f4adbf07a74f316dad6206";
+      sha512 = "ab3fc3d0cf7be8e463c5e8f25ccac1cde2df9be15277bb81f253af15a0de53935cd5c53b8435e7ef5369cc43739b6e2fb8424bb2d7e1b153201b50a8385d1763";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/kab/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/kab/thunderbird-52.1.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "2264224e6d6c4fd4dee4197fbbada0dfd7f1dd1554a54df0694d03e22ccf5881f8ffab47ad65686d4021209d0ac0938567c661b4599f4a76bcf2c57a66b7c9fc";
+      sha512 = "60f2a58444b06ec8f7bd98ccada16b33b0e528bc59b73d33df370cd44283b2b0e65160aa1b5ab9cd0a7f7c628056e3bef4d7c293814837b6a7df17dd057b8ec8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/ko/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ko/thunderbird-52.1.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "76b8c2bc2269af9bc18b8de47d1537885e54fa1e6e7d7c4b5dd4d1daf38abdf9b5e480668ab3aa3d95f5f81440d270f45743f276ebfd664d567c7c19d2dee465";
+      sha512 = "de7fedb8b379f54488c5ef6927c53e0c3651f08cb33b97a06359fa9c5a31b0d4a7717df8d493236b7e6cfcc5173d1faa3f07e938b65322ad6847f59c4061597e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/lt/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/lt/thunderbird-52.1.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "1a858766068e87c0184ef52fc356673669120295a9c21ef33a535936e46050d32214e8f59bb7fddf12915db1a00eba4e4322ecb53864ea5dc64416301ce2c15e";
+      sha512 = "9c4c9969a851509dbddf3fbf0118067b29f679b2e13c15f507579f232a311941c1345636714c94151323bfe726f760ab507def1dfd3a4a4053c60d533a3a2abe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/nb-NO/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nb-NO/thunderbird-52.1.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "a76b77a8080caa6126f1fc1d14b14027abe47b054030b8a2806cf07080ff0c735add14917d5f6edbd281f8e305c2e3f5d59d54677e9860957ce6f5aeaeac8452";
+      sha512 = "61f6e4a840b8cbcb9b0706f121c93798924302184ecc92e4f6b4489178ae3d6962d6ecee52feee21fd4d89c5da7f349b383b5bef6f0b961e6e15a10f6dd5f2e8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/nl/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nl/thunderbird-52.1.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "e925f8a705683ca709b2d5595bf0566bd659a55b397d324819e70b1089fac40e9faa88396826351c8246e16d81cca44f9fd961abb08e37691b90bcbf85268a83";
+      sha512 = "4de0257fa93e7450442cafcb3cb328928687b974303d3df9c4c37db843bc3379716a7c7058400dc11f25b632266f1f4f740de4c4ae099d6f88d810673856d562";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/nn-NO/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nn-NO/thunderbird-52.1.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "feb78573c9663a4d9662537bf04080cc860b74966f5a0be8fb02959b07da9cbaec37bc9d406a69878e24377d5289599e971096f759a64b9c962eaab72e12e230";
+      sha512 = "ff6152e088e8f94f60c31b172502207609a9b0908057f8343177e9b7c6a079dd2c503928debeb2c133a77edd6ebac5f691a2078f54d572c2479f60327ba580d0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/pa-IN/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pa-IN/thunderbird-52.1.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "1006a8663b4d525d4a7562ba4af16283d997cdcde3251a5869cdf796c7b7502a9b39e8859983d541f1c9750d5caaabe4eba4567ccc1efeefc6bc4be5fc552e16";
+      sha512 = "9a7876869b412efc3463eb2d161f4655804f740bbae0aee075d0f7e1466de6fbed21545bcfb93c5f03fcb837d3459a40882f4fceafae137f8aa4d3841010feeb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/pl/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pl/thunderbird-52.1.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "295f44282ba8ae0a228b1448d904776b11fddc2d52251881b4e3056356fa22e7db05ecbe2c76036b5ea140e46cf2d922ad1ac106bdaf00564612da0bc9701693";
+      sha512 = "9f897729f752126cf676a05672aaa35c620d025ca74ef8c611948b2b19e9239d39090a2983bf9568f796d0a20acba4fccd262ed04433c564791c5ef837955425";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/pt-BR/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pt-BR/thunderbird-52.1.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "bd5254ccd19f92ecb4ba6d92ed28a775c157b3cc3739dc55ffb7bf622c79b9928b8bd22e5f213724a3f0597307f33f32e6eb9e024a857cf691f13a45ac02c62d";
+      sha512 = "fba636db2837ee9835a35bc36af874e50b113be1edd123a74c9d71080b25be761500b8aeed7605f589cd06328d67659cb25fa25959e49c017a4c63a27be3df6f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/pt-PT/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pt-PT/thunderbird-52.1.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "2906ef8d811e400008624e153238a03c9ca86fca0a39a6866a2f90a98b40238d00836ffc34e0ac4b397d0b9699ca603ff7bb041b213c21eced2b4814c2082d15";
+      sha512 = "0ec0668509a19f52432c0de6450d14b20be01e0a26eedb316e63b33f44a001c3ff82c3b553ef51c9de740a164ad33ca25f9b4b2d64b792e89ed803b9d68d11fa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/rm/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/rm/thunderbird-52.1.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "537620483820fe23bc09f8061e3a2fe11a2871b56f6efb6e0e328e038bc2632c02daca14160dee53cfdbbb82c700f3b447fb6ea7a83a51bb8cb8d4c7364f0698";
+      sha512 = "fc75870ecccb5cac6533887e96a3be0b44a07b638b96c5993c7d6ede1cf0e501172ab83c85b2e5978d6818086c4e7802ae133da96a8331846456c184f3dfa34a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/ro/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ro/thunderbird-52.1.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "e645a8467a6e5add1f1b13da06e9a4bce2c49fcf8a649ab9e99cecc45fe995aa24655050adf5f74e466b567ff52a7ad24b4c6ee4247a93d4a94e496f493b5359";
+      sha512 = "bbb3f37e6559599022f3ac5aafb62ba9e62b67ee5165eb4aad2fb29e722206b7ddd0e4bfa1e5cf57453e0fb572b3829bba3c80e4ab0b3b14c91ce4f824f5150f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/ru/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ru/thunderbird-52.1.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "5b85e10f87b7501923302f98d737d327d6f22410d83c2d60b82b471e50bc3936673c78f6b38b7e49df035e2c92a29e7e13ff2dc1a21b9322662bc2fa52bdc359";
+      sha512 = "f93506805c0d45f19a7b17f3eb82a6f8ce6beec11e4fd6ea09888bacbb90f258cfa15bf35a6b5868ce496491b1dd62cf12ad4877576f4b00117f169065061555";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/si/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/si/thunderbird-52.1.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "4741f58a8f5577da82abf6803cedb53afe4cc956ae791ed93e43d3c1db900d3f58b2a4064c052a0822f76c4fc6ffda5abe4a14eb10606f5eef5c68b3b302dcfe";
+      sha512 = "09a1aa2393d95815cea16ecdc4a2abf7cc7782744e8ab39a447ee195feabf35102a7cbcc57761c1a8bab085036dea949a3ab2fc5cb3cd00cdd01047e1de0faee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/sk/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sk/thunderbird-52.1.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "de86889f49c59978702a3cd90fe924ad1dda3f9fbf5285a172376b73d0e0cf0d63e671b361b6a125ab7a5ee97202ae18fcf55534936a7bb680f1dc8e425f5c11";
+      sha512 = "d37c2fbc9c72b627278e8bc8073544f0a35bd175e7015f88bc037861a5513286627ca016ed643db490759d7a9b57feaa7d0bb8948545da67ac6fdb2580549e93";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/sl/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sl/thunderbird-52.1.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "7b6349f962a834269a9a5f0163a220eabb07866d0333545684cc986dd54b5ac800a7e450db54f695e811236dbd22eb7f7c73afe4f1d21c85052c8c256231120f";
+      sha512 = "0134f110196af343e0fb3f24970caa74fa0a9f48c4c652e484bd79c2fd76f97eea86776c5b528c432ed98d24b2ce83529e7e68c3e4ff2533dd554465f24f701d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/sq/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sq/thunderbird-52.1.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "13451f76b5a954bb07d6bb3352cbd6e2d509819d9a92f07e21f7bb4c4cf555fd09fe080f21fb5bee4bf21f6de288137366f82e895cdb752d0676db61f25f023c";
+      sha512 = "9a85f94121e1af70e8eee2f0e56693807f881c288efbc9d4f4affe9353f0018145d2df03be74b76026dc0f51b28969cff69e19b639271df7bb34bbaeef21ffbe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/sr/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sr/thunderbird-52.1.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "eb6d9602fe4418f0bd4c633cf8d729556e52fb31183f1abba7c699dc4e7fbb2cea2a0aab6ed5f9cc23987446b5259b400d6151714f45aeb9029965447ac4958a";
+      sha512 = "a11ec69a7fa8f49c9fe98a53280f6e71cb4dddea4f8a5a4adcb7a95cfcaa548575b334a15ce7c06dcb6053d633a1f2bb09b77ab022a09c3987228fd5a9fce339";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/sv-SE/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sv-SE/thunderbird-52.1.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "9f9170e3f93c92f2f1d9d82b9661fad400001bfa75fa95b0bf5468d7d06dcf6634ff066e7edb6112c081b741666202220bf08149954f523017a7256b126a6da1";
+      sha512 = "04215a4507f057151a9d3bbbc092e7c54a02bdf19af3e18c8042c0fdc477cf5739d3007beb4e28dd3354dae7ffc628fb601c18ad06e8898e5445c35855cdcf5f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/ta-LK/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ta-LK/thunderbird-52.1.1.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "f78a9783706410634a2fb0884fd745ed6fd1e8ebed694eff5d508d2e06be573794b67886fde5ccc26c879222ab51c49bc64a0e05d39fca981e03e8151998ec6a";
+      sha512 = "f04af1419a7175a2c15f65bcca7def7e1ef0a82d4e1f706599a8a2a731b07d7d554dfd859911836f586cb0da09c8c67452110eb8caa181e4cf1d39af39406f55";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/tr/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/tr/thunderbird-52.1.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "47192344dba9b360fa99b401f0312fc333fee983c1838cf2d9d93852166379b226c4713363ebab16ce3839521da2c8d1f9a570a5ec17678eac9761744273934f";
+      sha512 = "44b3a06fded09732b1914ad6a373411eacd77defa23c29b1ac2d422f9f38eb3aaf5838915d96ae2400b35b6e751208f21b3f213fa92968887504187548f70431";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/uk/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/uk/thunderbird-52.1.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "ac117704222405e0184ec01f138a7b25b8da96f5e4e5f9ef8452d20b1e4d03dfe8256a54056c682c600c0868d3818b40376065dd52ca9f2cd2e8a5e6d480edb8";
+      sha512 = "c7024c0394da23e067327f9db5cacb263ed02e5e23dfec0059a64383a331b8c9695d30f0e25b2892516e189e2a7e4796d91041e684f44a66d0d6bfd287499203";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/vi/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/vi/thunderbird-52.1.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "ccd0e5da1d86502a3d46b076e03ec9fda2924d8a1a370c7eeb22a75f3dcc3777737f3d87172613f4dd2302d81d94393b4e35de8bf2bdc746664a3a6379c3e9a4";
+      sha512 = "d7718cbb734a11c82b4ec88e73174f34fc34819c0c398855897b7b11d811ef27c785d9588764dfd8c149adf61227ac416b8e64dac7d0a2bdfc1fefa5b980a4d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/zh-CN/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/zh-CN/thunderbird-52.1.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d0bc299c467d58b858ae5b6cdf44ca4b8b37cb3e49e92d3bbcb9a57aa84a6983ad39af3643484bdfc00c6ea7818d1eea2c92ef2cfd3c94af881f1fc51914f08a";
+      sha512 = "29b5183a5d824e6e5d4045b9e41403fb5b321ff7c05c73dd43357fe67c87fe05be26988f408788a7e0e1655f0068cbdb80311f396ba991801d0af462dade3432";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-x86_64/zh-TW/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/zh-TW/thunderbird-52.1.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "37d1085c0dcbdd8ace9f3ae876277ebd36b8ee4dd79b260fd766b24452649afd8a9509d340bbd9891e0a4fed47592c7961681dfec13d9ff448c89a4df52e8c53";
+      sha512 = "0fa4d43ff9a1f32fdc9695075205bdd32932ef790f53e04da778309bd35f5dde56f2d51d972d8c998eee3117a287d16fe79a49435b5cdf6631fe65395bd184c7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/ar/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ar/thunderbird-52.1.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "a31e7209b1848d3f29566266a1d58d8ac5d82690146fedaa45f79cd4b016278f1f1faf84405141494093bcfdf27246a2e24880a02612037f99b2d3a0c9ebf950";
+      sha512 = "0234f231e1dbbe5776d9ea37a18e546d049470efe29eac34c2c4d05c59aaa81f509bf778b37d3865d117fbb43db17e33464090830b531ee434d7775b4020ab44";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/ast/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ast/thunderbird-52.1.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "9a69f6c59f80275941fa731e8ab110d84d53854ccb830f0c8224a65c36e63872f05f06e8ebd9ef94e3fd200fe6863c580798b233217a44bdcc12b4268ca8c61b";
+      sha512 = "5ab2c379709ef07d82870da6259fb9354005235d485d6eed4d5a0b1d23c83903e7e6092cd49ac2439b01c5d4f1e663f121bff7a45ade72eb18d166787c4f62f5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/be/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/be/thunderbird-52.1.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "e6756055957d4d073d00aa8abc7dc8ab1e7e8acab170a555628714ea65c36042f6ee171c3c596020244ee241c6a600b0a9d42abc82761df41b5dad3d5a2a53b2";
+      sha512 = "69c596d711b91664031e52605c1510532f2600b3927afc4ea12a1c9332baf5b05982a09648be6b30ea42b763a18f495d8fa2274515f8088c0b2e07be60e0510e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/bg/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/bg/thunderbird-52.1.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b22a4394cdac862e5870b45b11c7f87556bec2cb38e47f8da22a37325145361df4c815676e9a91def8d8a0d5b2ca876cd57c048dbea3acdcc6e517042a64a20c";
+      sha512 = "0de0dcdd70902f0f1eb8d8d361ce20383c8bec9ce9ea6ddd664876e6386075a424045478bbe6c88076085c97dc42bcf2205f6870e6b03f46dfa3872275ac195b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/bn-BD/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/bn-BD/thunderbird-52.1.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "e956bd67e1ff58132020204d643a8fd618431d9716fd77dccfbf30cc9610c4f5305e2477471394cf33cf8ed80a3be141be9b67aa73c6f08e44cdfc0d00e4c9e5";
+      sha512 = "73e82f771d90a4861b9b34adfe94714cab47dd2cc86b9dbad23390a2cef8c0150a654a26a05a6a0effd0efe79a3caf419fce748e35ab3c94610d42e2cb06686e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/br/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/br/thunderbird-52.1.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "692fae122e2b381d110907b4a23001a51811dacb1506a563f9680cc5b80bb0692e1a1b52b1612765032645d3a33dd2d4631ad8255aa1e013f6441601d6330693";
+      sha512 = "1abfcb8f361ccf5526f947ad8b7c497233d646913abb6fd345814355c548b4c93069a9710d27d2141c5e0045323522a6e76f9f3f53d7dff2c131ac94778545fb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/ca/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ca/thunderbird-52.1.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "bbe5204d6b465c3c68f88bd8983081fb5e7ee7e7483208f14b5d107b28ea129692c1b5c7ccbd8f9f0f3dc65b6b444c0a11e13768fe36c9e6b7547dff0e50612a";
+      sha512 = "07a3436b009ba87180659345261de142d94500b8fb00fe21d9c48cffa43fc42f644c28bab739d420908342e28747f4f564eb46ae4e24222dea45f369a5caf3a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/cs/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/cs/thunderbird-52.1.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "b5219752cc20657b401c4101accc7f16e44a2ed82ce4e80a890ad2d58d552cd435d83c4a69ede8b0949ecf84d81c2ab2b1da4c51b623b8365096fa3c234771d7";
+      sha512 = "58b90bdba30ad6626f285c73601faf30f45fefc1e670e013e7f9e6b92540647cb402ec69eb88ca00dc450801fe07589792bae6eb602ccc60479f3ee6e5104ee7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/cy/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/cy/thunderbird-52.1.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "769c15d09d20dbf4a27b61ad315188598463068c7de23d97dd498e2005a610c1af77b6bb452304a41c9c709f4bbba963a8680dbd08329ec7c6ce2b29ffa76242";
+      sha512 = "d880dcce1b4dd47bb738d990886b71a858022b8ca76c67d33d8d97257e28cd4489d058526fce6b677cd6e925acdc2d04870e5ff6d84a89d82e2bc9f91469536a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/da/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/da/thunderbird-52.1.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "b023c8fdda97e1f1bd6876ef614b2c790e0602e6ca2725fb4844fddbc57d61225a888f9a63c9cc08133d6c2f35d57993dfefa2200f6ef5c05c93b764ff5efb7c";
+      sha512 = "31e26b2333544c950b69a631a4f889052c79f3411b3f55b8c02d7fa248d50409a363ab9935d57946b704b5b85819b3e30bbb8230871a582bb27b8f2c062ef1b7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/de/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/de/thunderbird-52.1.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "bedb599246d6228f5de3ef68f8325683f613fc393205167a74493102b9fb7e9360affe956ba2941255437ff7834daf5b5605bd29af68175ca11cb275cb9d61ef";
+      sha512 = "c86681f6616d5f234f0878aa9370cca4c0fc5f38c131f2a3908d8529ab2e86e340558988c3ac5067a82edb99a3cacf316727652d181fcc0bc15ad7ecd713d11b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/dsb/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/dsb/thunderbird-52.1.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "5537329de234605ab7dce6ff1716a565f823ee9028a9c3627fec5ff479c7bb503246908967ba504228b1e6b2e389c1c1a00bdfd622b4bf74cc5d1dac31a92578";
+      sha512 = "4f3b39c1023235579079a46a7d557d177c3f2e398a6e311c728ec1083952b2c67db0cdf539d8ae3abc54061d22e607c6849699008b76e9b01569d12d6600feee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/el/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/el/thunderbird-52.1.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "173902ae0833c298d26e3ae1113741bcc22ca195a94d7935a8135c35195d84fd6488c3ae98ec9da5abafa2fce48d3d0becd8d61ccfb2943e6ac8c5011748d3bf";
+      sha512 = "623205d1e326a0310c54a9c14e469fdbe156e538c2a09a770c872be8214611743b6d354b5a7b106db5105b8b278540d7f623c6fc56bc1fd450333ec774ded706";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/en-GB/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/en-GB/thunderbird-52.1.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "a2cb84189f7f94b7ea556451ef624e9884b5c7717804eecd9f0b03f9d6b07ba986afc7aa0b85f12223c71face57eacc32c460d3e939ec187704355a979117e6c";
+      sha512 = "b38b9e6350edd11e58c644ebe4c11aa6bfeba7e7aa6fdf40f9b9a4cb5845f5a2895b82ebf717ca78138a0f11cdc2f6f5aefe5636acbcff857ba99d27e258b824";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/en-US/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/en-US/thunderbird-52.1.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "60ef6f688c237a44550a98ff061fc947dd9c2d44db4739d63948e58adbad1287f1ea2b2320d7a8b77b1c6ebd5dc48104f5ef421424a033649f981bb77978f54e";
+      sha512 = "192f42fe4c7b9689743ec16191ef8576a19699812cfc4984e4b559fd847ab92c1dc002cbbdbb2212fb547fc9bfd77b4f58639d219ccc1ed86290b61f9effebf0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/es-AR/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/es-AR/thunderbird-52.1.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "f287931dfd410de49972450cfcf9a8e5cbd207a4dfce126b2229bff18037f535eeed90434fb403fd882dd6d3d00415c0ec633d41ee904d8dfcdda15f6076b0f5";
+      sha512 = "2022d12dd755e6583b3ccb068ffc53b91308702cff57f57ed455aee7299f8a7d4e614e600acc80be9da0e9df8e86c273b6cc7e99b94c5194420be367d5f12497";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/es-ES/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/es-ES/thunderbird-52.1.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "22aac95907cc6f81b0f26224688da6e53ed4086cfc2692ecc1db5ebb4a9c70e561ba22cd1a64775e42480ee302d638c38332a681468e54dabf8932253c7c8a42";
+      sha512 = "058004f7a94b55a393d626869d7b7690d17fa5b51b0466d83c029c65ef3a49d9efdfc0df2c2110865282972b23fbd22a68f81785d098cbe3ba6c39c81f5e903f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/et/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/et/thunderbird-52.1.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "3d6dc02524638f61f6d608f476a99d06f92f9a5b3effe98cb88db050fff63c1beada0f547688b49c8d341f4b03715d05fb3b5b2b26fe23e735680369250171cb";
+      sha512 = "95247bec1a365afcc5f6985ac635b0ebc02b2c345704749856ff5d9aa3d23e22fb274812617f3cd1648f80b9e47c95100fc10d41d5cbf0f8b7322e57adf48165";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/eu/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/eu/thunderbird-52.1.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "9d451b1d9a2e96de191f4e50e1eef21ae6100b531ae23e9e503188d94164b476d1938908b839339dcbb693ddc5d309199d3a9f8be5ad462f2b7458df81e9945c";
+      sha512 = "e561dc2fd2f32dcdaba034f7486a55da8e332c7a67fa4948ccb073fea5a49910c02bac3b4f988366d0e4cf7da00efa52020eb1fd837119e95360e7418b65e37b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/fi/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fi/thunderbird-52.1.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "194211fad20c3ec98c6d082a301fef99f887f2bf974eaf98abed221059196c632f857c0b3881a618580ef33e8a86790a78a2c018d5abed5f32ccca307298f0ad";
+      sha512 = "d014aec796d7c4823748eb2d4a76df85a10fb6bba58d26fc9e46f72bbdc1457acbe473a563a1ebebed152c11242bd64b8c306c2fb43959ad2b649830bf50e95d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/fr/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fr/thunderbird-52.1.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "4eaea56f7eab5a42bce95c0a53493e6f480d5741b27980409b5667337a9aa3ddbd8a20945774ccdc43182572e2821f6f929b7c93b713cba6803cf4c6f837b5e3";
+      sha512 = "e7bfe888ce1bffcb302c96bdb685bdbb7588521e9dec863175015622ebe13d0aa2b8a75c8fbe9ad6030be8303728a6a6718a837fc8fef8d0009fedad6ecd1b36";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/fy-NL/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fy-NL/thunderbird-52.1.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "124ae25aa3d469c7fc83c031a5cffe76e49db991f8a8af5cf9d67cee88b9fa37e941e22c94c92f0b52e3222604eb19b6d63d258aa220079e864f67276deff2f8";
+      sha512 = "08bb1c4e4187e6a4f61f9ad88daa605186b341033c256506f9dc2c7626af842a628dfd59732084cf1b6bf94eb52e78af9942fcbbfb3c0a0c42568c94d3a874d7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/ga-IE/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ga-IE/thunderbird-52.1.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "e91c8b5d176c19be49ae6a10c600369f38a420872b1621ede488f10bfbe5e09890d96a18e5e12256020a5d774723d582cc3a799e3cff27ef90d60cafb8bb1f05";
+      sha512 = "737af536b710b633b849ae0f7017bf9387daa6a3145409ed8cb315a0738083195992bac1fb4215b590784b7b2389f0611d89b55e17b5b02bedb79869e7caace9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/gd/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/gd/thunderbird-52.1.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "51e5529755401848cd491835a70d73bb37142993ce7e6149d6647cfc2bc252dd71d4fdd06c9b0fa3a6d3c8d0c06eec06bf86825890da7fc09c8cc4820460be71";
+      sha512 = "2ede5eebf73d7fa2f9ddf5a10b26649d43bc24512512b8f31b2998786c80de1c75890d3c825829ce1ee030ebb90e6bde1264cebc45d17475bfa5a343a5520491";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/gl/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/gl/thunderbird-52.1.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "a8781dcbd9f77ad6e77aa728d384499d7e3b3a7b279efd109d5857a6c89a96673440fd3b4d053652aee1f2972abb22b40e09952c8b09e2b69d5acb405eca95d5";
+      sha512 = "b0ae9a3d08160024203b6bddfa6fb4a9a15c552cce91701d644636cc9f9c6add879a1b78138a0bdf3946c9f356dfb50d97293cbd070bbc2a9764b30a7a29263a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/he/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/he/thunderbird-52.1.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "c6fd0ca900c4119ada2f8655cdc95caa2bf9df21c7599dd47b56bd13b5e8462831c5cd9c97dae0c573ee806e3f83fc01559a10ae3e7b36a600821560b6aa3bdc";
+      sha512 = "b1f5d4e299cc2d40397fb96b076625ea7e86faecc0ba6503276d675125373fe7eecfd531caf24241cb446bf47ba986c4ee497fbd115cf67160ef24b87f6ef19f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/hr/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hr/thunderbird-52.1.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "2875c00b77ca528ae0e9166c5c5db430b1637217a3d9b577c6fd37a06996d458c04c1c23153f266046a62fe8184b532b4e168e0529cd2d44528dc227cfd776cb";
+      sha512 = "7e52b5aeeaf9cd3c205555b1cf69c7a184b3a30605611a0cbc66a7591beb9d11a18b5e084adc9f88a7b74b24b06dd9b470bb966c6dc4fd946ab23b6565608ff4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/hsb/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hsb/thunderbird-52.1.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "2386b17c22d245afdd090c24953714f924674703a4d63c95f55ebb94b1022d4f227b06db17e055b6a91c1ea7e6c69856af4fbd09b734a0e8d798ffe357580302";
+      sha512 = "49c718f7424337a6477b175446f3b532d0603ed8dd2bf789497706dd6c25f1d4968058facb61b2ea858e908911d0c04e87493a0956c33ad33df11d9990aaabb7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/hu/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hu/thunderbird-52.1.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "2576a743a98ea6e86bf423812b971ca251c98efcc3f4539365abd7936d917ff730b4772c3e56a460928b98af338d4fa7180d43c1ade8b6fab6eca90450a754a2";
+      sha512 = "e6ca202e31f41b7e57235172fb107ddc0707633ba5762651da62e9e55f433fe21de642f20bc3cbddf99ee8a9881dd646add04bb180e630364e45384a13e75ef0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/hy-AM/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hy-AM/thunderbird-52.1.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "0b7ef3390cba99e03930ce884b6ac59120769be6def7f29feff1fdd2206c3a8d3af04bc9bf5f5437487d1a4793177d60ba03a15190c3c87ac4a0fa771d956417";
+      sha512 = "43aed794a82dc7e74f086bdc9e401ecfd59329098c8a9a650c485348977815f7419cd1cf913bc3fba025fbfcf1a15db6b883ef6bf483e16187a85dfdad9cb299";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/id/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/id/thunderbird-52.1.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "f2917198294b0566867018d1b90b4110eb6eda677e912ae2b199c8e3ee9c716d3b5e33aeef48db8d3a09e2a7f6a10af0f17157ef8d12e5451b87c52a2e1f3dfd";
+      sha512 = "3ce1c383d7640b9af2b7eae5e7689a200d27bc0a5527b3f3be1b1443ef3278cc58c0f2c0e3a9f94cb419fdc3b5797612fa96d78aa9a418b59fb066977955096a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/is/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/is/thunderbird-52.1.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "73ccc2e38fe68a25154596a65887c1c3e90a2d6166f0764bcc6d9f7e7018ec5d443a5b24f41acbb8e77fbbc522c74ca6ef909fe9ba636a8288c1724b02ed9673";
+      sha512 = "365d5b4c78605df8869438eca9ad700ff2353bc18d64cfedf8905bc7307646b45c365813b537eb813806a25b8d1f121595df744ac60b1cb48cfcbe4395affc7f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/it/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/it/thunderbird-52.1.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "2255900a747d69de7a30b9b72a1eb261f35fa3a6269435f98923e82271ceaaa173bb3d86034e9fe1f9ba0e29250592ade8583f9cd51f29798549cc9f628ae46d";
+      sha512 = "ad0946bf1282f3ded23847b6fbbce55e620ca34b71bb3c7a12a6bb24e6e09a4d737503c39f5d634bdcd4c3a54418ef6b96a83fa997d911b85d8d05632d921711";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/ja/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ja/thunderbird-52.1.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "5429e24c2ba0e59dd4ead497a887f456be12a19921fd6447d80e93c92b4a2d9c08cd79b31c2d5e57ec75133474adf94eff87239cb934c5c3c2ef126291da46ff";
+      sha512 = "34841d9c22e9b4d737bc56e23935f12a5a0bedcdbb127447a21ae9a837c9f61ef93b9613fa2123dafc39cbe7f9ec3cc0b92c7dc27f96ca3175ae359be3cfa1db";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/kab/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/kab/thunderbird-52.1.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "6611561fb82a9cd2b3e1e1fdb1cbaf851d0e659c3ab083661121ab7a71f717f7a67fd23f8d5886d144cb8fd0aaaa0754f7253c44ef486de5f9b0cc54bba42550";
+      sha512 = "19a40cf4ff9c0e34b4ae46a54364ca9b152aee18f2d4a438fe947cb225d9214f8316bd9aacfbec803076716668f100b0a02dd18b1f307498d086cfd6466f6433";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/ko/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ko/thunderbird-52.1.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "7c6864d255b2e745a2052246ba234e82da45df81d7b6c4ad11edc08cdeeba3abe18f1827b6c53ca182bf02d0d4ef01fbba8be426523800c8702bc5d93be20e9e";
+      sha512 = "1497535d1de169c0498837ef164434700a99d5dfe5032cfbef62de4535f47c2473ef335f9796c0d7adf5c7f2cde7c3a655aaa92d65651667afd7f3cdf7cde574";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/lt/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/lt/thunderbird-52.1.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "c74489039875d5db0dfd55de1b245136d4b42048f685e9cf665a62791260c8b23322ab94f474ea389556217d3c802268325d7f14b584d18c071be57d9fbf67f6";
+      sha512 = "54bdb2bfa2cf97e03c389a390ad018f485b5452c6c4e8acab9cc71c0076b830cfc7267a1e755f98ac54c87231511827ba7c64aa2502c502ab47d554fc5044856";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/nb-NO/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nb-NO/thunderbird-52.1.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "ef6687126f5d405367a26cf74c4ad8255bb2be69b902c1b38557c54bd4fe5c997ac08f182da9b09c6fc4c69a1531fbf8c0a5f28e3cd1f01644c356a2c67e7221";
+      sha512 = "20f5d2e7bbc083a990d9e9d8373d1485d58d62837c4d0d0d9d0955d3a9355c326d8eebbbfe0c61090c598fca11dad85d101ffb96b12f72b76da55fe72773ad03";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/nl/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nl/thunderbird-52.1.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "464beeb01f5cd4a19029205899df4c0d60fcc93c8557566feeac937c33f180def8ba459662994d9209c692f473950518aed277801d8ee28618f6afac419cfa4b";
+      sha512 = "c25e14b9d28f4985ffbb125b984168b4f073773c03bfc2af2bb845db19659b25d69e634896d9b0d92ad7f08ccd4523a5d58ee42fbf23ac25499f64e7da7463cd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/nn-NO/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nn-NO/thunderbird-52.1.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "726ff54f1612db1dd3683a4b752045316f5ca3531596eb2b70403b5bbf4273610570d518cd71800abd1d12311043754d4ae8a8ef0946b37b454c7430d5998c40";
+      sha512 = "9fe667f785abbdcf57890c3c19def43165a5574409342eae335ba32c2f9fa089eb4c2d443fc6254fe5d21ead0f0d04fa1e2250f54ef805c2668aae37b15a3f84";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/pa-IN/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pa-IN/thunderbird-52.1.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "937510a072e1e298f13d21e46dce40ce75e309b9dac590b3bdffcd2ba45b3035f4b5059ea7e38b187694d6721fa8b43bcb8bc7104da7a8859175f1c8364ba9dc";
+      sha512 = "cfd6c5d43ad9c78663f217b4ebc40b34d80cceed7e266f95dff1d70665b4e7187742621367085ae38718ba15e14bebaf8a32bc8e696fad0febbbbbf360abfd69";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/pl/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pl/thunderbird-52.1.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "65bc1dac3e1721e6e4afb041e449c1d5ecb9f878e8e32e6ab223998e1160bbd0e9e55313f079d7d7128174befe7de42a87d294dcce5e33865d0d7aff77251b00";
+      sha512 = "01dec9139816be174f14aa3f6e2165bcc52e53b8f681d8fbedb4db4f428a36128b832aa36fba7af096d15e83ecedb6b3570a447cde6bf10a722c2a452520852a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/pt-BR/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pt-BR/thunderbird-52.1.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "626590730865d64fe9469cc54680f182e37e40a78dc7419f33c3012c21e5d74e7e154a0e87e930d9137ca2a278ff932e233b9365d8fe45fa806f04da0759ab53";
+      sha512 = "2f616760f069944f43cc8517981a7fb793564cf30214ca62b42161aa3fcd332bf3f25761deae00697c8f544c84c3a500e9fac6b4424ef5481250fe2b8b6075a1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/pt-PT/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pt-PT/thunderbird-52.1.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "10de12c212918f4dda40f68c23fe2ac8a5f9f59c22140f4e10ca2a0ce455a9458747b2b3517958f7fddf86a9328a1793749ec9874b5045902a5b023ecf11f202";
+      sha512 = "0e27a359621fc08e1162f413aabaf406af4754e0e6947764d2b86c0c20b4d88c7eea336863ad9a9c670a6b05d84bda3678b9665f3c6c2d6b8ec71f2278f8a494";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/rm/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/rm/thunderbird-52.1.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "01339904126b1e07d1c24eb7cfb78cf0fc3bfdab33423f8dd9986336237392cd713fcd3943c40db8176247aa45e46abcdbe4089e9bfc2416349f70c0777de9f1";
+      sha512 = "84e58d1a7ce7e4d09ed30e83c6e46b88aac1419e719e1c55aa4cb5e1521ea3dd679e0bd41663de2a12d77c489d69f5ac0d5f5f0845fb2f9cc34d8f55ca278026";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/ro/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ro/thunderbird-52.1.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "1d980d6862de2795d708b229a071d31ade551cf171142a43db9bf9c2efc3aab1f14a6ed147654380b3f046091fb96809ff40935e9bbe81d6003837d18e77b64d";
+      sha512 = "9272c9fba59beab72fb6f59c81180514ddfa6b6dbd050f6b789e5072beb34a0cc6c70ecc26e11bbc082e9368df98cc13923eea643daaf24051371755b0bb26ac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/ru/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ru/thunderbird-52.1.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "c5197130284ec29668c85a10f8d638a00cd7e5197e87925d24fabdef28a3f526ca1d2a32f38c737848db9d23bbb735556dc3fc1f8877eb29f01018fd646d33ea";
+      sha512 = "734b738d9712dc089db8460b72404be9bb6a97944ec9dc5a286a401531ef2a30f8b7c5fc22e689b98d1f80551515996c6d7ba1a7b72290e4071a95a4519c45b0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/si/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/si/thunderbird-52.1.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "b0bcdb1b97c5988fab11172dd49a97a5626f7735450c9d1527d30dc4783bfa2c2087a0923c332fc04306e0937ffa0792c6b12e1f6b76381a3fafd3bc347095fc";
+      sha512 = "3868793813b2b09177ff7c5b36e44a289f7d7ae84f65c3194703f77e0067fd975a1397a289d3921b5ba7dcfe56c81280abec81c731b369692f2135f572dcdce6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/sk/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sk/thunderbird-52.1.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "0e7e2be2de816aa75e094207bf6c3c3b4872d31713f7b35775ed9b983fc391ab5b1c2675d4d9fb1803c749519eafee397426a0acde6352635b47745f742a7a44";
+      sha512 = "101f95b2bb118bb730117920099d1f5cc5f7744960a0148a1324043c17468d5b43c5d31fc5c45111fd3fc16a6e4d207548161fb600dbc4c4b92b015e342586fa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/sl/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sl/thunderbird-52.1.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "1ba4c498b4f94aa07894747172d22682fbce249df89f15e5e07c45a313de89c1f01e6a94bc06a597663416b1f9c7fc0106fef0b799dc1afa752ed28470d8082d";
+      sha512 = "a019e01de194d51acc6695447c30fd5d9e179d91035f942b2f42a536b29d03244a7fffe2821c19e51133d39773e70b18fda79b6b19c2a33fba3d9917669b0748";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/sq/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sq/thunderbird-52.1.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "026f992caeea7cb43b8a6e4078f0e1f9b1abdcc1e73ddaa1adf714bcdfad4ba4d234e007701d9c8ad5ff7807eb41c9795fd92831c6928286e687f9fa53ef6b0e";
+      sha512 = "64bdc99eb9bb3ece6fb5de9380fdc3d0a7e2598d36a66e7542c500a63c49f0d307ebdb99599b3bc72677a1053dd5d2aaf52088605236baa7d8d29dc2b377771d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/sr/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sr/thunderbird-52.1.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "7bef28114f9ef2a243d67878bbf92fbce5a421be6954c339ec81e659abd1cbf63e3e0797b965eb7ec90219a7cbcc800b2aac3f390fd8c6c7dbe816cd13fb7bb2";
+      sha512 = "8d5d2ee0f5326b9cf76dcb1cfd2401350ca5aa39efbc2afcd822eb3c9a40e477d25e0d82d8f50e569b2fed487463c6a978d12284f63764b7259bd3f479b2461b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/sv-SE/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sv-SE/thunderbird-52.1.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "4de60c656296be7019413ddf0621b8d50fa56276c503b3581f481533a08283901df5c344a4b4d6ba0b2237e94f9e9c362611c3d87832da41f48edd820485a0c0";
+      sha512 = "0efd878da02ec1e81f373f7e8090445f45c11f2c9a1931ed29a52c3d8642a277be07a2d194d873f1a11dc8cdb79ed4100fd87b8f262f8fa2ea034d4c20e96e6e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/ta-LK/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ta-LK/thunderbird-52.1.1.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "62c732f52adf0019042b3669798d057bc20e77817fb114f5b27d940d507ca8e58d65144e6ef231dbfd9603ec3c070c77fe51fd1bae191a30a9b986708fe07c66";
+      sha512 = "555c1b5862e71e7b9112b97b137375e0a38549ea91398b1631cb6000f5881f0adbbfe230612c2bd8765a20b1d14cf538e1b5c0e9ccfeb9fc7c1258afae54503b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/tr/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/tr/thunderbird-52.1.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "2bec1d2daab3da2f557b2af094b3fca47c08162ce495540c06aba14578674fd5ce4869d07e8a3452e2d8d263eb80c807af85c2e344dd23acd6625e9cbb739f9f";
+      sha512 = "e9c5333cd807f44d98c83514caa5fa81ef54a11362b7aee05c2496d8c79288c6707ff154229cc77d9a4e8097b13c53845a7516d04ff4c3336513183a8218ac3b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/uk/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/uk/thunderbird-52.1.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "67f7423ef8042c6cfea06ab22ac62ef54951fa4e77142da03d8e8b0643eb42a0fa88b9518f34600512f511621428185a3038e446b3626791b2c91d71f67cca82";
+      sha512 = "a7486ab5f63cece470b2850452cac236e153c3c797622cd2d87f6c4b276cea1c43d3770e7726c459334c5ca51034a8013d78176026375ac3d760c05e1cd9cd84";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/vi/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/vi/thunderbird-52.1.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "ab1e18232cef0eef6141fc014949b4efe945815712e2485711f37d8cc6ada8bd842652bce8792b5072c057a1888938136dd397ac6cc0ab57c4fb51d1b855ef1b";
+      sha512 = "6b815b2dc07fc6cb799bdf2266d6bfbef4f2623790814cae80ba1853075f7c561270e2463b1be571cc4495de5f2c36df4d716cf5754470198b97602ef3fe3979";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/zh-CN/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/zh-CN/thunderbird-52.1.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "90aa3e13705d5e118af8ff64714bd70bc8a9ba75ca5db91a1f138164a091f516791543a7e827aad739064c689687df8691881aa3e191f541a78f3fc7ca16f8e7";
+      sha512 = "7269d75bbec19be4045a6080c4e64679b5873a89039ffa9b633f40f41ca8d98a5f5f8a1b76233102b41a38ee307a49fe0c45206df1128b1526f490a417fb60c6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.0/linux-i686/zh-TW/thunderbird-52.1.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/zh-TW/thunderbird-52.1.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "0a5aef6a3f590212707b868da11308c4258079e8e9b163b720fee0a23b845b377779e648a1180bc050da102341173f123b054df56a4a8e81a0b31daa96c5f42b";
+      sha512 = "3741d5ebd862706b212f90a9f81ea8f0c9f7b1a4eeb74acab420e287afb930cc74748db958debb698a49fbd9d8011107ea6a1bc917606700a80eea640b40ab1a";
     }
     ];
 }

From 4b9c0892950050c07fb48d8f98bd223b75e77b4d Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 17 May 2017 19:45:16 +0900
Subject: [PATCH 114/206] thunderbird: 52.1.0 -> 52.1.1

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 2a942ce14f3..0f6be0281f3 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,11 +22,11 @@ let
   wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "52.1.0";
+  version = "52.1.1";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "08016334a0cc8af96d5c5b9aad0b8bf1ca3c105ff4a412abbeaeefefda1301cb149eafb4e78314f710567b952267d1d3c999dc8e5534a4a8d06abdcb11ee98c8";
+    sha512 = "84b54ae4401c9728c38f32f58e0df24e049471b3613f9973981b305e0ed09b2e8c2c1b5a35d4fee85ce2cf1d6fa99e80418bc216ae0d35d40e9fdeef61a6c06e";
   };
 
   # New sed no longer tolerates this mistake.

From a4eb0dc8159f882154639c986d4ffabc61b64900 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 16 May 2017 22:59:16 +0900
Subject: [PATCH 115/206] varnish: 5.0.0 -> 5.1.2

---
 pkgs/servers/varnish/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index e1376a6c59f..bf8e69bd989 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -1,23 +1,27 @@
 { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
-, python, pythonPackages }:
+, python, pythonPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "5.0.0";
+  version = "5.1.2";
   name = "varnish-${version}";
 
   src = fetchurl {
     url = "http://repo.varnish-cache.org/source/${name}.tar.gz";
-    sha256 = "0jizha1mwqk42zmkrh80y07vfl78mg1d9pp5w83qla4xn9ras0ai";
+    sha256 = "1qzwljdwp830l41nw4ils9hxly077zqn6wzhhmy8m516gq9min1r";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     pcre libxslt groff ncurses readline python libedit
-    pythonPackages.docutils
+    pythonPackages.docutils makeWrapper
   ];
 
   buildFlags = "localstatedir=/var/spool";
 
+  postInstall = ''
+    wrapProgram "$out/sbin/varnishd" --prefix PATH : "${stdenv.lib.makeBinPath [ stdenv.cc ]}"
+  '';
+
   # https://github.com/varnishcache/varnish-cache/issues/1875
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fexcess-precision=standard";
 

From 5b30f246cb6f0fa772734bceb4363595040fe55e Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 16 May 2017 23:00:06 +0900
Subject: [PATCH 116/206] varnish module: remove unneeded gcc runtime
 dependency

---
 nixos/modules/services/web-servers/varnish/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index 61df43ec235..5433db3b91c 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -49,7 +49,6 @@ with lib;
       postStop = ''
         rm -rf ${cfg.stateDir}
       '';
-      path = [ pkgs.gcc ];
       serviceConfig.ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -u varnish";
       serviceConfig.Type = "forking";
     };

From 6ba53a7c812958b4103a568be42f227977d66217 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Mon, 15 May 2017 15:34:17 +0200
Subject: [PATCH 117/206] monero: 0.10.2.1 -> 0.10.3.1

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

diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix
index 8b3e0a7cb4e..09f343483df 100644
--- a/pkgs/applications/misc/monero/default.nix
+++ b/pkgs/applications/misc/monero/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }:
 
 let
-  version = "0.10.2.1";
+  version = "0.10.3.1";
 in
 stdenv.mkDerivation {
   name = "monero-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    sha256 = "0jr57lih3smdg4abglfyfhxp69akiyqy889gcpdplwl05vfnhand";
+    sha256 = "1x6qjqijdbjyfb0dcjn46gp38hkb419skxansf9w2cjf58c2055n";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 296753f0947427d5753be68ae10363ac1b8b4cdc Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 24 Apr 2017 20:12:43 -0400
Subject: [PATCH 118/206] lib: Consolidate tests into one meta job

---
 lib/{tests.nix => tests/misc.nix} |  4 +--
 lib/tests/release.nix             | 58 +++++++++++++------------------
 lib/tests/systems.nix             | 14 ++++----
 pkgs/top-level/make-tarball.nix   | 11 ++++--
 pkgs/top-level/release.nix        |  6 ++--
 5 files changed, 46 insertions(+), 47 deletions(-)
 rename lib/{tests.nix => tests/misc.nix} (98%)

diff --git a/lib/tests.nix b/lib/tests/misc.nix
similarity index 98%
rename from lib/tests.nix
rename to lib/tests/misc.nix
index a201fa9ed15..334e1a70733 100644
--- a/lib/tests.nix
+++ b/lib/tests/misc.nix
@@ -1,8 +1,8 @@
 # to run these tests:
-# nix-instantiate --eval --strict nixpkgs/lib/tests.nix
+# nix-instantiate --eval --strict nixpkgs/lib/tests/misc.nix
 # if the resulting list is empty, all tests passed
 let inherit (builtins) add; in
-with import ./default.nix;
+with import ../default.nix;
 
 runTests {
 
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index dfa4ca2676d..77dff39edfa 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -1,40 +1,32 @@
-{ nixpkgs ? { outPath = (import ../.).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
-, # The platforms for which we build Nixpkgs.
-  supportedSystems ? [ builtins.currentSystem ]
-, # Strip most of attributes when evaluating to spare memory usage
-  scrubJobs ? true
-}:
+{ pkgs ? import ((import ../../lib).cleanSource ../..) {} }:
 
-with import ../../pkgs/top-level/release-lib.nix { inherit supportedSystems scrubJobs; };
-with lib;
+pkgs.stdenv.mkDerivation {
+  name = "nixpkgs-lib-tests";
+  buildInputs = [ pkgs.nix ];
+  NIX_PATH="nixpkgs=${pkgs.path}";
 
-{
-  systems = import ./systems.nix { inherit lib assertTrue; };
+  buildCommand = ''
+    datadir="${pkgs.nix}/share"
+    export TEST_ROOT=$(pwd)/test-tmp
+    export NIX_BUILD_HOOK=
+    export NIX_CONF_DIR=$TEST_ROOT/etc
+    export NIX_DB_DIR=$TEST_ROOT/db
+    export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
+    export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
+    export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
+    export NIX_STATE_DIR=$TEST_ROOT/var/nix
+    export NIX_STORE_DIR=$TEST_ROOT/store
+    export PAGER=cat
+    cacheDir=$TEST_ROOT/binary-cache
+    nix-store --init
 
-  moduleSystem = pkgs.stdenv.mkDerivation {
-    name = "nixpkgs-lib-tests";
-    buildInputs = [ pkgs.nix ];
-    NIX_PATH="nixpkgs=${nixpkgs}";
+    cd ${pkgs.path}/lib/tests
+    ./modules.sh
 
-    buildCommand = ''
-      datadir="${pkgs.nix}/share"
-      export TEST_ROOT=$(pwd)/test-tmp
-      export NIX_BUILD_HOOK=
-      export NIX_CONF_DIR=$TEST_ROOT/etc
-      export NIX_DB_DIR=$TEST_ROOT/db
-      export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
-      export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
-      export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
-      export NIX_STATE_DIR=$TEST_ROOT/var/nix
-      export NIX_STORE_DIR=$TEST_ROOT/store
-      export PAGER=cat
-      cacheDir=$TEST_ROOT/binary-cache
-      nix-store --init
+    [[ "$(nix-instantiate --eval --strict misc.nix)" == "[ ]" ]]
 
-      cd ${nixpkgs}/lib/tests
-      ./modules.sh
+    [[ "$(nix-instantiate --eval --strict systems.nix)" == "[ ]" ]]
 
-      touch $out
-    '';
-  };
+    touch $out
+  '';
 }
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index 5eacc0defaf..523fd3feb3b 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -5,13 +5,13 @@
 # calculating the lists anyway?". The answer is one can mindlessly update these
 # tests as new platforms become supported, and then just give the diff a quick
 # sanity check before committing :).
-{ lib, assertTrue }:
-
-with lib.systems.doubles;
-
-let mseteq = x: y: lib.sort lib.lessThan x == lib.sort lib.lessThan y; in
-
-{
+let
+  lib = import ../default.nix;
+  mseteq = x: y: {
+    expr     = lib.sort lib.lessThan x;
+    expected = lib.sort lib.lessThan y;
+  };
+in with lib.systems.doubles; lib.runTests {
   all = assertTrue (mseteq all (linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos));
 
   arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]);
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index a69e7019c87..c7e5f21910b 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -57,8 +57,15 @@ releaseTools.sourceTarball rec {
     fi
 
     # Run the regression tests in `lib'.
-    res="$(nix-instantiate --eval --strict --show-trace lib/tests.nix)"
-    if test "$res" != "[ ]"; then
+    if
+        # `set -e` doesn't work inside here, so need to && instead :(
+        res="$(nix-instantiate --eval --strict lib/tests/misc.nix)" \
+        && [[ "$res" == "[ ]" ]] \
+        && res="$(nix-instantiate --eval --strict lib/tests/systems.nix)" \
+        && [[ "$res" == "[ ]" ]]
+    then
+        true
+    else
         echo "regression tests for lib failed, got: $res"
         exit 1
     fi
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index cf4d54fe049..3931a3fe73e 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -28,7 +28,7 @@ let
       metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
 
       manual = import ../../doc;
-      lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs supportedSystems scrubJobs; };
+      lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
 
       darwin-tested = pkgs.releaseTools.aggregate
         { name = "nixpkgs-darwin-${jobs.tarball.version}";
@@ -52,6 +52,7 @@ let
             [ jobs.tarball
               jobs.metrics
               jobs.manual
+              jobs.lib-tests
               jobs.stdenv.x86_64-linux
               jobs.stdenv.i686-linux
               jobs.stdenv.x86_64-darwin
@@ -78,8 +79,7 @@ let
               jobs.git.x86_64-darwin
               jobs.mysql.x86_64-darwin
               jobs.vim.x86_64-darwin
-            ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools
-              ++ lib.collect lib.isDerivation jobs.lib-tests;
+            ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
         };
     } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) {
       stdenvBootstrapTools.i686-linux =

From 371ebc89ca8cfb48f9624981aab72563afb892b9 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 17 May 2017 11:04:27 -0400
Subject: [PATCH 119/206] lib platform parsing: Fix windows support to conform
 to LLVM, take 2

Second attempt at pull request #25275

This reverts commit b70924bd80918d153a5e2023afd7647ae7b24a12,
reapplying 2282a5774cd80567644a44d31585bf965a55f9ec
---
 lib/systems/doubles.nix          |  2 +-
 lib/systems/parse.nix            | 58 ++++++++++++++++++--------------
 pkgs/top-level/all-packages.nix  |  3 --
 pkgs/top-level/release-cross.nix | 43 +++++++++++------------
 4 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 2622ddf4be1..9b17a51531a 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -30,7 +30,7 @@ in rec {
   mips = filterDoubles (matchAttrs { cpu = { family = "mips"; }; });
   x86_64 = filterDoubles parse.isx86_64;
 
-  cygwin = filterDoubles (matchAttrs { kernel = parse.kernels.cygwin; });
+  cygwin = filterDoubles parse.isCygwin;
   darwin = filterDoubles parse.isDarwin;
   freebsd = filterDoubles (matchAttrs { kernel = parse.kernels.freebsd; });
   gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }); # Should be better
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 26744322e9e..8f65a69b17a 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -1,5 +1,9 @@
-# Define the list of system with their properties.  Only systems tested for
-# Nixpkgs are listed below
+# Define the list of system with their properties.
+#
+# See https://clang.llvm.org/docs/CrossCompilation.html and
+# http://llvm.org/docs/doxygen/html/Triple_8cpp_source.html especially
+# Triple::normalize. Parsing should essentially act as a more conservative
+# version of that last function.
 
 with import ../lists.nix;
 with import ../types.nix;
@@ -9,7 +13,7 @@ let
   lib = import ../default.nix;
   setTypesAssert = type: pred:
     mapAttrs (name: value:
-      #assert pred value;
+      assert pred value;
       setType type ({ inherit name; } // value));
   setTypes = type: setTypesAssert type (_: true);
 
@@ -23,7 +27,6 @@ rec {
     littleEndian = {};
   };
 
-
   isCpuType = isType "cpu-type";
   cpuTypes = with significantBytes; setTypesAssert "cpu-type"
     (x: elem x.bits [8 16 32 64 128]
@@ -47,6 +50,7 @@ rec {
   vendors = setTypes "vendor" {
     apple = {};
     pc = {};
+
     unknown = {};
   };
 
@@ -56,6 +60,7 @@ rec {
     elf = {};
     macho = {};
     pe = {};
+
     unknown = {};
   };
 
@@ -63,15 +68,12 @@ rec {
   kernelFamilies = setTypes "kernel-family" {
     bsd = {};
     unix = {};
-    windows-nt = {};
-    dos = {};
   };
 
   isKernel = x: isType "kernel" x;
   kernels = with execFormats; with kernelFamilies; setTypesAssert "kernel"
     (x: isExecFormat x.execFormat && all isKernelFamily (attrValues x.families))
   {
-    cygwin  = { execFormat = pe;      families = { inherit /*unix*/ windows-nt; }; };
     darwin  = { execFormat = macho;   families = { inherit unix; }; };
     freebsd = { execFormat = elf;     families = { inherit unix bsd; }; };
     linux   = { execFormat = elf;     families = { inherit unix; }; };
@@ -79,18 +81,21 @@ rec {
     none    = { execFormat = unknown; families = { inherit unix; }; };
     openbsd = { execFormat = elf;     families = { inherit unix bsd; }; };
     solaris = { execFormat = elf;     families = { inherit unix; }; };
-    win32   = { execFormat = pe;      families = { inherit dos; }; };
+    windows = { execFormat = pe;      families = { }; };
+  } // { # aliases
+    win32 = kernels.windows;
   };
 
-
   isAbi = isType "abi";
   abis = setTypes "abi" {
+    cygnus = {};
     gnu = {};
     msvc = {};
     eabi = {};
     androideabi = {};
     gnueabi = {};
     gnueabihf = {};
+
     unknown = {};
   };
 
@@ -109,19 +114,25 @@ rec {
   isDarwin = matchAttrs { kernel = kernels.darwin; };
   isLinux = matchAttrs { kernel = kernels.linux; };
   isUnix = matchAttrs { kernel = { families = { inherit (kernelFamilies) unix; }; }; };
-  isWindows = s: matchAttrs { kernel = { families = { inherit (kernelFamilies) windows-nt; }; }; } s
-              || matchAttrs { kernel = { families = { inherit (kernelFamilies) dos; }; }; } s;
+  isWindows = matchAttrs { kernel = kernels.windows; };
+  isCygwin = matchAttrs { kernel = kernels.windows; abi = abis.cygnus; };
+  isMinGW = matchAttrs { kernel = kernels.windows; abi = abis.gnu; };
 
 
   mkSkeletonFromList = l: {
-    "2" =    { cpu = elemAt l 0;                      kernel = elemAt l 1;                   };
-    "4" =    { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
+    "2" = # We only do 2-part hacks for things Nix already supports
+      if elemAt l 1 == "cygwin"
+        then { cpu = elemAt l 0;                      kernel = "windows"; abi = "cygnus";    }
+      else   { cpu = elemAt l 0;                      kernel = elemAt l 1;                   };
     "3" = # Awkwards hacks, beware!
       if elemAt l 1 == "apple"
         then { cpu = elemAt l 0; vendor = "apple";    kernel = elemAt l 2;                   }
       else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu")
         then { cpu = elemAt l 0;                      kernel = elemAt l 1; abi = elemAt l 2; }
+      else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window
+        then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows";  abi = "gnu"; }
       else throw "Target specification with 3 components is ambiguous";
+    "4" =    { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
   }.${toString (length l)}
     or (throw "system string has invalid number of hyphen-separated components");
 
@@ -134,18 +145,10 @@ rec {
                          , # Also inferred below
                            abi    ? assert false; null
                          } @ args: let
-    getCpu = name:
-      attrByPath [name] (throw "Unknown CPU type: ${name}")
-        cpuTypes;
-    getVendor = name:
-      attrByPath [name] (throw "Unknown vendor: ${name}")
-        vendors;
-    getKernel = name:
-      attrByPath [name] (throw "Unknown kernel: ${name}")
-        kernels;
-    getAbi = name:
-      attrByPath [name] (throw "Unknown ABI: ${name}")
-        abis;
+    getCpu    = name: cpuTypes.${name} or (throw "Unknown CPU type: ${name}");
+    getVendor = name:  vendors.${name} or (throw "Unknown vendor: ${name}");
+    getKernel = name:  kernels.${name} or (throw "Unknown kernel: ${name}");
+    getAbi    = name:     abis.${name} or (throw "Unknown ABI: ${name}");
 
     system = rec {
       cpu = getCpu args.cpu;
@@ -166,7 +169,10 @@ rec {
 
   mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));
 
-  doubleFromSystem = { cpu, vendor, kernel, abi, ... }: "${cpu.name}-${kernel.name}";
+  doubleFromSystem = { cpu, vendor, kernel, abi, ... }:
+    if vendor == kernels.windows && abi == abis.cygnus
+    then "${cpu.name}-cygwin"
+    else "${cpu.name}-${kernel.name}";
 
   tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let
     optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1467add1e91..5fdfc9ca649 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5068,9 +5068,6 @@ with pkgs;
       cross = targetPlatform;
       crossStageStatic = false;
 
-      # XXX: We have troubles cross-compiling libstdc++ on MinGW (see
-      # <http://hydra.nixos.org/build/4268232>), so don't even try.
-      langCC = targetPlatform.config != "i686-pc-mingw32";
       # Why is this needed?
       inherit (forcedNativePackages) binutils;
     };
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 82428972699..b22eff33dc0 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -20,12 +20,27 @@ let
   /* Basic list of packages to be natively built,
      but need a crossSystem defined to get meaning */
   basicNativeDrv = {
+    buildPackages.binutils = nativePlatforms;
     buildPackages.gccCrossStageFinal = nativePlatforms;
     buildPackages.gdbCross = nativePlatforms;
   };
 
   basic = basicCrossDrv // basicNativeDrv;
 
+  windows = {
+    buildPackages.binutils = nativePlatforms;
+    buildPackages.gccCrossStageFinal = nativePlatforms;
+
+    coreutils = nativePlatforms;
+    boehmgc = nativePlatforms;
+    gmp = nativePlatforms;
+    guile_1_8 = nativePlatforms;
+    libffi = nativePlatforms;
+    libtool = nativePlatforms;
+    libunistring = nativePlatforms;
+    windows.wxMSW = nativePlatforms;
+  };
+
 in
 
 {
@@ -89,48 +104,30 @@ in
   /* Test some cross builds on 32 bit mingw-w64 */
   crossMingw32 = let
     crossSystem = {
-      config = "i686-w64-mingw32";
+      config = "i686-pc-mingw32";
       arch = "x86"; # Irrelevant
       libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
       platform = {};
     };
-  in mapTestOnCross crossSystem {
-    coreutils = nativePlatforms;
-    boehmgc = nativePlatforms;
-    gmp = nativePlatforms;
-    guile_1_8 = nativePlatforms;
-    libffi = nativePlatforms;
-    libtool = nativePlatforms;
-    libunistring = nativePlatforms;
-    windows.wxMSW = nativePlatforms;
-  };
+  in mapTestOnCross crossSystem windows;
 
 
   /* Test some cross builds on 64 bit mingw-w64 */
   crossMingwW64 = let
     crossSystem = {
       # That's the triplet they use in the mingw-w64 docs.
-      config = "x86_64-w64-mingw32";
+      config = "x86_64-pc-mingw32";
       arch = "x86_64"; # Irrelevant
       libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
       platform = {};
     };
-  in mapTestOnCross crossSystem {
-    coreutils = nativePlatforms;
-    boehmgc = nativePlatforms;
-    gmp = nativePlatforms;
-    guile_1_8 = nativePlatforms;
-    libffi = nativePlatforms;
-    libtool = nativePlatforms;
-    libunistring = nativePlatforms;
-    windows.wxMSW = nativePlatforms;
-  };
+  in mapTestOnCross crossSystem windows;
 
 
   /* Linux on the fuloong */
   fuloongminipc = let
     crossSystem = {
-      config = "mips64el-unknown-linux";
+      config = "mips64el-unknown-linux-gnu";
       bigEndian = false;
       arch = "mips";
       float = "hard";

From f326caaeea380ff01130f969b7737c05913a8f05 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@devalot.com>
Date: Wed, 17 May 2017 09:30:12 -0700
Subject: [PATCH 120/206] mynewt-newt: init at 1.0.0

Add package for mynewt-newt build manager.
---
 .../mynewt-newt/default.nix                   |  29 +++++
 .../package-management/mynewt-newt/deps.nix   | 101 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 132 insertions(+)
 create mode 100644 pkgs/tools/package-management/mynewt-newt/default.nix
 create mode 100644 pkgs/tools/package-management/mynewt-newt/deps.nix

diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix
new file mode 100644
index 00000000000..3b37f57d039
--- /dev/null
+++ b/pkgs/tools/package-management/mynewt-newt/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "mynewt-newt-${version}";
+  version = "1.0.0";
+
+  goPackagePath = "mynewt.apache.org/newt";
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "apache";
+    repo = "incubator-mynewt-newt";
+    rev = "mynewt_${builtins.replaceStrings ["."] ["_"] version}_tag";
+    sha256 = "1ixqxqizd957prd4j2nijgnkv84rffj8cx5f7aqyjq9nkawjksf6";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://mynewt.apache.org/;
+    description = "Build and package management tool for embedded development.";
+    longDescription = ''
+      Apache Newt is a smart build and package management tool,
+      designed for C and C++ applications in embedded contexts. Newt
+      was developed as a part of the Apache Mynewt Operating System.
+    '';
+    license = licenses.asl20;
+    maintainers = with maintainers; [ pjones ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/package-management/mynewt-newt/deps.nix b/pkgs/tools/package-management/mynewt-newt/deps.nix
new file mode 100644
index 00000000000..ea3d97ca67e
--- /dev/null
+++ b/pkgs/tools/package-management/mynewt-newt/deps.nix
@@ -0,0 +1,101 @@
+[
+  {
+    goPackagePath = "github.com/Sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus.git";
+      rev = "a437dfd2463eaedbec3dfe443e477d3b0a810b3f";
+      sha256 = "1904s2bbc7p88anzjp6fyj3jrbm5p6wbb8j4490674dq10kkcfbj";
+    };
+  }
+  {
+    goPackagePath = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap.git";
+      rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty.git";
+      rev = "cfb55aafdaf3ec08f0db22699ab822c50091b1c4";
+      sha256 = "0441yi9ah9892hxdslv2h35bkfr75g7ajma0q45lqks84pawrdkg";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text.git";
+      rev = "7cafcd837844e784b526369c9bce262804aebc60";
+      sha256 = "0br693pf6vdr1sfvzdz6zxq7hjpdgci0il4wj0v636r8lyy21vsx";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure.git";
+      rev = "f3009df150dadf309fdee4a54ed65c124afad715";
+      sha256 = "1i08zzlsn1bwicjn8cvakv2h5wwicw8ijx0i0cipk49yfmd6ab4i";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast.git";
+      rev = "24b6558033ffe202bf42f0f3b870dcc798dd2ba8";
+      sha256 = "10g8vzvffkd55ivkbaqcjj50z3iiqffl2p902rmbriz14znqyywl";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra.git";
+      rev = "9495bc009a56819bdb0ddbc1a373e29c140bc674";
+      sha256 = "0hphdnhpcmy2mngah81c700s2y43f5g9jckwgmh6xyb4f1zjj9nm";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman.git";
+      rev = "33c24e77fb80341fe7130ee7c594256ff08ccc46";
+      sha256 = "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag.git";
+      rev = "5ccb023bc27df288a957c5e994cd44fd19619465";
+      sha256 = "1r65j8sw15pz0iacwnf303p6s51vkv0k6qc5cyb2kybfraqd7f7z";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/fsnotify.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify.git";
+      rev = "629574ca2a5df945712d3079857300b5e4da0236";
+      sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys/unix";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/sys.git";
+      rev = "b699b7032584f0953262cb2788a0ca19bb494703";
+      sha256 = "172sw1bm581qwal9pbf9qj1sgivr74nabbj8qq4q4fhgpzams9ix";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fac1be8508..092a0210820 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18246,6 +18246,8 @@ with pkgs;
     stdenv = overrideCC stdenv gcc49;
   };
 
+  mynewt-newt = callPackage ../tools/package-management/mynewt-newt { };
+
   inherit (callPackages ../tools/package-management/nix {
       storeDir = config.nix.storeDir or "/nix/store";
       stateDir = config.nix.stateDir or "/nix/var";

From 5870795cc68b29681ca644a8802fa11b469f2095 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 17 May 2017 13:42:51 -0400
Subject: [PATCH 121/206] linux cross stdenv: Fix eval errors

`pkgsNoParams` was removed by me, but then #25035 was merged using it,
leading to an unbound identifier.

It would be nice to get travis to do build release-cross.nix or
something to catch these things.
---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index a8c1e800202..b55f2bc7b7d 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -63,7 +63,7 @@ let
   };
 
   scaleway-c1-crossSystem.crossSystem = armv7l-hf-multiplatform-crossSystem.crossSystem // rec {
-    platform = pkgsNoParams.platforms.scaleway-c1;
+    platform = lib.systems.platforms.scaleway-c1;
     inherit (platform) gcc;
     inherit (gcc) fpu;
   };
@@ -73,9 +73,9 @@ let
     config = "armv5tel-softfloat-linux-gnueabi";
     float = "soft";
 
-    platform = pkgsNoParams.platforms.pogoplug4;
+    platform = lib.systems.platforms.pogoplug4;
 
-    inherit (pkgsNoParams.platforms.pogoplug4) gcc;
+    inherit (lib.systems.platforms.pogoplug4) gcc;
     libc = "glibc";
 
     withTLS = true;

From ef018d895563007df037a08381888f932d980f2d Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Wed, 17 May 2017 20:25:06 +0200
Subject: [PATCH 122/206] wireguard: 0.0.20170421 - 0.0.20170517

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 pkgs/os-specific/linux/wireguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index fbff511db7c..10c84948a49 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.20170421";
+  version = "0.0.20170517";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "03c82af774224cd171d000ee4a519b5e474cc6842ac04967773cf77b26750000";
+    sha256 = "7303e973654a3585039f4789e89a562f807f0d6010c7787b9b69ca72aa7a6908";
   };
 
   meta = with stdenv.lib; {

From 23f6332634e2e9f7ace12c67a8ab7a92c8cf13f7 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 17 May 2017 20:42:19 +0200
Subject: [PATCH 123/206] perl-PPI: 1.220 -> 1.224

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 19a3503c72f..c1114fd049a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10789,13 +10789,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  PPI = buildPerlPackage {
-    name = "PPI-1.220";
+  PPI = buildPerlPackage rec {
+    name = "PPI-1.224";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.220.tar.gz;
-      sha256 = "1e15be50e7d95a36d351af8bf5074f6695a2c72165e586d93e616183e7602b83";
+      url = "mirror://cpan/authors/id/M/MI/MITHALDU/${name}.tar.gz";
+      sha256 = "8d0f9faaea68515fb5aa6323115dcf98ea6c1dec4441f3844d3b9633b6cc9d94";
     };
-    buildInputs = [ ClassInspector FileRemove TestNoWarnings TestObject TestSubCalls ];
+    buildInputs = [ ClassInspector FileRemove TestDeep TestObject TestSubCalls TestWarn ];
     propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ];
 
     # Remove test that fails due to unexpected shebang after
@@ -10806,7 +10806,6 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/adamkennedy/PPI;
       description = "Parse, Analyze and Manipulate Perl (without perl)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 

From 99587bc9fa4a47a6d1f0d0217d5c9473fe76bbf0 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 17 May 2017 18:53:36 +0000
Subject: [PATCH 124/206] rdesktop: enable IPv6 support

---
 pkgs/applications/networking/remote/rdesktop/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix
index dd9ca18cb1d..4179cc3058e 100644
--- a/pkgs/applications/networking/remote/rdesktop/default.nix
+++ b/pkgs/applications/networking/remote/rdesktop/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation (rec {
   buildInputs = [openssl libX11];
 
   configureFlags = [
+    "--with-ipv6"
     "--with-openssl=${openssl.dev}"
     "--disable-credssp"
     "--disable-smartcard"

From f0e1907beed52608e1ff65eb6b30cbbcd7170132 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 15 Feb 2017 13:46:02 -0500
Subject: [PATCH 125/206] linuxHeadersCross: Remove and just use `linuxHeaders`

---
 pkgs/top-level/all-packages.nix | 35 +++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fdfc9ca649..1abdf7d2d0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7707,7 +7707,7 @@ with pkgs;
 
   glibcCross = forcedNativePackages.glibc.override {
     gccCross = gccCrossStageStatic;
-    linuxHeaders = linuxHeadersCross;
+    inherit (forcedNativePackages) linuxHeaders;
   };
 
   # We can choose:
@@ -11684,25 +11684,30 @@ with pkgs;
 
   lkl = callPackage ../applications/virtualization/lkl { };
 
-  linuxHeaders = linuxHeaders_4_4;
-
-  linuxHeaders24Cross = forcedNativePackages.callPackage ../os-specific/linux/kernel-headers/2.4.nix {
-    cross = assert targetPlatform != buildPlatform; targetPlatform;
+  linuxHeaders_2_4 = callPackage ../os-specific/linux/kernel-headers/2.4.nix {
+    cross = if targetPlatform != hostPlatform then targetPlatform else null;
   };
 
-  linuxHeaders26Cross = forcedNativePackages.callPackage ../os-specific/linux/kernel-headers/4.4.nix {
-    cross = assert targetPlatform != buildPlatform; targetPlatform;
+  linuxHeaders_2_6 = callPackage ../os-specific/linux/kernel-headers/4.4.nix {
+    cross = if targetPlatform != hostPlatform then targetPlatform else null;
   };
 
-  linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { };
+  linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix {
+    cross = if targetPlatform != hostPlatform then targetPlatform else null;
+  };
 
   # We can choose:
-  linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross
-    else if ver == "2.6" then linuxHeaders26Cross
-    else throw "Unknown linux kernel version";
-
-  linuxHeadersCross = assert targetPlatform != buildPlatform;
-    linuxHeadersCrossChooser targetPlatform.platform.kernelMajor;
+  linuxHeaders =
+    if targetPlatform != hostPlatform
+    then
+      { # switch
+        "2.4" = linuxHeaders_2_4;
+        "2.6" = linuxHeaders_2_6;
+        "4.4" = linuxHeaders_4_4;
+      }.${targetPlatform.platform.kernelMajor}
+        or (throw "Unknown linux kernel version")
+    else
+      linuxHeaders_4_4;
 
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 
@@ -12358,7 +12363,7 @@ with pkgs;
   uclibc = callPackage ../os-specific/linux/uclibc { };
 
   uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
-    linuxHeaders = linuxHeadersCross;
+    inherit (buildPackages) linuxHeaders;
     gccCross = gccCrossStageStatic;
     cross = assert targetPlatform != buildPlatform; targetPlatform;
   });

From bfa8f3049989739223687324aec986d4da3b5dae Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 25 Apr 2017 21:51:24 -0400
Subject: [PATCH 126/206] linux cross stdenv: Use the cross stdenv and
 `nativeBuildInputs`

This is a cross derivation---it's built on one platform to run on
another---so let's structure it like all the other cross derivations.
---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index b55f2bc7b7d..77471e6dfdb 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -146,11 +146,11 @@ rec {
 
   build =
 
-    pkgs.buildPackages.stdenv.mkDerivation {
+    pkgs.stdenv.mkDerivation {
       name = "stdenv-bootstrap-tools-cross";
       crossConfig = pkgs.hostPlatform.config;
 
-      buildInputs = [
+      nativeBuildInputs = [
         pkgs.buildPackages.nukeReferences
         pkgs.buildPackages.cpio
         pkgs.buildPackages.binutils
@@ -285,7 +285,7 @@ rec {
       allowedReferences = [];
     };
 
-  dist = pkgs.buildPackages.stdenv.mkDerivation {
+  dist = pkgs.stdenv.mkDerivation {
     name = "stdenv-bootstrap-tools-cross";
 
     buildCommand = ''

From 88ea6463a342c2084266395b210d57b1218bad62 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 24 Apr 2017 16:00:11 -0400
Subject: [PATCH 127/206] binutils on darwin: Clean up the rats nest

 - No more *Cross duplication for binutils on darwin either.
   `cctools_cross` is merged into plain `cctools`, so `buildPackages`
   chains alone are used to disambiguate.

 - Always use a mashup of cctools and actual GNU Binutils as `binutils`.
   Previously, this was only done in the native case as nobody had
   bothered to implement the masher in the cross case. Implemented it
   basically consisted of extending the wrapper to deal with prefixed
   binaries.
---
 .../tools/misc/binutils/default.nix           |  3 +-
 pkgs/os-specific/darwin/binutils/default.nix  | 22 ++++--
 pkgs/os-specific/darwin/cctools/port.nix      | 68 +++++++++++--------
 pkgs/top-level/all-packages.nix               | 15 ++--
 4 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index b0819f6133b..37c312c6c6b 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
     ./no-plugins.patch
   ];
 
+  # TODO: all outputs on all platform
   outputs = [ "out" ]
     ++ optional (cross == null && !stdenv.isDarwin) "lib" # problems in Darwin stdenv
     ++ [ "info" ]
@@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
   configureFlags =
     [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ]
     ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"
-    ++ optional (cross != null) "--target=${cross.config}"
+    ++ optional (cross != null) "--target=${cross.config}" # TODO: make this unconditional
     ++ optionals gold [ "--enable-gold" "--enable-plugins" ]
     ++ optional (stdenv.system == "i686-linux") "--enable-targets=x86_64-linux-gnu";
 
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index c4ccdb94b81..bde42e45e9c 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -1,11 +1,25 @@
-{ stdenv, binutils-raw, cctools }:
+{ stdenv, binutils-raw, cctools
+, hostPlatform, targetPlatform
+}:
 
+let
+  prefix = stdenv.lib.optionalString
+    (targetPlatform != hostPlatform)
+    "${targetPlatform.config}-";
+
+  cmds = [
+    "ar" "ranlib" "as" "dsymutil" "install_name_tool"
+    "ld" "strip" "otool" "lipo" "nm" "strings" "size"
+  ];
+in
+
+# TODO loop over prefixed binaries too
 stdenv.mkDerivation {
   name = "cctools-binutils-darwin";
   buildCommand = ''
     mkdir -p $out/bin $out/include
 
-    ln -s ${binutils-raw.out}/bin/c++filt $out/bin/c++filt
+    ln -s ${binutils-raw.out}/bin/${prefix}c++filt $out/bin/${prefix}c++filt
 
     # We specifically need:
     # - ld: binutils doesn't provide it on darwin
@@ -18,11 +32,11 @@ stdenv.mkDerivation {
     # - strip: the binutils one seems to break mach-o files
     # - lipo: gcc build assumes it exists
     # - nm: the gnu one doesn't understand many new load commands
-    for i in ar ranlib as dsymutil install_name_tool ld strip otool lipo nm strings size; do
+    for i in ${stdenv.lib.concatStringsSep " " (builtins.map (e: prefix + e) cmds)}; do
       ln -sf "${cctools}/bin/$i" "$out/bin/$i"
     done
 
-    for i in ${binutils-raw.dev}/include/*.h; do
+    for i in ${binutils-raw.dev or binutils-raw.out}/include/*.h; do
       ln -s "$i" "$out/include/$(basename $i)"
     done
 
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 0154d395216..204a4789bcc 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -1,8 +1,22 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2
+{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2
 , llvm, libcxx, libcxxabi, clang, libuuid
-, libobjc ? null
+, libobjc ? null, maloader ? null, xctoolchain ? null
+, buildPlatform, hostPlatform, targetPlatform
 }:
 
+let
+  inherit (stdenv.lib.systems.parse) isDarwin;
+
+  prefix = stdenv.lib.optionalString
+    (targetPlatform != hostPlatform)
+    "${targetPlatform.config}-";
+in
+
+assert isDarwin targetPlatform.parsed;
+
+# Non-Darwin alternatives
+assert (!isDarwin hostPlatform.parsed) -> (maloader != null && xctoolchain != null);
+
 let
   baseParams = rec {
     name = "cctools-port-${version}";
@@ -26,7 +40,14 @@ let
 
     enableParallelBuilding = true;
 
-    configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [ "CXXFLAGS=-I${libcxx}/include/c++/v1" ];
+    configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [
+      "CXXFLAGS=-I${libcxx}/include/c++/v1"
+    ] ++ stdenv.lib.optionals (targetPlatform != buildPlatform) [
+      # TODO make unconditional next hash break
+      "--build=${buildPlatform.config}"
+      "--host=${hostPlatform.config}"
+      "--target=${targetPlatform.config}"
+    ];
 
     postPatch = ''
       sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp
@@ -69,33 +90,26 @@ let
       popd
     '';
 
+    postInstall =
+      if isDarwin hostPlatform.parsed
+      then ''
+        cat >$out/bin/dsymutil << EOF
+        #!${stdenv.shell}
+        EOF
+        chmod +x $out/bin/dsymutil
+      ''
+      else ''
+        for tool in dyldinfo dwarfdump dsymutil; do
+          ${makeWrapper}/bin/makeWrapper "${maloader}/bin/ld-mac" "$out/bin/${targetPlatform.config}-$tool" \
+            --add-flags "${xctoolchain}/bin/$tool"
+          ln -s "$out/bin/${targetPlatform.config}-$tool" "$out/bin/$tool"
+        done
+      '';
+
     meta = {
       homepage = "http://www.opensource.apple.com/source/cctools/";
       description = "Mac OS X Compiler Tools (cross-platform port)";
       license = stdenv.lib.licenses.apsl20;
     };
   };
-in {
-  native = stdenv.mkDerivation (baseParams // {
-    # A hack for now...
-    postInstall = ''
-      cat >$out/bin/dsymutil << EOF
-      #!${stdenv.shell}
-      EOF
-      chmod +x $out/bin/dsymutil
-    '';
-  });
-
-  cross =
-    { cross, maloader, makeWrapper, xctoolchain}: stdenv.mkDerivation (baseParams // {
-      configureFlags = baseParams.configureFlags ++ [ "--target=${cross.config}" ];
-
-      postInstall = ''
-        for tool in dyldinfo dwarfdump dsymutil; do
-          ${makeWrapper}/bin/makeWrapper "${maloader}/bin/ld-mac" "$out/bin/${cross.config}-$tool" \
-            --add-flags "${xctoolchain}/bin/$tool"
-          ln -s "$out/bin/${cross.config}-$tool" "$out/bin/$tool"
-        done
-      '';
-    });
-}
+in stdenv.mkDerivation baseParams
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1abdf7d2d0c..d2a171a732d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6396,7 +6396,10 @@ with pkgs;
 
   bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };
 
-  binutils = if stdenv.isDarwin then darwin.binutils else binutils-raw;
+  binutils =
+    if lib.systems.parse.isDarwin targetPlatform.parsed
+    then darwin.binutils
+    else binutils-raw;
 
   binutils-raw = callPackage ../development/tools/misc/binutils {
     # FHS sys dirs presumably only have stuff for the build platform
@@ -11444,17 +11447,13 @@ with pkgs;
   darwin = let
     apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
   in apple-source-releases // rec {
-    cctools_cross = callPackage (forcedNativePackages.callPackage ../os-specific/darwin/cctools/port.nix {}).cross {
-      cross = assert targetPlatform != buildPlatform; targetPlatform;
+    cctools = callPackage ../os-specific/darwin/cctools/port.nix {
+      inherit libobjc;
+      stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv;
       inherit maloader;
       xctoolchain = xcode.toolchain;
     };
 
-    cctools = (callPackage ../os-specific/darwin/cctools/port.nix {
-      inherit libobjc;
-      stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv;
-    }).native;
-
     cf-private = callPackage ../os-specific/darwin/cf-private {
       inherit (apple-source-releases) CF;
       inherit osx_private_sdk;

From 7018dfb9f4d1457d77495014a2e22febe2b9181a Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 24 Apr 2017 16:00:11 -0400
Subject: [PATCH 128/206] binutils and cctools: Prefix derivation names with
 target for cross

We want platform triple prefixes and suffixes on derivation names to
be used consistently. The ideom this commit strives for is

 - suffix means build != host, i.e. cross *built* packages. This is
   already done.

 - prefix means build != target, i.e. cross tools. This matches the
   tradition of such binaries themselves being prefixed to disambiguate.]
   Binutils and cctools, as build tools, now use the latter
---
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 pkgs/os-specific/darwin/binutils/default.nix     | 2 +-
 pkgs/os-specific/darwin/cctools/port.nix         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 37c312c6c6b..6bfd933bf9b 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -7,7 +7,7 @@ let basename = "binutils-2.28"; in
 let inherit (stdenv.lib) optional optionals optionalString; in
 
 stdenv.mkDerivation rec {
-  name = basename + optionalString (cross != null) "-${cross.config}";
+  name = optionalString (cross != null) "${cross.config}-" + basename;
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index bde42e45e9c..f88f761f65a 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -15,7 +15,7 @@ in
 
 # TODO loop over prefixed binaries too
 stdenv.mkDerivation {
-  name = "cctools-binutils-darwin";
+  name = "${prefix}cctools-binutils-darwin";
   buildCommand = ''
     mkdir -p $out/bin $out/include
 
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 204a4789bcc..14c4c6e9973 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -19,7 +19,7 @@ assert (!isDarwin hostPlatform.parsed) -> (maloader != null && xctoolchain != nu
 
 let
   baseParams = rec {
-    name = "cctools-port-${version}";
+    name = "${prefix}cctools-port-${version}";
     version = "895";
 
     src = fetchFromGitHub {

From 20fa6fd87146a55ca5b66b88bf3d30012acbdac0 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 15 Feb 2017 18:19:40 -0500
Subject: [PATCH 129/206] gcc: When cross compiling, always expect prefixed
 binutils

Previously this was just done on Darwin.
---
 pkgs/development/compilers/gcc/4.5/default.nix      | 3 +++
 pkgs/development/compilers/gcc/4.8/default.nix      | 7 +++----
 pkgs/development/compilers/gcc/4.9/default.nix      | 8 +++-----
 pkgs/development/compilers/gcc/5/default.nix        | 8 +++-----
 pkgs/development/compilers/gcc/6/default.nix        | 8 +++-----
 pkgs/development/compilers/gcc/snapshot/default.nix | 7 +++----
 6 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 19a538e613e..288a91398d2 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -78,6 +78,9 @@ let version = "4.5.4";
       withArch +
       withCpu +
       withAbi +
+      # Ensure that -print-prog-name is able to find the correct programs.
+      " --with-as=${binutils}/bin/${cross.config}-as" +
+      " --with-ld=${binutils}/bin/${cross.config}-ld" +
       (if crossMingw && crossStageStatic then
         " --with-headers=${libcCross}/include" +
         " --with-gcc" +
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 714554019e4..2d615e3b8e8 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -143,6 +143,9 @@ let version = "4.8.5";
         withFpu +
         withFloat +
         withMode +
+        # Ensure that -print-prog-name is able to find the correct programs.
+        " --with-as=${binutils}/bin/${cross.config}-as" +
+        " --with-ld=${binutils}/bin/${cross.config}-ld" +
         (if crossMingw && crossStageStatic then
           " --with-headers=${libcCross}/include" +
           " --with-gcc" +
@@ -169,10 +172,6 @@ let version = "4.8.5";
           (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot"
            else                " --with-headers=${libcCross.dev}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
-          (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutils}/bin/${cross.config}-as" +
-            " --with-ld=${binutils}/bin/${cross.config}-ld"
-          )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
           (if crossMingw then
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 3bf279635aa..93f46fdd0f6 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -145,6 +145,9 @@ let version = "4.9.4";
         withFpu +
         withFloat +
         withMode +
+        # Ensure that -print-prog-name is able to find the correct programs.
+        " --with-as=${binutils}/bin/${cross.config}-as" +
+        " --with-ld=${binutils}/bin/${cross.config}-ld" +
         (if crossMingw && crossStageStatic then
           " --with-headers=${libcCross}/include" +
           " --with-gcc" +
@@ -169,11 +172,6 @@ let version = "4.9.4";
           else
           (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot"
            else                " --with-headers=${libcCross.dev}/include") +
-          # Ensure that -print-prog-name is able to find the correct programs.
-          (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutils}/bin/${cross.config}-as" +
-            " --with-ld=${binutils}/bin/${cross.config}-ld"
-          )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
           (if crossMingw then
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 79c5b805f45..296b899830b 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -149,6 +149,9 @@ let version = "5.4.0";
         withFpu +
         withFloat +
         withMode +
+        # Ensure that -print-prog-name is able to find the correct programs.
+        " --with-as=${binutils}/bin/${cross.config}-as" +
+        " --with-ld=${binutils}/bin/${cross.config}-ld" +
         (if crossMingw && crossStageStatic then
           " --with-headers=${libcCross}/include" +
           " --with-gcc" +
@@ -173,11 +176,6 @@ let version = "5.4.0";
           else
           (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot"
            else                " --with-headers=${getDev libcCross}/include") +
-          # Ensure that -print-prog-name is able to find the correct programs.
-          (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutils}/bin/${cross.config}-as" +
-            " --with-ld=${binutils}/bin/${cross.config}-ld"
-          )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
           (if crossMingw then
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 57bb336ccbf..c23968d2126 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -145,6 +145,9 @@ let version = "6.3.0";
         withFpu +
         withFloat +
         withMode +
+        # Ensure that -print-prog-name is able to find the correct programs.
+        " --with-as=${binutils}/bin/${cross.config}-as" +
+        " --with-ld=${binutils}/bin/${cross.config}-ld" +
         (if crossMingw && crossStageStatic then
           " --with-headers=${libcCross}/include" +
           " --with-gcc" +
@@ -169,11 +172,6 @@ let version = "6.3.0";
           else
           (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot"
            else                " --with-headers=${getDev libcCross}/include") +
-          # Ensure that -print-prog-name is able to find the correct programs.
-          (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutils}/bin/${cross.config}-as" +
-            " --with-ld=${binutils}/bin/${cross.config}-ld"
-          )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
           (if crossMingw then
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 6b08f279790..9c3b7a4e7df 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -145,6 +145,9 @@ let version = "7-20170409";
         withFpu +
         withFloat +
         withMode +
+        # Ensure that -print-prog-name is able to find the correct programs.
+        " --with-as=${binutils}/bin/${cross.config}-as" +
+        " --with-ld=${binutils}/bin/${cross.config}-ld" +
         (if crossMingw && crossStageStatic then
           " --with-headers=${libcCross}/include" +
           " --with-gcc" +
@@ -170,10 +173,6 @@ let version = "7-20170409";
           (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot"
            else                " --with-headers=${getDev libcCross}/include") +
           # Ensure that -print-prog-name is able to find the correct programs.
-          (stdenv.lib.optionalString (crossMingw || crossDarwin) (
-            " --with-as=${binutils}/bin/${cross.config}-as" +
-            " --with-ld=${binutils}/bin/${cross.config}-ld"
-          )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
           (if crossMingw then

From d34079c2d9d22e3d13778e7a948b16247610ec7c Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 7 Feb 2017 12:25:01 -0500
Subject: [PATCH 130/206] release-cross: Add arms test from Darwin for binutils

This does a decent job of testing everything in this PR up to here.
---
 pkgs/top-level/release-cross.nix | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index b22eff33dc0..861b3abe1ad 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -1,5 +1,8 @@
-{ # The platforms for which we build Nixpkgs.
-  supportedSystems ? [ builtins.currentSystem ]
+/* This file defines some basic smoke tests for cross compilation.
+*/
+
+{ # The platforms *from* which we cross compile.
+  supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ]
 , # Strip most of attributes when evaluating to spare memory usage
   scrubJobs ? true
 }:
@@ -83,6 +86,25 @@ in
     guile = nativePlatforms;
   };
 
+  darwinToAarch64 = let
+    crossSystem = {
+      config = "aarch64-apple-darwin14";
+      arch = "arm64";
+      libc = "libSystem";
+    };
+  in mapTestOnCross crossSystem {
+    buildPackages.binutils = darwin;
+  };
+
+  darwinToArm = let
+    crossSystem = {
+      config = "arm-apple-darwin10";
+      arch = "armv7-a";
+      libc = "libSystem";
+    };
+  in mapTestOnCross crossSystem {
+    buildPackages.binutils = darwin;
+  };
 
   /* Test some cross builds to the Sheevaplug */
   crossSheevaplugLinux = let

From 80ed251f176aefa4c31a93ebb550df009d9bb49e Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 25 Apr 2017 23:25:37 -0400
Subject: [PATCH 131/206] lib platform parsing: Whitelist `darwin10` and
 `darwin14` as stopgap

Something better should be done longer term to support such version
suffixes.
---
 lib/systems/parse.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 8f65a69b17a..b9758f44fc1 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -83,6 +83,9 @@ rec {
     solaris = { execFormat = elf;     families = { inherit unix; }; };
     windows = { execFormat = pe;      families = { }; };
   } // { # aliases
+    # TODO(@Ericson2314): Handle these Darwin version suffixes more generally.
+    darwin10 = kernels.darwin;
+    darwin14 = kernels.darwin;
     win32 = kernels.windows;
   };
 

From 3de66330cd7e37822cbc033ea0e4de25bd044fb9 Mon Sep 17 00:00:00 2001
From: Lukasz Czyzykowski <lukasz.czyzykowski@gmail.com>
Date: Mon, 15 May 2017 19:25:33 +0200
Subject: [PATCH 132/206] v8: fixes build on darwin

v8 compilation on macOS was failing because of missing dependency and
wrong linker. The approach to make it work is similar to the nodejs
package.
---
 pkgs/development/libraries/v8/default.nix    | 19 ++++--
 pkgs/development/libraries/v8/no-xcode.patch | 64 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  1 +
 3 files changed, 78 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/v8/no-xcode.patch

diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 2c6e818b4e1..00fb037168e 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu
-, patchelf, coreutils
+, patchelf, coreutils, cctools
 , doCheck ? false
 , static ? false
 }:
@@ -126,7 +126,13 @@ stdenv.mkDerivation rec {
 
   # Patch based off of:
   # https://github.com/cowboyd/libv8/tree/v5.1.281.67.0/patches
-  patches = lib.optional (!doCheck) ./libv8-5.4.232.patch;
+  patches = lib.optional (!doCheck) ./libv8-5.4.232.patch
+  ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
+
+  prePatch = ''
+    chmod +w tools/gyp/pylib/gyp
+    chmod +w tools/gyp/pylib/gyp/xcode_emulation.py
+  '';
 
   postPatch = ''
     sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' gypfiles/gyp_v8
@@ -152,12 +158,13 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ which ];
-  buildInputs = [ readline python icu patchelf ];
+  buildInputs = [ readline python icu patchelf ]
+  ++ stdenv.lib.optionals stdenv.isDarwin [ cctools ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
 
   buildFlags = [
-    "LINK=g++"
+    "LINK=c++"
     "-C out"
     "builddir=$(CURDIR)/Release"
     "BUILDTYPE=Release"
@@ -174,7 +181,7 @@ stdenv.mkDerivation rec {
     install -vD out/Release/mksnapshot "$out/bin/mksnapshot"
     ${if static then ""
     else if stdenv.isDarwin then ''
-    install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
+    install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib"
     install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8
     install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
     '' else ''
@@ -190,7 +197,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Google's open source JavaScript engine";
     maintainers = with maintainers; [ cstrahan proglodyte ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/libraries/v8/no-xcode.patch b/pkgs/development/libraries/v8/no-xcode.patch
new file mode 100644
index 00000000000..5562ffaf64e
--- /dev/null
+++ b/pkgs/development/libraries/v8/no-xcode.patch
@@ -0,0 +1,64 @@
+--- a/tools/gyp/pylib/gyp/xcode_emulation.py
++++ a/tools/gyp/pylib/gyp/xcode_emulation.py
+@@ -473,10 +473,16 @@
+ 
+   def _XcodeSdkPath(self, sdk_root):
+     if sdk_root not in XcodeSettings._sdk_path_cache:
+-      sdk_path = self._GetSdkVersionInfoItem(sdk_root, '--show-sdk-path')
+-      XcodeSettings._sdk_path_cache[sdk_root] = sdk_path
+-      if sdk_root:
+-        XcodeSettings._sdk_root_cache[sdk_path] = sdk_root
++      try:
++        sdk_path = self._GetSdkVersionInfoItem(sdk_root, '--show-sdk-path')
++        XcodeSettings._sdk_path_cache[sdk_root] = sdk_path
++        if sdk_root:
++          XcodeSettings._sdk_root_cache[sdk_path] = sdk_root
++      except:
++        # if this fails it's because xcodebuild failed, which means
++        # the user is probably on a CLT-only system, where there
++        # is no valid SDK root
++        XcodeSettings._sdk_path_cache[sdk_root] = None
+     return XcodeSettings._sdk_path_cache[sdk_root]
+ 
+   def _AppendPlatformVersionMinFlags(self, lst):
+@@ -606,10 +612,11 @@
+       framework_root = sdk_root
+     else:
+       framework_root = ''
+-    config = self.spec['configurations'][self.configname]
+-    framework_dirs = config.get('mac_framework_dirs', [])
+-    for directory in framework_dirs:
+-      cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))
++    if 'SDKROOT' in self._Settings():
++      config = self.spec['configurations'][self.configname]
++      framework_dirs = config.get('mac_framework_dirs', [])
++      for directory in framework_dirs:
++        cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))
+ 
+     self.configname = None
+     return cflags
+@@ -861,10 +868,11 @@
+     sdk_root = self._SdkPath()
+     if not sdk_root:
+       sdk_root = ''
+-    config = self.spec['configurations'][self.configname]
+-    framework_dirs = config.get('mac_framework_dirs', [])
+-    for directory in framework_dirs:
+-      ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
++    if 'SDKROOT' in self._Settings():
++      config = self.spec['configurations'][self.configname]
++      framework_dirs = config.get('mac_framework_dirs', [])
++      for directory in framework_dirs:
++        ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
+ 
+     platform_root = self._XcodePlatformPath(configname)
+     if sdk_root and platform_root and self._IsXCTest():
+@@ -1358,7 +1366,7 @@
+     if version:
+       version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0]
+     else:
+-      raise GypError("No Xcode or CLT version detected!")
++      version = "7.0.0"
+     # The CLT has no build information, so we return an empty string.
+     version_list = [version, '']
+   version = version_list[0]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88cbd5001ae..1aeffabc1be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10198,6 +10198,7 @@ with pkgs;
 
   v8 = callPackage ../development/libraries/v8 {
     inherit (python2Packages) python gyp;
+    cctools = darwin.cctools;
   };
 
   v8_static = lowPrio (self.v8.override { static = true; });

From 76667036ecb84d299424d0cba345b83040e869ae Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 25 Apr 2017 23:52:53 -0400
Subject: [PATCH 133/206] gmp 6: Fix for cross

---
 pkgs/development/libraries/gmp/6.x.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index e30c15e629e..92dd602fc4d 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, m4, cxx ? true, withStatic ? false }:
+{ stdenv, fetchurl, m4, cxx ? true
+, buildPackages
+, buildPlatform, hostPlatform
+, withStatic ? false }:
 
 let inherit (stdenv.lib) optional optionalString; in
 
@@ -16,7 +19,8 @@ let self = stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "info" ];
   passthru.static = self.out;
 
-  nativeBuildInputs = [ m4 ];
+  nativeBuildInputs = [ m4 ]
+    ++ stdenv.lib.optional (buildPlatform != hostPlatform) buildPackages.stdenv.cc;
 
   configureFlags =
     # Build a "fat binary", with routines for several sub-architectures
@@ -39,7 +43,7 @@ let self = stdenv.mkDerivation rec {
       configureFlagsArray+=("--build=$(./configfsf.guess)")
     '';
 
-  doCheck = true;
+  doCheck = buildPlatform == hostPlatform;
 
   dontDisableStatic = withStatic;
 

From 2099f0afccd3653981225c287f729cb20e9c4a97 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 17 May 2017 15:33:27 -0500
Subject: [PATCH 134/206] dropbox: 25.4.28 -> 26.4.24

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index a97b29e3d3a..b894322062f 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "25.4.28";
+  version = "26.4.24";
   sha256 =
     {
-      "x86_64-linux" = "0r0bdl37rkar3nijxslp493mic5qd20l125p1kghqbradvh57rl3";
-      "i686-linux"   = "1difq6ky1klvminbzjivvq6ap3l296gij0ghgyy1n4lca3jqq648";
+      "x86_64-linux" = "1qzz88d3akbqfk1539w2z0ldyjjscqjqgsvadf9i4xr2y0syfv4y";
+      "i686-linux"   = "12xwmmycrg56xl88k9pqd7mcn0jqi4jijf36vn4fdjvmn7ksskcw";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =
@@ -62,7 +62,7 @@ in stdenv.mkDerivation {
   name = "dropbox-${version}";
   src = fetchurl {
     name = "dropbox-${version}.tar.gz";
-    url = "https://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz";
+    url = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz";
     inherit sha256;
   };
 

From 618f9aa52c4b5792c86dd8d6f2623f57d5fe930f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 17 May 2017 21:56:46 +0100
Subject: [PATCH 135/206] docker-proxy: remove go references

related to #25861
---
 .../virtualization/docker/proxy.nix           | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix
index 52005c4a273..beb65976696 100644
--- a/pkgs/applications/virtualization/docker/proxy.nix
+++ b/pkgs/applications/virtualization/docker/proxy.nix
@@ -1,8 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, go, docker }:
+{ stdenv, buildGoPackage, fetchFromGitHub, docker }:
 
-with lib;
-
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   name = "docker-proxy-${rev}";
   rev = "7b2b1feb1de4817d522cc372af149ff48d25028e";
 
@@ -13,20 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1ng577k11cyv207bp0vaz5jjfcn2igd6w95zn4izcq1nldzp5935";
   };
 
-  buildInputs = [ go ];
+  goPackagePath = "github.com/docker/libnetwork";
 
-  buildPhase = ''
-    mkdir -p .gopath/src/github.com/docker
-    ln -sf $(pwd) .gopath/src/github.com/docker/libnetwork
-    GOPATH="$(pwd)/.gopath:$(pwd)/Godeps/_workspace" go build -ldflags="$PROXY_LDFLAGS" -o docker-proxy ./cmd/proxy
-  '';
+  goDeps = null;
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp docker-proxy $out/bin
+    install -m755 -D ./go/bin/proxy $bin/bin/docker-proxy
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Docker proxy binary to forward traffic between host and containers";
     license = licenses.asl20;
     homepage = https://github.com/docker/libnetwork;
@@ -34,3 +27,4 @@ stdenv.mkDerivation rec {
     platforms = docker.meta.platforms;
   };
 }
+

From d4c106f5b4fb7ff2323b128c149b3217021396c0 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Wed, 17 May 2017 22:40:07 +0100
Subject: [PATCH 136/206] pyproj: enable tests, use bundled proj by default

---
 .../python-modules/pyproj/default.nix          | 18 ++++++++++++------
 pkgs/top-level/python-packages.nix             |  6 +++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix
index eff6f436858..8b15c63fb20 100644
--- a/pkgs/development/python-modules/pyproj/default.nix
+++ b/pkgs/development/python-modules/pyproj/default.nix
@@ -1,11 +1,12 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, proj
 , python
+, nose2
+, proj ? null
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (rec {
   pname = "pyproj";
   version = "1.9.5.1";
   name = "${pname}-${version}";
@@ -15,14 +16,19 @@ buildPythonPackage rec {
     sha256 = "53fa54c8fa8a1dfcd6af4bf09ce1aae5d4d949da63b90570ac5ec849efaf3ea8";
   };
 
-  buildInputs = [ proj ];
+  buildInputs = [ nose2 ];
 
-  # Could not get tests working
-  doCheck = false;
+  checkPhase = ''
+    runHook preCheck
+    pushd unittest  # changing directory should ensure we're importing the global pyproj
+    ${python.interpreter} test.py && ${python.interpreter} -c "import doctest, pyproj, sys; sys.exit(doctest.testmod(pyproj)[0])"
+    popd
+    runHook postCheck
+  '';
 
   meta = {
     description = "Python interface to PROJ.4 library";
     homepage = http://github.com/jswhit/pyproj;
     license = with lib.licenses; [ isc ];
   };
-}
+} // (if proj == null then {} else { PROJ_DIR = proj; }))
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1516ccaa94f..f58827e140d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19896,7 +19896,11 @@ in {
 
   pyopencl = callPackage ../development/python-modules/pyopencl { };
 
-  pyproj = callPackage ../development/python-modules/pyproj { };
+  pyproj = callPackage ../development/python-modules/pyproj {
+    # pyproj does *work* if you want to use a system supplied proj, but with the current version(s) the tests fail by
+    # a few decimal places, so caveat emptor.
+    proj = null;
+  };
 
   pyrr = buildPythonPackage rec {
     name = "pyrr-${version}";

From 8ad2c6a830784bdc37a04f349ec5f13a1b16edee Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 25 Apr 2017 23:52:29 -0400
Subject: [PATCH 137/206] ncurses: Fix for cross

---
 pkgs/development/libraries/ncurses/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 4ffaee9be5a..9e7f2eef46b 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -5,6 +5,9 @@
 , unicode ? true
 
 , gpm
+
+, buildPlatform, hostPlatform
+, buildPackages
 }:
 let
   version = if abiVersion == "5" then "5.9" else "6.0";
@@ -35,7 +38,11 @@ stdenv.mkDerivation rec {
   # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:
   CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    pkgconfig
+  ] ++ lib.optionals (buildPlatform != hostPlatform) [
+    buildPackages.ncurses buildPackages.stdenv.cc
+  ];
   buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
 
   preConfigure = ''
@@ -58,7 +65,8 @@ stdenv.mkDerivation rec {
     sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
   '';
 
-  selfNativeBuildInput = true;
+  # Here only for native hash, remove on next mass rebuild
+  selfNativeBuildInput = buildPlatform == hostPlatform;
 
   enableParallelBuilding = true;
 

From 2601a80639ecee27fdb83ce099c037a348ba7125 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 17 May 2017 16:07:04 -0400
Subject: [PATCH 138/206] release-cross: Make tests more uniform

Fewer packages are only built on one platform. Eventually we should
have each package encode its own requirements on build host and target
(as we do for build already) and use that to test automatically.
---
 pkgs/top-level/release-cross.nix | 67 ++++++++++++++------------------
 1 file changed, 29 insertions(+), 38 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 861b3abe1ad..31ce31a6759 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -12,31 +12,29 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
 let
   nativePlatforms = linux;
 
-  /* Basic list of packages to cross-build */
-  basicCrossDrv = {
+  common = {
+    buildPackages.binutils = nativePlatforms;
+    gmp = nativePlatforms;
+  };
+
+  gnuCommon = common // {
+    buildPackages.gccCrossStageFinal = nativePlatforms;
+    coreutils = nativePlatforms;
+  };
+
+  linuxCommon = gnuCommon // {
+    buildPackages.gdbCross = nativePlatforms;
+
     bison = nativePlatforms;
     busybox = nativePlatforms;
-    coreutils = nativePlatforms;
     dropbear = nativePlatforms;
+    ed = nativePlatforms;
+    ncurses = nativePlatforms;
+    patch = nativePlatforms;
   };
 
-  /* Basic list of packages to be natively built,
-     but need a crossSystem defined to get meaning */
-  basicNativeDrv = {
-    buildPackages.binutils = nativePlatforms;
-    buildPackages.gccCrossStageFinal = nativePlatforms;
-    buildPackages.gdbCross = nativePlatforms;
-  };
-
-  basic = basicCrossDrv // basicNativeDrv;
-
-  windows = {
-    buildPackages.binutils = nativePlatforms;
-    buildPackages.gccCrossStageFinal = nativePlatforms;
-
-    coreutils = nativePlatforms;
+  windowsCommon = gnuCommon // {
     boehmgc = nativePlatforms;
-    gmp = nativePlatforms;
     guile_1_8 = nativePlatforms;
     libffi = nativePlatforms;
     libtool = nativePlatforms;
@@ -44,6 +42,10 @@ let
     windows.wxMSW = nativePlatforms;
   };
 
+  darwinCommon = {
+    buildPackages.binutils = darwin;
+  };
+
 in
 
 {
@@ -92,9 +94,7 @@ in
       arch = "arm64";
       libc = "libSystem";
     };
-  in mapTestOnCross crossSystem {
-    buildPackages.binutils = darwin;
-  };
+  in mapTestOnCross crossSystem darwinCommon;
 
   darwinToArm = let
     crossSystem = {
@@ -102,9 +102,7 @@ in
       arch = "armv7-a";
       libc = "libSystem";
     };
-  in mapTestOnCross crossSystem {
-    buildPackages.binutils = darwin;
-  };
+  in mapTestOnCross crossSystem darwinCommon;
 
   /* Test some cross builds to the Sheevaplug */
   crossSheevaplugLinux = let
@@ -118,7 +116,7 @@ in
       libc = "glibc";
       openssl.system = "linux-generic32";
     };
-  in mapTestOnCross crossSystem (basic // {
+  in mapTestOnCross crossSystem (linuxCommon // {
     ubootSheevaplug = nativePlatforms;
   });
 
@@ -131,7 +129,7 @@ in
       libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
       platform = {};
     };
-  in mapTestOnCross crossSystem windows;
+  in mapTestOnCross crossSystem windowsCommon;
 
 
   /* Test some cross builds on 64 bit mingw-w64 */
@@ -143,7 +141,7 @@ in
       libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
       platform = {};
     };
-  in mapTestOnCross crossSystem windows;
+  in mapTestOnCross crossSystem windowsCommon;
 
 
   /* Linux on the fuloong */
@@ -162,11 +160,7 @@ in
         abi = "n32";
       };
     };
-  in mapTestOnCross crossSystem {
-    coreutils = nativePlatforms;
-    ed = nativePlatforms;
-    patch = nativePlatforms;
-  };
+  in mapTestOnCross crossSystem linuxCommon;
 
 
   /* Linux on Raspberrypi */
@@ -188,10 +182,7 @@ in
         abi = "aapcs-linux";
       };
     };
-  in mapTestOnCross crossSystem {
-    coreutils = nativePlatforms;
-    ed = nativePlatforms;
-    patch = nativePlatforms;
+  in mapTestOnCross crossSystem (linuxCommon // {
     vim = nativePlatforms;
     unzip = nativePlatforms;
     ddrescue = nativePlatforms;
@@ -199,7 +190,7 @@ in
     patchelf = nativePlatforms;
     buildPackages.binutils = nativePlatforms;
     mpg123 = nativePlatforms;
-  };
+  });
 
 
   /* Cross-built bootstrap tools for every supported platform */

From e28203fd482ffbc4b5d9cd3f4348399a6b2b12a2 Mon Sep 17 00:00:00 2001
From: Tom Doggett <nocoolnametom@gmail.com>
Date: Wed, 17 May 2017 15:03:12 -0700
Subject: [PATCH 139/206] Adding options to enable bitlbee and slack gateways
 in znc config.

---
 nixos/modules/services/networking/znc.nix | 61 ++++++++++++++++++++---
 1 file changed, 53 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 1c63d800e26..abd02012bc9 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -37,7 +37,7 @@ let
             IPv6 = true
             SSL = ${boolToString confOpts.useSSL}
     </Listener>
-    
+
     <User ${confOpts.userName}>
             ${confOpts.passBlock}
             Admin = true
@@ -50,9 +50,12 @@ let
             ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (name: net: ''
               <Network ${name}>
                   ${concatMapStrings (m: "LoadModule = ${m}\n") net.modules}
-                  Server = ${net.server} ${if net.useSSL then "+" else ""}${toString net.port}
-
+                  Server = ${net.server} ${lib.optionalString net.useSSL "+"}${toString net.port} ${net.password}
                   ${concatMapStrings (c: "<Chan #${c}>\n</Chan>\n") net.channels}
+                  ${lib.optionalString net.hasBitlbeeControlChannel ''
+                    <Chan &bitlbee></Chan>
+                  ''}
+                  ${net.extraConf}
               </Network>
               '') confOpts.networks) }
     </User>
@@ -85,6 +88,23 @@ let
         '';
       };
 
+      userName = mkOption {
+        default = "";
+        example = "johntron";
+        type = types.string;
+        description = ''
+          A nick identity specific to the IRC server.
+        '';
+      };
+
+      password = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          IRC server password, such as for a Slack gateway.
+        '';
+      };
+
       useSSL = mkOption {
         type = types.bool;
         default = true;
@@ -119,6 +139,31 @@ let
           IRC channels to join.
         '';
       };
+
+      hasBitlbeeControlChannel = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to add the special Bitlbee operations channel.
+        '';
+      };
+
+      extraConf = mkOption {
+        default = "";
+        type = types.lines;
+        example = ''
+          Encoding = ^UTF-8
+          FloodBurst = 4
+          FloodRate = 1.00
+          IRCConnectEnabled = true
+          Ident = johntron
+          JoinDelay = 0
+          Nick = johntron
+        '';
+        description = ''
+          Extra config for the network.
+        '';
+      };
     };
   };
 
@@ -273,21 +318,21 @@ in
           A list of global znc module packages to add to znc.
         '';
       };
- 
+
       mutable = mkOption {
         default = false;
         type = types.bool;
         description = ''
           Indicates whether to allow the contents of the `dataDir` directory to be changed
           by the user at run-time.
-          If true, modifications to the ZNC configuration after its initial creation are not 
+          If true, modifications to the ZNC configuration after its initial creation are not
             overwritten by a NixOS system rebuild.
           If false, the ZNC configuration is rebuilt by every system rebuild.
           If the user wants to manage the ZNC service using the web admin interface, this value
             should be set to true.
         '';
       };
- 
+
       extraFlags = mkOption {
         default = [ ];
         example = [ "--debug" ];
@@ -334,7 +379,7 @@ in
 
         if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then
           ${pkgs.coreutils}/bin/echo "No znc.pem file found in ${cfg.dataDir}. Creating one now."
-          ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir} 
+          ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir}
         fi
 
         # Symlink modules
@@ -352,7 +397,7 @@ in
         home = cfg.dataDir;
         createHome = true;
       };
- 
+
     users.extraGroups = optional (cfg.user == defaultUser)
       { name = defaultUser;
         gid = config.ids.gids.znc;

From 1810b3f64b8f4711d8a2be08e38334c2442f69c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 18 May 2017 06:26:56 +0100
Subject: [PATCH 140/206] gtk2: search for themes in XDG_DATA_DIRS

This patch was adapted from GUIX.
At the moment we still have to rely on GTK_DATA_PREFIX, which can only
point to one profile at the time and is also not set in all desktop
environments. This patch makes it possible to use installed themes, no
matter if system-wide or by in a user profile.
---
 pkgs/development/libraries/gtk+/2.x.nix       |  2 +-
 .../libraries/gtk+/gtk2-theme-paths.patch     | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/gtk+/gtk2-theme-paths.patch

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 306e2db29ce..f6e718d82e9 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ setupHook perl pkgconfig gettext ];
 
-  patches = [ ./2.0-immodules.cache.patch ];
+  patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch ];
 
   propagatedBuildInputs = with xorg;
     [ glib cairo pango gdk_pixbuf atk ]
diff --git a/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch b/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch
new file mode 100644
index 00000000000..edd69b07807
--- /dev/null
+++ b/pkgs/development/libraries/gtk+/gtk2-theme-paths.patch
@@ -0,0 +1,40 @@
+Subject: [PATCHv2] gtk: Patch GTK+ to look for themes in profiles.
+To: guix-devel@gnu.org
+Date: Sun, 13 Mar 2016 15:17:37 +1100
+Url: https://lists.gnu.org/archive/html/guix-devel/2016-03/msg00492.html
+
+diff -Naur gtk+-2.24.28.new/gtk/gtkrc.c gtk+-2.24.28/gtk/gtkrc.c
+--- gtk+-2.24.28.new/gtk/gtkrc.c	2016-03-13 10:31:14.413644362 +1100
++++ gtk+-2.24.28/gtk/gtkrc.c	2016-03-13 12:51:34.723398423 +1100
+@@ -808,6 +808,8 @@
+   gchar *path = NULL;
+   const gchar *home_dir;
+   gchar *subpath;
++  const gchar * const *xdg_data_dirs;
++  gint i;
+ 
+   if (type)
+     subpath = g_strconcat ("gtk-2.0-", type,
+@@ -830,6 +832,22 @@
+     }
+ 
+   if (!path)
++    {
++      xdg_data_dirs = g_get_system_data_dirs ();
++      for (i = 0; xdg_data_dirs[i]; i++)
++        {
++          path = g_build_filename (xdg_data_dirs[i], "themes", name, subpath, NULL);
++          if (g_file_test (path, G_FILE_TEST_EXISTS))
++            break;
++          else
++            {
++              g_free (path);
++              path = NULL;
++            }
++        }
++    }
++
++  if (!path)
+     {
+       gchar *theme_dir = gtk_rc_get_theme_dir ();
+       path = g_build_filename (theme_dir, name, subpath, NULL);

From 0eff1d9f2af05353a827a3896ebcc2bce20d2fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 18 May 2017 07:56:01 +0200
Subject: [PATCH 141/206] vino: use wrapGAppsHook

Fixes this:

  .vino-server-wr[8931]: Using the 'memory' GSettings backend. \
  Your settings will not be saved or shared with other applications.

Still, the screen sharing settings under "gnome-control-center sharing"
does not seem to be persisted (except the enabling/disabling sharing
flag itself). Making changes and then re-opening gnome-control-center
shows the default screen sharing settings. Sigh.
---
 pkgs/desktops/gnome-3/3.22/core/vino/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix b/pkgs/desktops/gnome-3/3.22/core/vino/default.nix
index f0fbc9c348b..bd446623fc2 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/vino/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, makeWrapper
+{ stdenv, fetchurl, lib, wrapGAppsHook
 , pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup
 , telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null
 , libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   buildInputs = [
-    makeWrapper
+    wrapGAppsHook
     pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup
   ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ]
     ++ optional gnomeKeyringSupport libgnome_keyring3
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
     ];
 
   preFixup = ''
-    wrapProgram "$out/libexec/vino-server" \
-      --prefix XDG_DATA_DIRS : "$out/share:$out/share/gsettings-schemas/${name}:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    export GSETTINGS_SCHEMAS_PATH="$out/share/gsettings-schemas/${name}:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From 8ae6797c0e8a1b9c1ad741b13ce2e988578a195f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 18 May 2017 11:40:27 +0200
Subject: [PATCH 142/206] nixopsUnstable: 1.5 -> 2017-05-15

---
 .../package-management/nixops/generic.nix     | 25 ++++++++-----------
 .../package-management/nixops/unstable.nix    |  6 ++---
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index 4d67e8a5d6f..d9c9661d41a 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -5,9 +5,7 @@
 
 python2Packages.buildPythonApplication {
   name = "nixops-${version}";
-  namePrefix = "";
-
-  src = src;
+  inherit version src;
 
   buildInputs = [ libxslt ];
 
@@ -31,23 +29,22 @@ python2Packages.buildPythonApplication {
 
   doCheck = false;
 
-  postInstall =
-    ''
-      make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \
-        docdir=$out/share/doc/nixops mandir=$out/share/man
+  postInstall = ''
+    make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \
+      docdir=$out/share/doc/nixops mandir=$out/share/man
 
-      mkdir -p $out/share/nix/nixops
-      cp -av "nix/"* $out/share/nix/nixops
+    mkdir -p $out/share/nix/nixops
+    cp -av "nix/"* $out/share/nix/nixops
 
-      # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
-      # the version of openssh is causing errors when have big networks (40+)
-      wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin"
-    '';
+    # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
+    # the version of openssh is causing errors when have big networks (40+)
+    wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin"
+  '';
 
   meta = {
     homepage = https://github.com/NixOS/nixops;
     description = "NixOS cloud provisioning and deployment tool";
-    maintainers = [ lib.maintainers.eelco lib.maintainers.rob ];
+    maintainers = with lib.maintainers; [ eelco rob domenkozar ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index 820bcbb9a35..7ddc8835a77 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.5";
+  version = "2017-05-15";
   src = fetchurl {
-    url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
-    sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd";
+    url = "https://static.domenkozar.com/rf5n6m8qwviaiv06sfmdwl8hndp0hxbp-nixops-1.5.1pre2159_db36cb7.tar.bz2";
+    sha256 = "01b4mgql5jxin2fb2ndr1qlc8171vbb1vdljdimy8nz49dgy0gkx";
   };
 })

From d438cbb0b6989491d9793469a8ca8d994679c13e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 11 May 2017 20:34:34 +0200
Subject: [PATCH 143/206] socklog: disable shsgr test

Running the chkhsgr test on Hydra fails with
```
./chkshsgr || ( cat warn-shsgr; exit 1 )
Oops. Your getgroups() returned 0, and setgroups() failed; this means
that I can't reliably do my shsgr test. Please either ``make'' as root
or ``make'' while you're in one or more supplementary groups.
```

We just assume that our supported platforms have working
getgroups()/setgroups().
---
 pkgs/tools/system/socklog/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix
index e0adad4eff8..0b893bfe0dc 100644
--- a/pkgs/tools/system/socklog/default.nix
+++ b/pkgs/tools/system/socklog/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "man" "doc" ];
 
+  postPatch = ''
+    sed -i src/TARGETS -e '/^chkshsgr/d'
+  '';
+
   configurePhase = ''
     echo "$NIX_CC/bin/cc $NIX_CFLAGS_COMPILE"   >src/conf-cc
     echo "$NIX_CC/bin/cc -s"                    >src/conf-ld

From 77ed860114fc28c702ff97d72e95c953f1435559 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 12 May 2017 18:33:19 +0200
Subject: [PATCH 144/206] linux_hardened: enable checks on scatter-gather
 tables

Recommended by kspp
---
 pkgs/os-specific/linux/kernel/hardened-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 2482641c9f0..ba5e538c493 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -29,6 +29,7 @@ ${optionalString (versionAtLeast version "4.10") ''
 DEBUG_CREDENTIALS y
 DEBUG_NOTIFIERS y
 DEBUG_LIST y
+DEBUG_SG y
 
 HARDENED_USERCOPY y # Bounds check usercopy
 

From ccef4810caf740198a8428a7734771dcbd9e4c98 Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Thu, 18 May 2017 13:11:31 +0200
Subject: [PATCH 145/206] idea-community: 2017.1.1 -> 2017.1.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index cffb44730c6..663ee4c9bd0 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -233,12 +233,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2017.1.1";
+    version = "2017.1.3";
     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 = "1222xkw7n424ihqxyjk352nnx9ka6as7ajwafgb2f27hfiz8d3li";
+      sha256 = "0ag70z4cark69hzhvx5j75qa8dglwzfaqrzi8pim3asd161fwxrx";
     };
     wmClass = "jetbrains-idea-ce";
   };

From 395496a62af4b674df2b41bd80e5f81ac1f1d826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 18 May 2017 15:39:14 +0200
Subject: [PATCH 146/206] nixopsUnstable: correct tarball
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 3e47e6251930294711d625a8123b7f395dd16b58)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/tools/package-management/nixops/unstable.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index 7ddc8835a77..d951b2ba0a5 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -3,7 +3,8 @@
 callPackage ./generic.nix (rec {
   version = "2017-05-15";
   src = fetchurl {
-    url = "https://static.domenkozar.com/rf5n6m8qwviaiv06sfmdwl8hndp0hxbp-nixops-1.5.1pre2159_db36cb7.tar.bz2";
-    sha256 = "01b4mgql5jxin2fb2ndr1qlc8171vbb1vdljdimy8nz49dgy0gkx";
+    # Sadly hydra doesn't offer download links
+    url = "https://static.domenkozar.com/nixops-tarball-1.5.1pre2165_b2fdc43.tar.bz2";
+    sha256 = "1x8jiskxynx0rzw356sz406bi2vl0vjs7747sbacq0bp1jlnpb2n";
   };
 })

From e08cb81b31728261fd378881a9938ca651f82398 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 18 May 2017 15:53:37 +0200
Subject: [PATCH 147/206] nano: 2.8.2 -> 2.8.3

See http://lists.gnu.org/archive/html/info-gnu/2017-05/msg00007.html
for release announcement
---
 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 a8c2f9c8558..cbc0f39463a 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.8.2";
+  version = "2.8.3";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1q5rxkvsv974085xrd2k11ffazadabcb9cnpfra0shmj71xqlgh2";
+    sha256 = "0m8g1f1c09kjmy7w6dxq30yw373nsv1ylj7986xyv4a0jddybf32";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

From d4e2cbd5c95a05b591f8a71ebd3336aaf0892ef3 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Thu, 18 May 2017 15:57:26 +0200
Subject: [PATCH 148/206] miredo: Improve service description

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

diff --git a/nixos/modules/services/networking/miredo.nix b/nixos/modules/services/networking/miredo.nix
index 3d560338e2c..8694d08385c 100644
--- a/nixos/modules/services/networking/miredo.nix
+++ b/nixos/modules/services/networking/miredo.nix
@@ -20,7 +20,7 @@ in
 
     services.miredo = {
 
-      enable = mkEnableOption "Whether miredo should be run on startup.";
+      enable = mkEnableOption "the Miredo IPv6 tunneling service.";
 
       package = mkOption {
         type = types.package;

From df91297181d0d62da0d090039af52a44ff70467d Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 18 May 2017 10:41:58 -0400
Subject: [PATCH 149/206] release-cross: Do a recursive union to make sure we
 don't loose tests

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

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 31ce31a6759..ad868531598 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -17,12 +17,12 @@ let
     gmp = nativePlatforms;
   };
 
-  gnuCommon = common // {
+  gnuCommon = lib.recursiveUpdate common {
     buildPackages.gccCrossStageFinal = nativePlatforms;
     coreutils = nativePlatforms;
   };
 
-  linuxCommon = gnuCommon // {
+  linuxCommon = lib.recursiveUpdate gnuCommon {
     buildPackages.gdbCross = nativePlatforms;
 
     bison = nativePlatforms;
@@ -33,7 +33,7 @@ let
     patch = nativePlatforms;
   };
 
-  windowsCommon = gnuCommon // {
+  windowsCommon = lib.recursiveUpdate gnuCommon {
     boehmgc = nativePlatforms;
     guile_1_8 = nativePlatforms;
     libffi = nativePlatforms;

From d7e9248debe66225bae1788c347bfe6c62e38a6e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 14:12:50 -0500
Subject: [PATCH 150/206] kdeApplications: 17.04.0 -> 17.04.1

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/l10n.nix |   59 -
 pkgs/applications/kde/srcs.nix | 2752 ++++++++++++++++----------------
 3 files changed, 1377 insertions(+), 1436 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 7cd707092ba..d0f31d6a2a5 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/17.04.0/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/17.04.1/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/l10n.nix b/pkgs/applications/kde/l10n.nix
index 87e7a82ce46..403db98c0f3 100644
--- a/pkgs/applications/kde/l10n.nix
+++ b/pkgs/applications/kde/l10n.nix
@@ -10,187 +10,141 @@ in
 lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
   ar = {
     qt4 = callPackage (kdeLocale4 "ar" {}) {};
-    qt5 = callPackage (kdeLocale5 "ar" {}) {};
   };
   bg = {
     qt4 = callPackage (kdeLocale4 "bg" {}) {};
-    qt5 = callPackage (kdeLocale5 "bg" {}) {};
   };
   bs = {
     qt4 = callPackage (kdeLocale4 "bs" {}) {};
-    qt5 = callPackage (kdeLocale5 "bs" {}) {};
   };
   ca = {
     qt4 = callPackage (kdeLocale4 "ca" {}) {};
-    qt5 = callPackage (kdeLocale5 "ca" {}) {};
   };
   ca_valencia = {
     qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
-    qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {};
   };
   cs = {
     qt4 = callPackage (kdeLocale4 "cs" {}) {};
-    qt5 = callPackage (kdeLocale5 "cs" {}) {};
   };
   da = {
     qt4 = callPackage (kdeLocale4 "da" {}) {};
-    qt5 = callPackage (kdeLocale5 "da" {}) {};
   };
   de = {
     qt4 = callPackage (kdeLocale4 "de" {}) {};
-    qt5 = callPackage (kdeLocale5 "de" {}) {};
   };
   el = {
     qt4 = callPackage (kdeLocale4 "el" {}) {};
-    qt5 = callPackage (kdeLocale5 "el" {}) {};
   };
   en_GB = {
     qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
-    qt5 = callPackage (kdeLocale5 "en_GB" {}) {};
   };
   eo = {
     qt4 = callPackage (kdeLocale4 "eo" {}) {};
-    qt5 = callPackage (kdeLocale5 "eo" {}) {};
   };
   es = {
     qt4 = callPackage (kdeLocale4 "es" {}) {};
-    qt5 = callPackage (kdeLocale5 "es" {}) {};
   };
   et = {
     qt4 = callPackage (kdeLocale4 "et" {}) {};
-    qt5 = callPackage (kdeLocale5 "et" {}) {};
   };
   eu = {
     qt4 = callPackage (kdeLocale4 "eu" {}) {};
-    qt5 = callPackage (kdeLocale5 "eu" {}) {};
   };
   fa = {
     qt4 = callPackage (kdeLocale4 "fa" {}) {};
-    qt5 = callPackage (kdeLocale5 "fa" {}) {};
   };
   fi = {
     qt4 = callPackage (kdeLocale4 "fi" {}) {};
-    qt5 = callPackage (kdeLocale5 "fi" {}) {};
   };
   fr = {
     qt4 = callPackage (kdeLocale4 "fr" {}) {};
-    qt5 = callPackage (kdeLocale5 "fr" {}) {};
   };
   ga = {
     qt4 = callPackage (kdeLocale4 "ga" {}) {};
-    qt5 = callPackage (kdeLocale5 "ga" {}) {};
   };
   gl = {
     qt4 = callPackage (kdeLocale4 "gl" {}) {};
-    qt5 = callPackage (kdeLocale5 "gl" {}) {};
   };
   he = {
     qt4 = callPackage (kdeLocale4 "he" {}) {};
-    qt5 = callPackage (kdeLocale5 "he" {}) {};
   };
   hi = {
     qt4 = callPackage (kdeLocale4 "hi" {}) {};
-    qt5 = callPackage (kdeLocale5 "hi" {}) {};
   };
   hr = {
     qt4 = callPackage (kdeLocale4 "hr" {}) {};
-    qt5 = callPackage (kdeLocale5 "hr" {}) {};
   };
   hu = {
     qt4 = callPackage (kdeLocale4 "hu" {}) {};
-    qt5 = callPackage (kdeLocale5 "hu" {}) {};
   };
   ia = {
     qt4 = callPackage (kdeLocale4 "ia" {}) {};
-    qt5 = callPackage (kdeLocale5 "ia" {}) {};
   };
   id = {
     qt4 = callPackage (kdeLocale4 "id" {}) {};
-    qt5 = callPackage (kdeLocale5 "id" {}) {};
   };
   is = {
     qt4 = callPackage (kdeLocale4 "is" {}) {};
-    qt5 = callPackage (kdeLocale5 "is" {}) {};
   };
   it = {
     qt4 = callPackage (kdeLocale4 "it" {}) {};
-    qt5 = callPackage (kdeLocale5 "it" {}) {};
   };
   ja = {
     qt4 = callPackage (kdeLocale4 "ja" {}) {};
-    qt5 = callPackage (kdeLocale5 "ja" {}) {};
   };
   kk = {
     qt4 = callPackage (kdeLocale4 "kk" {}) {};
-    qt5 = callPackage (kdeLocale5 "kk" {}) {};
   };
   km = {
     qt4 = callPackage (kdeLocale4 "km" {}) {};
-    qt5 = callPackage (kdeLocale5 "km" {}) {};
   };
   ko = {
     qt4 = callPackage (kdeLocale4 "ko" {}) {};
-    qt5 = callPackage (kdeLocale5 "ko" {}) {};
   };
   lt = {
     qt4 = callPackage (kdeLocale4 "lt" {}) {};
-    qt5 = callPackage (kdeLocale5 "lt" {}) {};
   };
   lv = {
     qt4 = callPackage (kdeLocale4 "lv" {}) {};
-    qt5 = callPackage (kdeLocale5 "lv" {}) {};
   };
   mr = {
     qt4 = callPackage (kdeLocale4 "mr" {}) {};
-    qt5 = callPackage (kdeLocale5 "mr" {}) {};
   };
   nb = {
     qt4 = callPackage (kdeLocale4 "nb" {}) {};
-    qt5 = callPackage (kdeLocale5 "nb" {}) {};
   };
   nds = {
     qt4 = callPackage (kdeLocale4 "nds" {}) {};
-    qt5 = callPackage (kdeLocale5 "nds" {}) {};
   };
   nl = {
     qt4 = callPackage (kdeLocale4 "nl" {}) {};
-    qt5 = callPackage (kdeLocale5 "nl" {}) {};
   };
   nn = {
     qt4 = callPackage (kdeLocale4 "nn" {}) {};
-    qt5 = callPackage (kdeLocale5 "nn" {}) {};
   };
   pa = {
     qt4 = callPackage (kdeLocale4 "pa" {}) {};
-    qt5 = callPackage (kdeLocale5 "pa" {}) {};
   };
   pl = {
     qt4 = callPackage (kdeLocale4 "pl" {}) {};
-    qt5 = callPackage (kdeLocale5 "pl" {}) {};
   };
   pt = {
     qt4 = callPackage (kdeLocale4 "pt" {}) {};
-    qt5 = callPackage (kdeLocale5 "pt" {}) {};
   };
   pt_BR = {
     qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
-    qt5 = callPackage (kdeLocale5 "pt_BR" {}) {};
   };
   ro = {
     qt4 = callPackage (kdeLocale4 "ro" {}) {};
-    qt5 = callPackage (kdeLocale5 "ro" {}) {};
   };
   ru = {
     qt4 = callPackage (kdeLocale4 "ru" {}) {};
-    qt5 = callPackage (kdeLocale5 "ru" {}) {};
   };
   sk = {
     qt4 = callPackage (kdeLocale4 "sk" {}) {};
-    qt5 = callPackage (kdeLocale5 "sk" {}) {};
   };
   sl = {
     qt4 = callPackage (kdeLocale4 "sl" {}) {};
-    qt5 = callPackage (kdeLocale5 "sl" {}) {};
   };
   sr = {
     qt4 = callPackage (kdeLocale4 "sr" {
@@ -203,39 +157,26 @@ lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
             4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py
         '';
     }) {};
-    qt5 = callPackage (kdeLocale5 "sr" {
-      preConfigure = ''
-        patchShebangs 5/sr/cmake_modules/resolve-sr-hybrid
-        sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
-      '';
-    }) {};
   };
   sv = {
     qt4 = callPackage (kdeLocale4 "sv" {}) {};
-    qt5 = callPackage (kdeLocale5 "sv" {}) {};
   };
   tr = {
     qt4 = callPackage (kdeLocale4 "tr" {}) {};
-    qt5 = callPackage (kdeLocale5 "tr" {}) {};
   };
   ug = {
     qt4 = callPackage (kdeLocale4 "ug" {}) {};
-    qt5 = callPackage (kdeLocale5 "ug" {}) {};
   };
   uk = {
     qt4 = callPackage (kdeLocale4 "uk" {}) {};
-    qt5 = callPackage (kdeLocale5 "uk" {}) {};
   };
   wa = {
     qt4 = callPackage (kdeLocale4 "wa" {}) {};
-    qt5 = callPackage (kdeLocale5 "wa" {}) {};
   };
   zh_CN = {
     qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
-    qt5 = callPackage (kdeLocale5 "zh_CN" {}) {};
   };
   zh_TW = {
     qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
-    qt5 = callPackage (kdeLocale5 "zh_TW" {}) {};
   };
 }
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 95aef32cc37..fa8bfa687e1 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2235 +3,2235 @@
 
 {
   akonadi = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/akonadi-17.04.0.tar.xz";
-      sha256 = "1m0176q7g1vw2iy567xiadrpg87p58njinh7bab2pqv7zya7cbwn";
-      name = "akonadi-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/akonadi-17.04.1.tar.xz";
+      sha256 = "0dsxbc03rwd3rrcq4kvadcfwbfgpbgl41735j68mhb9y8gfdniyj";
+      name = "akonadi-17.04.1.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/akonadi-calendar-17.04.0.tar.xz";
-      sha256 = "08ajx9iq49y1ca9gxxcczxyqhjvkq4pnhm5s6yyblgmb9cpwivh9";
-      name = "akonadi-calendar-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/akonadi-calendar-17.04.1.tar.xz";
+      sha256 = "1xcmy0a305r94yns9mq2fcm9aix1djdk7xc73kfxs5n1jk5w44pl";
+      name = "akonadi-calendar-17.04.1.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/akonadi-calendar-tools-17.04.0.tar.xz";
-      sha256 = "0s34m96i4y51fdb23v12mav7q2livq77xrpx0h2ghma0nljdhy1m";
-      name = "akonadi-calendar-tools-17.04.0.tar.xz";
-    };
-  };
-  akonadi-contacts = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/akonadi-contacts-17.04.0.tar.xz";
-      sha256 = "01fw0qmnbsbcpy7wx14sg0kwbws4n2d63mbslb3c4hqgq6ahgz37";
-      name = "akonadi-contacts-17.04.0.tar.xz";
-    };
-  };
-  akonadi-import-wizard = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/akonadi-import-wizard-17.04.0.tar.xz";
-      sha256 = "0a9k78w55wg9p22x7qwbpz7lzyijz1z3k12fv1c1g0vn1nbwcadv";
-      name = "akonadi-import-wizard-17.04.0.tar.xz";
-    };
-  };
-  akonadi-mime = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/akonadi-mime-17.04.0.tar.xz";
-      sha256 = "1aidmb1bsx5xvppypzs2gg81jifcvc3jv2827hjkqvd021z831nv";
-      name = "akonadi-mime-17.04.0.tar.xz";
-    };
-  };
-  akonadi-notes = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/akonadi-notes-17.04.0.tar.xz";
-      sha256 = "0jfcw9lh1rhydw1c14z065lv3h9xl1q3i66slmfmmamy99czczjr";
-      name = "akonadi-notes-17.04.0.tar.xz";
-    };
-  };
-  akonadi-search = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/akonadi-search-17.04.0.tar.xz";
-      sha256 = "1mgq0n5z8ar1zajwsrrs1failrrrkkv6g0pcs7grq2prfsv4z1p3";
-      name = "akonadi-search-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/akonadi-calendar-tools-17.04.1.tar.xz";
+      sha256 = "1aslp4grljmn19zxxcfwylwsifimbgvj4r1zjnwfd9mx1d8m60cm";
+      name = "akonadi-calendar-tools-17.04.1.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/akonadiconsole-17.04.0.tar.xz";
-      sha256 = "01adzv1z92zyfi22psa6m30c290w37n0m01hd9wgjj8in4hzmk3d";
-      name = "akonadiconsole-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/akonadiconsole-17.04.1.tar.xz";
+      sha256 = "14hybly50bckpjam7f9fndqgj99pwinc5cm7z62bj5d76r5bma7c";
+      name = "akonadiconsole-17.04.1.tar.xz";
+    };
+  };
+  akonadi-contacts = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/akonadi-contacts-17.04.1.tar.xz";
+      sha256 = "0ab3i5aw38igi32zqw6i7lcqbhmac9flr1m5mqsrjb50m40xd5sk";
+      name = "akonadi-contacts-17.04.1.tar.xz";
+    };
+  };
+  akonadi-import-wizard = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/akonadi-import-wizard-17.04.1.tar.xz";
+      sha256 = "1a7a0fm7y97znja3wpx49lpz4m8351ybf3bqragklkjp9649j2j3";
+      name = "akonadi-import-wizard-17.04.1.tar.xz";
+    };
+  };
+  akonadi-mime = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/akonadi-mime-17.04.1.tar.xz";
+      sha256 = "0g4mb0y0npn4cplw64dwm6qyjrvrdj8af229nv7zhlkdw74x1xhf";
+      name = "akonadi-mime-17.04.1.tar.xz";
+    };
+  };
+  akonadi-notes = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/akonadi-notes-17.04.1.tar.xz";
+      sha256 = "0ycw2cync7r03vvpcx9640dv9j66fala2060dawsv5xynr3x4qcq";
+      name = "akonadi-notes-17.04.1.tar.xz";
+    };
+  };
+  akonadi-search = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/akonadi-search-17.04.1.tar.xz";
+      sha256 = "0jrphb4s8i4rij88s1l4vvx3nk8giw5hshpd1ad69nabdb60flvk";
+      name = "akonadi-search-17.04.1.tar.xz";
     };
   };
   akregator = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/akregator-17.04.0.tar.xz";
-      sha256 = "1dpvyx13lyl1pmphqr8mc9cxywkjcqy6aqmh7hdsi0vggafkiim5";
-      name = "akregator-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/akregator-17.04.1.tar.xz";
+      sha256 = "1i3d59fcd6ca1pw52np540dbkhka2xsczxilqb21rlqji2a9v7vz";
+      name = "akregator-17.04.1.tar.xz";
     };
   };
   analitza = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/analitza-17.04.0.tar.xz";
-      sha256 = "1mx2y0cqsj2v8pwcwpqsg5brakaw6g14acqxrx7xmpfzzi0y8mxg";
-      name = "analitza-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/analitza-17.04.1.tar.xz";
+      sha256 = "1zjz7dy4ihicirwfkz7zfg5w4gm8avgps9qamvggy6h1j027wp6i";
+      name = "analitza-17.04.1.tar.xz";
     };
   };
   ark = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ark-17.04.0.tar.xz";
-      sha256 = "0qk829f10pjpvn3qpfbr16y6qkrgkbi510d1bqbsjnpnfz821hwk";
-      name = "ark-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ark-17.04.1.tar.xz";
+      sha256 = "08rjkm6k1vl29svh7vqp56yr2fns6m51blspjyyf08hsm9bxqhmn";
+      name = "ark-17.04.1.tar.xz";
     };
   };
   artikulate = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/artikulate-17.04.0.tar.xz";
-      sha256 = "1y6w1b17ndrplkkakskdzqws6apfa801gpqfh7lnq2r0vj48kz7m";
-      name = "artikulate-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/artikulate-17.04.1.tar.xz";
+      sha256 = "11xyiclc47mdh89in3lhapxn7kr54bzc58jx3nxb85vsyxvpmy5k";
+      name = "artikulate-17.04.1.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/audiocd-kio-17.04.0.tar.xz";
-      sha256 = "1fqdgvl2rgln6zr73pgznp7bn3lhbaw03q5hd3ndh14yvlin64xw";
-      name = "audiocd-kio-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/audiocd-kio-17.04.1.tar.xz";
+      sha256 = "07b9k4nry6825yd0fmaib39wfxfzh63vilm2x8j2irw8bs2j9ban";
+      name = "audiocd-kio-17.04.1.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/baloo-widgets-17.04.0.tar.xz";
-      sha256 = "0nkk2xj35cqg2w7795ys2lpynkcmwf4fnq53sb20vn95scnn88mw";
-      name = "baloo-widgets-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/baloo-widgets-17.04.1.tar.xz";
+      sha256 = "0sc0iysxcxwqjpkvdbxrpvw01pr86jzimf89l1px4v2q36x1s61s";
+      name = "baloo-widgets-17.04.1.tar.xz";
     };
   };
   blinken = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/blinken-17.04.0.tar.xz";
-      sha256 = "0mimvcy6jdx5xr46li4jc00c9yy4626p2jlzimnl1sv2fcs1f72h";
-      name = "blinken-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/blinken-17.04.1.tar.xz";
+      sha256 = "1mip3j21d9m16cj5km08k45svqb8ax7qz3dsdljia5q04x0lxibl";
+      name = "blinken-17.04.1.tar.xz";
     };
   };
   blogilo = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/blogilo-17.04.0.tar.xz";
-      sha256 = "0v9vv1jfis5bvbf9yflqkqilbpx0kp4zbwnazzcgc3hi9bgm2fdb";
-      name = "blogilo-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/blogilo-17.04.1.tar.xz";
+      sha256 = "1r5i5877aywmgk4pw194ha534wamj79zgky2xb0qgd7s1qvgi6m8";
+      name = "blogilo-17.04.1.tar.xz";
     };
   };
   bomber = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/bomber-17.04.0.tar.xz";
-      sha256 = "0kv3z2kz85mxbi99rdkz4i9xyv9xgkhayk4pq0qsy7g6lk31sv9h";
-      name = "bomber-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/bomber-17.04.1.tar.xz";
+      sha256 = "0iy0y3wwdlgskg2lgnfi678y9rnix8w13piqc1hyj31ad77nld4c";
+      name = "bomber-17.04.1.tar.xz";
     };
   };
   bovo = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/bovo-17.04.0.tar.xz";
-      sha256 = "0j5nf701zj1wafy08mhv094dqqyzy9y9waz0wappvxn8maqj0dk2";
-      name = "bovo-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/bovo-17.04.1.tar.xz";
+      sha256 = "0bh3q7dgimi4mnb7bh3viiwyj68r9fvkwd3va56znl9j97ggjl2p";
+      name = "bovo-17.04.1.tar.xz";
     };
   };
   calendarsupport = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/calendarsupport-17.04.0.tar.xz";
-      sha256 = "1r7cai24ac857an7sgmgyyjy6m2vrjy80ba3qxszys9v3mya60ya";
-      name = "calendarsupport-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/calendarsupport-17.04.1.tar.xz";
+      sha256 = "0h3p5l3xw0jjcz22f8wz57xy9q5k32asl4xq57j7k4bg4rn0cbhq";
+      name = "calendarsupport-17.04.1.tar.xz";
     };
   };
   cantor = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/cantor-17.04.0.tar.xz";
-      sha256 = "0vy7ygiimlrqnv4nq2393hriaryr5si478kijf6q0dvqg1px59xy";
-      name = "cantor-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/cantor-17.04.1.tar.xz";
+      sha256 = "140rhfd2yi4blikj1ybqkvfwvzd7i1hm4qgpd25jv3n1hc0i9b41";
+      name = "cantor-17.04.1.tar.xz";
     };
   };
   cervisia = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/cervisia-17.04.0.tar.xz";
-      sha256 = "1z9svqp42slh7fwczjv847scyjdbz9a5pzzkrfvqggi2wc85vzin";
-      name = "cervisia-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/cervisia-17.04.1.tar.xz";
+      sha256 = "0fps66icbkns0r4qvzs50772f9nd8ydkali8695vwza4b5mixgvr";
+      name = "cervisia-17.04.1.tar.xz";
     };
   };
   dolphin = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/dolphin-17.04.0.tar.xz";
-      sha256 = "09r2pqzjq7g7322m2vb1s1909bzckh0h9fwzsxvrmyz1cfdd765y";
-      name = "dolphin-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/dolphin-17.04.1.tar.xz";
+      sha256 = "1rrb6ncyykf0dj3fx9qzpcac2yn12rrxnkpnnaiw84aqxdg0gbi7";
+      name = "dolphin-17.04.1.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/dolphin-plugins-17.04.0.tar.xz";
-      sha256 = "0mj0p1lbdvfn46i5bry394rqpriv0w1389dw526xz6cplrzydi2q";
-      name = "dolphin-plugins-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/dolphin-plugins-17.04.1.tar.xz";
+      sha256 = "0nr82063805axbhmisim97w4zzvi30jp0a0q7xxgnrp80b89zqam";
+      name = "dolphin-plugins-17.04.1.tar.xz";
     };
   };
   dragon = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/dragon-17.04.0.tar.xz";
-      sha256 = "08mlsj4ib0s219vnrmy7g6iap8zaaha12vhqrc5950248k0rz181";
-      name = "dragon-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/dragon-17.04.1.tar.xz";
+      sha256 = "1wlf9z4qqhvg60x5x3k813k1lhvhkn25dsifwjprg6239fhayy7p";
+      name = "dragon-17.04.1.tar.xz";
     };
   };
   eventviews = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/eventviews-17.04.0.tar.xz";
-      sha256 = "1gylv5p9v96g4krcnd9xqg0nfvxzhxyc4ywy0wbqfn5zwngzpz80";
-      name = "eventviews-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/eventviews-17.04.1.tar.xz";
+      sha256 = "01nsj4mzz5ck677zma3zhz0gq9bnx7il8mhgrnwk5gjkr7hdnzhh";
+      name = "eventviews-17.04.1.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ffmpegthumbs-17.04.0.tar.xz";
-      sha256 = "0jrq940x50n9g613db254sflwpw4pa70r79hkvkf3ri11s80hmgm";
-      name = "ffmpegthumbs-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ffmpegthumbs-17.04.1.tar.xz";
+      sha256 = "0wa1k1ns8jxywkrvzbdy1av4lb21r7pb23i7gac7l2508gmdsy3n";
+      name = "ffmpegthumbs-17.04.1.tar.xz";
     };
   };
   filelight = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/filelight-17.04.0.tar.xz";
-      sha256 = "18dz82kdgazwv00kvbfm5ln13g28s5sqyp9cfm0c7vrdnq8spng8";
-      name = "filelight-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/filelight-17.04.1.tar.xz";
+      sha256 = "0hfa1c2c81jfxgfgr68dkacgbikpymyhb4n2kg9ld5710zid02bd";
+      name = "filelight-17.04.1.tar.xz";
     };
   };
   granatier = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/granatier-17.04.0.tar.xz";
-      sha256 = "08jlpnriq6kvsnfgjar0w3ci6mla1m4bd3qzsxbv5f0hbqj78rm8";
-      name = "granatier-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/granatier-17.04.1.tar.xz";
+      sha256 = "0dyj49x1rfcxr1wpmkzcwl2nnxvpx7j3b3n9kd5m0ggql3xq6wl7";
+      name = "granatier-17.04.1.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/grantlee-editor-17.04.0.tar.xz";
-      sha256 = "1famfm6r32m8i0mp7aiqki8k4rhl6p5dvp3905lbdm355rv2b60b";
-      name = "grantlee-editor-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/grantlee-editor-17.04.1.tar.xz";
+      sha256 = "00hbymma9b836a5313aj6k29cyzivzf1j0izxyd3xdwk1lzcxpyx";
+      name = "grantlee-editor-17.04.1.tar.xz";
     };
   };
   grantleetheme = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/grantleetheme-17.04.0.tar.xz";
-      sha256 = "1dikbf90l55d62zxmw8rw85bkpcgrdf455k33b91ldnhfb3vw3i4";
-      name = "grantleetheme-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/grantleetheme-17.04.1.tar.xz";
+      sha256 = "0sl01blx5wba6y492fazk1srm60hyjqggwglx9cxpf9kyy0480f7";
+      name = "grantleetheme-17.04.1.tar.xz";
     };
   };
   gwenview = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/gwenview-17.04.0.tar.xz";
-      sha256 = "0n4m1zd43g68qgpdvifj5h3ry39262qmm553w3f7yd6i2gpvy2a1";
-      name = "gwenview-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/gwenview-17.04.1.tar.xz";
+      sha256 = "04fh4x15w1f5afscn70ayd87q8hr4jdcj2l3j4bw4s9zbl1rbmch";
+      name = "gwenview-17.04.1.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/incidenceeditor-17.04.0.tar.xz";
-      sha256 = "10yi8hqf5p5nbi9rq8kzkqmbjq0c41a9mz8rjhbz1pac686b87c7";
-      name = "incidenceeditor-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/incidenceeditor-17.04.1.tar.xz";
+      sha256 = "0mhkqyhwnjpjlcqvlcff10rdyismr7n08vyhkv4xgvwxpin5rwcd";
+      name = "incidenceeditor-17.04.1.tar.xz";
     };
   };
   jovie = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/jovie-17.04.0.tar.xz";
-      sha256 = "1n3d03h9mzfyrga9c78mlk5vd53xqqpz9cjj27sw35fhc9l6h5fp";
-      name = "jovie-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/jovie-17.04.1.tar.xz";
+      sha256 = "0kip2736g5bw92i6x0ivm4hjb7dkdmipprrn6k3m0r72ib3k98a5";
+      name = "jovie-17.04.1.tar.xz";
     };
   };
   juk = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/juk-17.04.0.tar.xz";
-      sha256 = "0il7i8lbij9axm7wfgpnzmax3kz8qbdsiizmkwivvaxizvsvc1yz";
-      name = "juk-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/juk-17.04.1.tar.xz";
+      sha256 = "0bi37n7wlfwxmy1r4b5cv1729p1331dwpasl8hwh295z6s1fgwjn";
+      name = "juk-17.04.1.tar.xz";
     };
   };
   k3b = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/k3b-17.04.0.tar.xz";
-      sha256 = "0wsa8s5ndcbskgd505l0nkp9ghj7dsrxwnlkq0rhqjwvfsa7law3";
-      name = "k3b-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/k3b-17.04.1.tar.xz";
+      sha256 = "0mxwja0fdk55x2bq7vgwgpgankfryzdzankx4xj8jxcvz5xhzn1v";
+      name = "k3b-17.04.1.tar.xz";
     };
   };
   kaccessible = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kaccessible-17.04.0.tar.xz";
-      sha256 = "0gkcvm0kz8kwkla3mclryisi4j0cdd6byaq8wvpnfhl68kwb8a33";
-      name = "kaccessible-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kaccessible-17.04.1.tar.xz";
+      sha256 = "1qr4vif0a5427d7mrgn0fyq1dkjpqy0fvalbwxca6ax0rgkjixn2";
+      name = "kaccessible-17.04.1.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kaccounts-integration-17.04.0.tar.xz";
-      sha256 = "0ml1jq4dd3n2ksmw7i5vrsv4lhibdk1d2mvy3yn45w1g8gpqwl8l";
-      name = "kaccounts-integration-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kaccounts-integration-17.04.1.tar.xz";
+      sha256 = "1zizqd2smr00nyvl55g5w3g21h2zfjz4f6vybwav3s4kwmixzp49";
+      name = "kaccounts-integration-17.04.1.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kaccounts-providers-17.04.0.tar.xz";
-      sha256 = "1i19q1rmjwmkd5r23w3zjyk0gf4xrw7j4f0s8q591rgqzy2lhkc3";
-      name = "kaccounts-providers-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kaccounts-providers-17.04.1.tar.xz";
+      sha256 = "1zp6rj0wz4wdx0sph3abz4k3rqzrgj301rq74ijgjx0qf0w5z1mg";
+      name = "kaccounts-providers-17.04.1.tar.xz";
     };
   };
   kaddressbook = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kaddressbook-17.04.0.tar.xz";
-      sha256 = "1qglxn2inibqiljazsd2mc49sk8pv3jkvjn9icxhgfdjg234fl4z";
-      name = "kaddressbook-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kaddressbook-17.04.1.tar.xz";
+      sha256 = "14hd7vaznw3k7znlvi8mly9gq4gcqd1mrfb3in8hxp9vh8w2bxbr";
+      name = "kaddressbook-17.04.1.tar.xz";
     };
   };
   kajongg = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kajongg-17.04.0.tar.xz";
-      sha256 = "1bzfafrslsihbldzdnl1a48wx65yrc9phxjnaiws82ig5369r3xn";
-      name = "kajongg-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kajongg-17.04.1.tar.xz";
+      sha256 = "0n7xq1jqa7slh7537my13mhym8fzbvzs0qj07acwrgi278x6pq2x";
+      name = "kajongg-17.04.1.tar.xz";
     };
   };
   kalarm = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kalarm-17.04.0.tar.xz";
-      sha256 = "1zqblg5wflw0y3fdqihifh25xzm2y0ih9b0i3909wkw0j7p1z4g7";
-      name = "kalarm-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kalarm-17.04.1.tar.xz";
+      sha256 = "1vprwk17b6gyxdsf8wgcmayvy4ryi2rdq0bwxhmlv8a1zhpbra4r";
+      name = "kalarm-17.04.1.tar.xz";
     };
   };
   kalarmcal = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kalarmcal-17.04.0.tar.xz";
-      sha256 = "136vw2sak3z571lv9m2lmnxpgkwhy663q81j6z2gq8vday72ar44";
-      name = "kalarmcal-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kalarmcal-17.04.1.tar.xz";
+      sha256 = "0bj1sgfavm7hcmr0rz4i9cn2xhr36yksllxfc1i1dys5b1ag13gr";
+      name = "kalarmcal-17.04.1.tar.xz";
     };
   };
   kalgebra = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kalgebra-17.04.0.tar.xz";
-      sha256 = "05gkw20g7qc72lsgbhqqmxvmgkgs5bdsyw71kp1dz4h6q7gvck04";
-      name = "kalgebra-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kalgebra-17.04.1.tar.xz";
+      sha256 = "1dg6rylry1nfri8ffzg7szkcl3ffzh482lnbri8zbrnly551g6mk";
+      name = "kalgebra-17.04.1.tar.xz";
     };
   };
   kalzium = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kalzium-17.04.0.tar.xz";
-      sha256 = "17bpn0yqkdrsqrx08zvhxwbjh8f0wdngq375cvv2mgmkjikq375k";
-      name = "kalzium-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kalzium-17.04.1.tar.xz";
+      sha256 = "0mg4kypwy1mmx87zbmqgla9mqq1pbv6ac59pqwxw6bkb8k37ya8z";
+      name = "kalzium-17.04.1.tar.xz";
     };
   };
   kamera = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kamera-17.04.0.tar.xz";
-      sha256 = "178886fbkj3fz25xddgpprmxmn0iv7ndnxygsxq434c9pv3zdxb9";
-      name = "kamera-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kamera-17.04.1.tar.xz";
+      sha256 = "04smnjlq28k6x4z0sgxj2jgvn2gr240zsgp39ylnxhaddy94xmaw";
+      name = "kamera-17.04.1.tar.xz";
     };
   };
   kanagram = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kanagram-17.04.0.tar.xz";
-      sha256 = "0r4k5jsc8vnj2pgpca0iyr0lrz2q683db8nsk6axgv72hkp3v07i";
-      name = "kanagram-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kanagram-17.04.1.tar.xz";
+      sha256 = "0g9kkvxfi66sn1a3mywvbncda4q58y3qkkrjn3kw830xwqlk8sa0";
+      name = "kanagram-17.04.1.tar.xz";
     };
   };
   kapman = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kapman-17.04.0.tar.xz";
-      sha256 = "18mr5i0qvix4vnmy7m721jipafwlh19paczay0ci7qpj1538vrlq";
-      name = "kapman-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kapman-17.04.1.tar.xz";
+      sha256 = "0g04la8fpbcvrlpk4xr1y1i2c4dmka3fj87fi0nvl9p2gnjp569h";
+      name = "kapman-17.04.1.tar.xz";
     };
   };
   kapptemplate = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kapptemplate-17.04.0.tar.xz";
-      sha256 = "1wf29198h6964p2bcb6p5harrsjpbdqsh8r82rn6wh755f033038";
-      name = "kapptemplate-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kapptemplate-17.04.1.tar.xz";
+      sha256 = "1pvnlay791mpfvpjmgzbrfvb3yd20y58awar86dm1ylqwm0mm7vs";
+      name = "kapptemplate-17.04.1.tar.xz";
     };
   };
   kate = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kate-17.04.0.tar.xz";
-      sha256 = "0hk03bpbxyb7jrhbjihqymsih9c3wh8xllz3f4y7qfpcl8v1k3bc";
-      name = "kate-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kate-17.04.1.tar.xz";
+      sha256 = "1lpz5aw0qf4hvk4ph9dqxjywsc772xr5xdhagmn7ghp2hk1ydvil";
+      name = "kate-17.04.1.tar.xz";
     };
   };
   katomic = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/katomic-17.04.0.tar.xz";
-      sha256 = "0m1dymjsa0b11yqcjska84x779xb8q14igshb4cnrr3rlyr71p5f";
-      name = "katomic-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/katomic-17.04.1.tar.xz";
+      sha256 = "0widwj9qpai0ir97gz58kc43752dskylrs5dflsv9agrjld3cplk";
+      name = "katomic-17.04.1.tar.xz";
     };
   };
   kblackbox = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kblackbox-17.04.0.tar.xz";
-      sha256 = "1dsc5pbh3g05skw25x6fyg55cykkyjaw6abhnl947z16gbixnqrg";
-      name = "kblackbox-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kblackbox-17.04.1.tar.xz";
+      sha256 = "02k53virnylfsm79cn7995qcdpl5hbnj325j6fbfhqb0c5420gcw";
+      name = "kblackbox-17.04.1.tar.xz";
     };
   };
   kblocks = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kblocks-17.04.0.tar.xz";
-      sha256 = "1cn4qdk0jgw78v9ymsr353rk8h8p3mcd5r57pjnw3wmjpswc0plg";
-      name = "kblocks-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kblocks-17.04.1.tar.xz";
+      sha256 = "17nb3k4skarnzzz9xlw8iyviws9avlka6fs20ziigza7ickk9r8l";
+      name = "kblocks-17.04.1.tar.xz";
     };
   };
   kblog = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kblog-17.04.0.tar.xz";
-      sha256 = "076225i38iqr4ml1g54nhd8mkjia8k0j7rc8ixv812ksq7xza69b";
-      name = "kblog-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kblog-17.04.1.tar.xz";
+      sha256 = "15hf4y2s25kvdn6wbck116xp6jaxn86h53plkxirjczszfwg3dyj";
+      name = "kblog-17.04.1.tar.xz";
     };
   };
   kbounce = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kbounce-17.04.0.tar.xz";
-      sha256 = "0jjmpmhqsjksvgxl92bh7xmh2wf1cz52fdk5vfa90mw08xi07d4n";
-      name = "kbounce-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kbounce-17.04.1.tar.xz";
+      sha256 = "0yjmh48x6gsrc6kplc8yii49cp9lwyafc48vmnhmjdda5akwiqvz";
+      name = "kbounce-17.04.1.tar.xz";
     };
   };
   kbreakout = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kbreakout-17.04.0.tar.xz";
-      sha256 = "0n206mxxbgkynw74sry7jfvyvspyc34vzs3xilny8xiks2g4zbjm";
-      name = "kbreakout-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kbreakout-17.04.1.tar.xz";
+      sha256 = "15avdlg6mnzanq7lpygwcsykzjh1w7k3niwkiw3d9x9mc80sbw9h";
+      name = "kbreakout-17.04.1.tar.xz";
     };
   };
   kbruch = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kbruch-17.04.0.tar.xz";
-      sha256 = "0i9pmir83js31kzwqdw9ka93lpgnb6gbrsi96djjqv7pj93gql32";
-      name = "kbruch-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kbruch-17.04.1.tar.xz";
+      sha256 = "1lj2sx6627a99yikz55wkr29mdjdywb5ipdimck8g5lfw125micw";
+      name = "kbruch-17.04.1.tar.xz";
     };
   };
   kcachegrind = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kcachegrind-17.04.0.tar.xz";
-      sha256 = "130m50lnkcqpr3c4icznlysnj9xnzy5viv95756fxnass44vi349";
-      name = "kcachegrind-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kcachegrind-17.04.1.tar.xz";
+      sha256 = "0y0qx773fjqfvrnp0625hcxhzs0f318580m92n09spgc71x5b9zf";
+      name = "kcachegrind-17.04.1.tar.xz";
     };
   };
   kcalc = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kcalc-17.04.0.tar.xz";
-      sha256 = "01cmcn20hbnaph2217wam0qf42mfvwqb9s3h467qk0y3pgq7syb4";
-      name = "kcalc-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kcalc-17.04.1.tar.xz";
+      sha256 = "1fsd3rspdjwf3q4rh76wpqp8aw3r0fiidjg5qhxm1w1gzsygmvvy";
+      name = "kcalc-17.04.1.tar.xz";
     };
   };
   kcalcore = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kcalcore-17.04.0.tar.xz";
-      sha256 = "0xmsh0fkmz0qrj4ali1d7n6jbxj0cl8s640fjvwd1sic5ib7pcj0";
-      name = "kcalcore-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kcalcore-17.04.1.tar.xz";
+      sha256 = "0bl4qykivavzyvcdd74s47p40bl4mghgyjd15hkarsg875h5867s";
+      name = "kcalcore-17.04.1.tar.xz";
     };
   };
   kcalutils = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kcalutils-17.04.0.tar.xz";
-      sha256 = "0if4c989a846aqcn7mc0blkxwrl3zk3w2jrrigdyaafrpb6k6jch";
-      name = "kcalutils-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kcalutils-17.04.1.tar.xz";
+      sha256 = "1xpq3kb4vwx71l4yxm2676rj7s1vv5vkp3c6swq42hpfyvv2h8iq";
+      name = "kcalutils-17.04.1.tar.xz";
     };
   };
   kcharselect = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kcharselect-17.04.0.tar.xz";
-      sha256 = "1fi6malyh357xwi8i456b6iksbx208mhsnhhl6bgwrvqpkd1h3h3";
-      name = "kcharselect-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kcharselect-17.04.1.tar.xz";
+      sha256 = "0q5zmqbhchj2j8l8a17n0sf59apmwg5pyac7n8wp1y9bamli51w1";
+      name = "kcharselect-17.04.1.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kcolorchooser-17.04.0.tar.xz";
-      sha256 = "1jc43ric98kwknalhh7nlh1zm28g12ygvaiv3jmrqw97rra86wa0";
-      name = "kcolorchooser-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kcolorchooser-17.04.1.tar.xz";
+      sha256 = "1l2f61f81kagfpxkpl5pka603j4f7qcx4sndzcqjbir6wa505h1d";
+      name = "kcolorchooser-17.04.1.tar.xz";
     };
   };
   kcontacts = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kcontacts-17.04.0.tar.xz";
-      sha256 = "165adk2a8vyqyszp3llwm24n5ngs5l4bhhym022zynq7fh8w1grh";
-      name = "kcontacts-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kcontacts-17.04.1.tar.xz";
+      sha256 = "0wcgqdkz2xil699jy7jmkywih7wc9p4b2z7xjbwwxb77dfvrk1gp";
+      name = "kcontacts-17.04.1.tar.xz";
     };
   };
   kcron = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kcron-17.04.0.tar.xz";
-      sha256 = "0v6w543ns1gyr2c0lxajdd969f669si93hadahx6d3vnqk8nqa70";
-      name = "kcron-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kcron-17.04.1.tar.xz";
+      sha256 = "1pvfsyqc73gswiwc8m5d6iiw1jsmjksybzqdqhc8c80ykdvg3iwq";
+      name = "kcron-17.04.1.tar.xz";
     };
   };
   kdav = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdav-17.04.0.tar.xz";
-      sha256 = "03nibqip9ryrb56hix5aq1lihp9w06c1hdzg505wjcnvwr7rd02c";
-      name = "kdav-17.04.0.tar.xz";
-    };
-  };
-  kde-dev-scripts = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-dev-scripts-17.04.0.tar.xz";
-      sha256 = "1s6k746hzsycwk7jb2i5blhfvg84flfgc79j1aa8kzpx4l31v3qz";
-      name = "kde-dev-scripts-17.04.0.tar.xz";
-    };
-  };
-  kde-dev-utils = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-dev-utils-17.04.0.tar.xz";
-      sha256 = "03dqxaqj36bgwnn2r3dcwgqfxrqf7i5lwqr1sp6rq2799dv135j2";
-      name = "kde-dev-utils-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-ar = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ar-17.04.0.tar.xz";
-      sha256 = "1yj46m2appxwjvabsb0c1inmfkfviwqg1dfh7kcyqbg3nb11kdj6";
-      name = "kde-l10n-ar-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-ast = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ast-17.04.0.tar.xz";
-      sha256 = "1pxbdd464ifvxcpk5nwfnqakggaq8648cpdksp9p68ybca33iwg0";
-      name = "kde-l10n-ast-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-bg = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-bg-17.04.0.tar.xz";
-      sha256 = "128pf72srr0gypyzs7vqgxphhxqy397aaj1m35bav87r80xvqgk1";
-      name = "kde-l10n-bg-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-bs = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-bs-17.04.0.tar.xz";
-      sha256 = "1k3j2ilafmzpzf5shqcjggr8j26kwjr33w1qvnxhssnsjc6adx9l";
-      name = "kde-l10n-bs-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-ca = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ca-17.04.0.tar.xz";
-      sha256 = "1zw3b967arp2vz86phj4n4y0mib6y2rqv5ak9jfxqmfpj03qlgf9";
-      name = "kde-l10n-ca-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-ca_valencia = {
-    version = "ca_valencia-17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ca@valencia-17.04.0.tar.xz";
-      sha256 = "0f36rz4nnvz0k97c4wrrhy3zr6njydvib2v10smph58zfqwd233d";
-      name = "kde-l10n-ca_valencia-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-cs = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-cs-17.04.0.tar.xz";
-      sha256 = "12280xwvpz3m43arc62s4w0bfc1p10fqfi9v0d90adsgmh0zffhs";
-      name = "kde-l10n-cs-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-da = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-da-17.04.0.tar.xz";
-      sha256 = "05icziwpysbyz7y8b6snpvf6cyrs2yzic0p1v2x1m2s392nwx0qp";
-      name = "kde-l10n-da-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-de = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-de-17.04.0.tar.xz";
-      sha256 = "18fi7a5z9lnjmqabaz6q4yxcrpkmb62ri6c0zf1bff57cwvn2wbd";
-      name = "kde-l10n-de-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-el = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-el-17.04.0.tar.xz";
-      sha256 = "04nqk6par22126y6v0c343ylwy2h0ylw03gjs0pp7a7cgq1lqh13";
-      name = "kde-l10n-el-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-en_GB = {
-    version = "en_GB-17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-en_GB-17.04.0.tar.xz";
-      sha256 = "0a0xwcvwv2sgjkzzy6wvyymm1l7b8xfk7lhiwh7bgm0il66shw98";
-      name = "kde-l10n-en_GB-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-eo = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-eo-17.04.0.tar.xz";
-      sha256 = "0cbf5qwh18yd4kadkn11mh86d9zhxkwm0gnivjmd62lrz41rxr92";
-      name = "kde-l10n-eo-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-es = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-es-17.04.0.tar.xz";
-      sha256 = "1xjjmia250w02wcw4jm7lsmixwd4qp2db5nxl1hql4ln1n2af9hk";
-      name = "kde-l10n-es-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-et = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-et-17.04.0.tar.xz";
-      sha256 = "1ivydzg39j0rv0y1vvkkh9429iyfx6mk44sswkg2gc9mccpwfa5s";
-      name = "kde-l10n-et-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-eu = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-eu-17.04.0.tar.xz";
-      sha256 = "0pkj8sghzyvp20qgd6ys8znri011scrlgkx32ky3q74gn5dr4k95";
-      name = "kde-l10n-eu-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-fa = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-fa-17.04.0.tar.xz";
-      sha256 = "1slmhm6rl691n60xw53f9s5ibn8b9h1sb7i0rc8s2mk9cs6zqs4i";
-      name = "kde-l10n-fa-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-fi = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-fi-17.04.0.tar.xz";
-      sha256 = "1yq7kiiqv4hhn7i14ccvh3nllv8i0xw9jv3z38r427gimi6d8p3d";
-      name = "kde-l10n-fi-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-fr = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-fr-17.04.0.tar.xz";
-      sha256 = "0v2i6f7yf58qzd69hcb0jz0x1j3w99702wiflfags7qyzbszgan2";
-      name = "kde-l10n-fr-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-ga = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ga-17.04.0.tar.xz";
-      sha256 = "0q9y1dqk9j1fgk6fc1fdg3g26896x47cnnmbdgf037plbr0b4j5b";
-      name = "kde-l10n-ga-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-gl = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-gl-17.04.0.tar.xz";
-      sha256 = "118p49vkdnmn707rf20gaycrrq3kb2qjqa9abq2ibfxdigwj20cy";
-      name = "kde-l10n-gl-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-he = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-he-17.04.0.tar.xz";
-      sha256 = "0ba1ccwkwqsdxlxfbq3fcjmbpww2sr9kx08j3nz453qdndfyp9md";
-      name = "kde-l10n-he-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-hi = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-hi-17.04.0.tar.xz";
-      sha256 = "0gy7c67b9glhp0x6l8jxycp8vsdkv77025wdf9kn5l8sy1hqqhbp";
-      name = "kde-l10n-hi-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-hr = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-hr-17.04.0.tar.xz";
-      sha256 = "063pppyl57i241dxr68wbvh8k3ccck5589mrn5yhdcw30b0hiwr7";
-      name = "kde-l10n-hr-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-hu = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-hu-17.04.0.tar.xz";
-      sha256 = "1b16xbdkh5varv650frnp9jsp8di6lnd61i04gaa3sxfy25xjzb2";
-      name = "kde-l10n-hu-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-ia = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ia-17.04.0.tar.xz";
-      sha256 = "0gmzk2cac5gfa6j0m2d7lbwpi9y1dkrlk37r7iqvvzmqdsx2nzsy";
-      name = "kde-l10n-ia-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-id = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-id-17.04.0.tar.xz";
-      sha256 = "1cdsapfq74600n2p49fzv8lflall755kyvkpi152clb7a66vmysc";
-      name = "kde-l10n-id-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-is = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-is-17.04.0.tar.xz";
-      sha256 = "0g9s9ywkhdnyh76lr7j73ba7ydsvh6ki6y0qcgvhzg9jnd4rywzb";
-      name = "kde-l10n-is-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-it = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-it-17.04.0.tar.xz";
-      sha256 = "0hhq5gvlzfhz270caqh6g5k1dp740cakamn46zli5586hpmpdk8d";
-      name = "kde-l10n-it-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-ja = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ja-17.04.0.tar.xz";
-      sha256 = "149zazsdm89q5shfxpg5xsd51l0xrq12w8pw4nnkwpbv6vqwsf8w";
-      name = "kde-l10n-ja-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-kk = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-kk-17.04.0.tar.xz";
-      sha256 = "1n4qfkj2h03x2b9d1q1zjkz7aiqqjvy9sci3scbqqd3apf80jgn9";
-      name = "kde-l10n-kk-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-km = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-km-17.04.0.tar.xz";
-      sha256 = "1bd0m5rkrvizvlr57wagixavk8c6449a8xl07j0hk12ha7c3livy";
-      name = "kde-l10n-km-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-ko = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ko-17.04.0.tar.xz";
-      sha256 = "10j0can8m0814jsch96f20625pr01ag8xqjyx4ridfssh8jry8s9";
-      name = "kde-l10n-ko-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-lt = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-lt-17.04.0.tar.xz";
-      sha256 = "0l7w027g66dczhr8242k0fqvzjpcqi2jmna0lv1d7281kmyc0h49";
-      name = "kde-l10n-lt-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-lv = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-lv-17.04.0.tar.xz";
-      sha256 = "0ykl7wpi7x5nwy6pdp0h3fpm8ycvc4r2q0p446rz63fmp0vmax2h";
-      name = "kde-l10n-lv-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-mr = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-mr-17.04.0.tar.xz";
-      sha256 = "0k4dkq744ak3w7mfx4x3skkpnp2lnvj5zqihchhp2w6ik2yq3wkd";
-      name = "kde-l10n-mr-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-nb = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-nb-17.04.0.tar.xz";
-      sha256 = "1fqxssd12cpg9vkf2kc6f3gbivqr9xf4p489r2j6s6di7zn1na96";
-      name = "kde-l10n-nb-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-nds = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-nds-17.04.0.tar.xz";
-      sha256 = "0xrzy8v3a7riznb9fpjbx9zc4h47n6vpm36rbjdm93z0k8ifvqll";
-      name = "kde-l10n-nds-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-nl = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-nl-17.04.0.tar.xz";
-      sha256 = "116kigy5agm3dpan5wk54j144fq1sf9i6njpqmjdjrgyylr6cska";
-      name = "kde-l10n-nl-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-nn = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-nn-17.04.0.tar.xz";
-      sha256 = "1i1jm30gyd1s6igv7bwckdrbzsrsahzi7ki0c9dpfhm85gv8i957";
-      name = "kde-l10n-nn-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-pa = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-pa-17.04.0.tar.xz";
-      sha256 = "15n37z6wglw315jd8hijbyf883kpcw5919zp4yr57srjsvkay85v";
-      name = "kde-l10n-pa-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-pl = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-pl-17.04.0.tar.xz";
-      sha256 = "0ncaln92v5ib34zl700a61gzlc5akik3ss7pi4rygvlggfcjv4s2";
-      name = "kde-l10n-pl-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-pt = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-pt-17.04.0.tar.xz";
-      sha256 = "1ha6zfv9750idpw93z6hlmlypk7pgfriirfvfwbag43664ywl96n";
-      name = "kde-l10n-pt-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-pt_BR = {
-    version = "pt_BR-17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-pt_BR-17.04.0.tar.xz";
-      sha256 = "0n16al9pivlz3s0ard79k88cank988107jbxmzsiyrbvlwfqih8a";
-      name = "kde-l10n-pt_BR-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-ro = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ro-17.04.0.tar.xz";
-      sha256 = "0g3svxknwdn6nsq8v3ml0p3m5lwlv34h3ikr8cdra5zigqjmgxmf";
-      name = "kde-l10n-ro-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-ru = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ru-17.04.0.tar.xz";
-      sha256 = "0f0pzvxacik48w3r1i7svfkn5dna9qmnz1cpci8sbcirpkw0xsp1";
-      name = "kde-l10n-ru-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-sk = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-sk-17.04.0.tar.xz";
-      sha256 = "0x3yx3hcq4ia4s0f9bv3sib6hvfws8r8b8rgsgikf6d0ghk0y5z1";
-      name = "kde-l10n-sk-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-sl = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-sl-17.04.0.tar.xz";
-      sha256 = "0gdj3710c6q6h6g5mnrslzg2qza2bnr78skiy8h3x7ihrmgyjmrl";
-      name = "kde-l10n-sl-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-sr = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-sr-17.04.0.tar.xz";
-      sha256 = "1si249lwy3ansacj33agxqs2vdrmyll6g2zk1754b34nr01arbq3";
-      name = "kde-l10n-sr-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-sv = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-sv-17.04.0.tar.xz";
-      sha256 = "1zh7ajp6f7vh098nbp501891cc68h1lwq8igzxzh2l0gd35rcpn4";
-      name = "kde-l10n-sv-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-tr = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-tr-17.04.0.tar.xz";
-      sha256 = "0w8s5wfkaz7p209dk9a2z38as3hif5lbwfjbx8342vp2sv3s9yy2";
-      name = "kde-l10n-tr-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-ug = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-ug-17.04.0.tar.xz";
-      sha256 = "00fswh5mfg7spdnqm3wfir5v0al91p8qd8cj7mb9jlmdm6ydd2wk";
-      name = "kde-l10n-ug-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-uk = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-uk-17.04.0.tar.xz";
-      sha256 = "0zxf372yn0nsdnpylq364h0c4g2rzxxs462lh9ixwja2m8p91wsi";
-      name = "kde-l10n-uk-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-wa = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-wa-17.04.0.tar.xz";
-      sha256 = "0p44q7mki01fq15y96qibw2hap9lfaya2480vjl4f7hdqw2xjfhh";
-      name = "kde-l10n-wa-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-zh_CN = {
-    version = "zh_CN-17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-zh_CN-17.04.0.tar.xz";
-      sha256 = "0a3kfdkp6d3fgil3s3rd0kjc7jnqzakr46683dd108shqzb26rcs";
-      name = "kde-l10n-zh_CN-17.04.0.tar.xz";
-    };
-  };
-  kde-l10n-zh_TW = {
-    version = "zh_TW-17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-l10n/kde-l10n-zh_TW-17.04.0.tar.xz";
-      sha256 = "0mdc8lqb5b99rkswallm5allcnp8i6xlsyv6q9k1n1jlyjkxl1xx";
-      name = "kde-l10n-zh_TW-17.04.0.tar.xz";
-    };
-  };
-  kde-runtime = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kde-runtime-17.04.0.tar.xz";
-      sha256 = "0phdmsmlqbadxi45n19hzkzfkkcazzlkxb0rxfr6c3jny2ncg5cn";
-      name = "kde-runtime-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdav-17.04.1.tar.xz";
+      sha256 = "06a5v505sdqh58vmgxq9pbqk1v773mlh2b9ikj8spc270y228frk";
+      name = "kdav-17.04.1.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdebugsettings-17.04.0.tar.xz";
-      sha256 = "140drnnv7573fvfs94kwk0kgqqkc5nrj8jkj3i3l6idikw0xi0qm";
-      name = "kdebugsettings-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdebugsettings-17.04.1.tar.xz";
+      sha256 = "1h9iswm306ipx5dk3f6d89dfj0g1819nxjkap03h0b4819xk653s";
+      name = "kdebugsettings-17.04.1.tar.xz";
+    };
+  };
+  kde-dev-scripts = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-dev-scripts-17.04.1.tar.xz";
+      sha256 = "0b5qkg27x61m487lrdp78zbgk11p6q5j7fcqxajfhyh05a007ybz";
+      name = "kde-dev-scripts-17.04.1.tar.xz";
+    };
+  };
+  kde-dev-utils = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-dev-utils-17.04.1.tar.xz";
+      sha256 = "1l441qha293yx45i7awsnzz0hzh20izrhzlm48biw787qqmd03mn";
+      name = "kde-dev-utils-17.04.1.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdeedu-data-17.04.0.tar.xz";
-      sha256 = "1khxi2z5qv0wrj7pn6r643829619bhymzzbdlgjr1zs5k244iajy";
-      name = "kdeedu-data-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdeedu-data-17.04.1.tar.xz";
+      sha256 = "012h97wkxqbk2yij4yirmd30gv92yixnhdn6zcmfps5m1ndjzj4v";
+      name = "kdeedu-data-17.04.1.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdegraphics-mobipocket-17.04.0.tar.xz";
-      sha256 = "0ja7a6p7ckw0zy6jffwm96vc5g33mqr722c77890173hsb45wy83";
-      name = "kdegraphics-mobipocket-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdegraphics-mobipocket-17.04.1.tar.xz";
+      sha256 = "1gmb7i7bckaa481lxadzm34bzda1qfbaz5a1hc37cihj8p2avlpl";
+      name = "kdegraphics-mobipocket-17.04.1.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdegraphics-thumbnailers-17.04.0.tar.xz";
-      sha256 = "0h2ydkcj1i35qhrmcva5977ib2127186q735xh2dg60fmdcyni14";
-      name = "kdegraphics-thumbnailers-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdegraphics-thumbnailers-17.04.1.tar.xz";
+      sha256 = "1mmkg73bg1jxr6l3idrkgq97csyahrlv7k1780jy0202x1avswda";
+      name = "kdegraphics-thumbnailers-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-ar = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ar-17.04.1.tar.xz";
+      sha256 = "1a3vssv88746dwwdwbnm4ydqxsmfj88g64cw7iarw77wchhx7g3v";
+      name = "kde-l10n-ar-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-ast = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ast-17.04.1.tar.xz";
+      sha256 = "06cxr26bwf7s4lcqs3v72ygn6ss3hlz150fz08qzxqlg5i8ddwql";
+      name = "kde-l10n-ast-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-bg = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-bg-17.04.1.tar.xz";
+      sha256 = "14d1609bdhavpmxkww3bainbd8sxg033d4ljnnfygysfz58dsgc9";
+      name = "kde-l10n-bg-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-bs = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-bs-17.04.1.tar.xz";
+      sha256 = "14a03pg5am75vcdgc6x0ig4rfy2yz46f47svdmhadlw5fx88h011";
+      name = "kde-l10n-bs-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-ca = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ca-17.04.1.tar.xz";
+      sha256 = "16r3pz3ksky7l02kpqy8c6a5w8qy4ilbx6ak43sf299a83mf5z0j";
+      name = "kde-l10n-ca-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-ca_valencia = {
+    version = "ca_valencia-17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ca@valencia-17.04.1.tar.xz";
+      sha256 = "04nrxwpi1zkpq6h6q1w7yjm4n98ymwvpscbzr0201hhf8lr1vrlf";
+      name = "kde-l10n-ca_valencia-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-cs = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-cs-17.04.1.tar.xz";
+      sha256 = "1nkhqhl9p5hliynlq3magcwcxkgg7x5wrfm80dxj9bivbq9sxi5c";
+      name = "kde-l10n-cs-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-da = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-da-17.04.1.tar.xz";
+      sha256 = "1wb6yb8d3wyz1zl0g6zfszd8k7svgazphghnc0fp97rngbjfdfmm";
+      name = "kde-l10n-da-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-de = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-de-17.04.1.tar.xz";
+      sha256 = "0nxkyky0rlsia80k6h91qh4fkdbdy4x9rbg01xw3cgcskj61198m";
+      name = "kde-l10n-de-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-el = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-el-17.04.1.tar.xz";
+      sha256 = "14vsbgp8mjzwwzcfmyadcdd6q26viqffzc7q25k9as1m3a5ibxsd";
+      name = "kde-l10n-el-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-en_GB = {
+    version = "en_GB-17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-en_GB-17.04.1.tar.xz";
+      sha256 = "08h7qzy22lbfn8rri7646fpy9ydchaw7xr59pccyck385ini7cbz";
+      name = "kde-l10n-en_GB-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-eo = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-eo-17.04.1.tar.xz";
+      sha256 = "1g487qr0yj2mi68zac9wj6bijrghb9id94yy1m6sdynjlwd27ik5";
+      name = "kde-l10n-eo-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-es = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-es-17.04.1.tar.xz";
+      sha256 = "00yx9mlym8icsjsl6fl6sd3na7wzk8912518a35q54sgp6kg3g57";
+      name = "kde-l10n-es-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-et = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-et-17.04.1.tar.xz";
+      sha256 = "0z5i3hsb24jigixvsk9byknnvia7xwqbwl94qfnvj6zfs4qw1aiv";
+      name = "kde-l10n-et-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-eu = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-eu-17.04.1.tar.xz";
+      sha256 = "00b04kwgv1d7r8vwyxq8lbb1fpf1vc1qbly0brx4vgimkir875nk";
+      name = "kde-l10n-eu-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-fa = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-fa-17.04.1.tar.xz";
+      sha256 = "06hsj30na3l5rmx1kknfca3qqzwp9378nragdsd4bjkcd7qgfcrr";
+      name = "kde-l10n-fa-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-fi = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-fi-17.04.1.tar.xz";
+      sha256 = "1jxzh32wzggr7757yz6l63pgzgdclq797ml75kfd252k08s4fmz1";
+      name = "kde-l10n-fi-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-fr = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-fr-17.04.1.tar.xz";
+      sha256 = "0wxrjwxjc78sr9s3s5fhm52q2igqhb3im7qfxsp9wnqrl2hib026";
+      name = "kde-l10n-fr-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-ga = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ga-17.04.1.tar.xz";
+      sha256 = "14zp828861bbfymvrkn6rmzcrd6lmy46pklaapwpvr49janmvwww";
+      name = "kde-l10n-ga-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-gl = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-gl-17.04.1.tar.xz";
+      sha256 = "1p76kw6x956p8jyvqfj2660n3qb71w07p47x4ad183zswq3i5rgd";
+      name = "kde-l10n-gl-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-he = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-he-17.04.1.tar.xz";
+      sha256 = "1sp8k3hw6c1mxglyh6gsa468cs9mf12fsmf033v5ccdmqslxv0cn";
+      name = "kde-l10n-he-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-hi = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-hi-17.04.1.tar.xz";
+      sha256 = "11dbisbgs309mr233x01qxmzqsm0xwsdvkbbkidl9cxfplgfmach";
+      name = "kde-l10n-hi-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-hr = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-hr-17.04.1.tar.xz";
+      sha256 = "1iizjqldw44dpsilb6x524d4xib6bb67rp9czjc0b3hkibjbjhzy";
+      name = "kde-l10n-hr-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-hu = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-hu-17.04.1.tar.xz";
+      sha256 = "0ab3p8q72vhxc2angfwyyvwxs9j5m47325d36vsmdvh8ny0hsx2b";
+      name = "kde-l10n-hu-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-ia = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ia-17.04.1.tar.xz";
+      sha256 = "1ss1vhg728qx4a4hbqjxbj8cqfajsxp2vifinax1ndhlyzrd8i63";
+      name = "kde-l10n-ia-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-id = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-id-17.04.1.tar.xz";
+      sha256 = "17v0dr8pcm23jd2wa8pppzmswn5l4gbnirrp2nczbr5ffpymiqlx";
+      name = "kde-l10n-id-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-is = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-is-17.04.1.tar.xz";
+      sha256 = "088ksp2z55w18yiknk4wz8mlfgnjgks3ncyc4qn8lh1p790ispv8";
+      name = "kde-l10n-is-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-it = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-it-17.04.1.tar.xz";
+      sha256 = "064b6gd391z0kwadr9lcn1kzshn1gzdhbkllsvqjhadz3r9p6fsj";
+      name = "kde-l10n-it-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-ja = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ja-17.04.1.tar.xz";
+      sha256 = "015y0a9r8h91j4g8ly4jc269pnw97iv1npczpn4jpqxd4b9gj3ag";
+      name = "kde-l10n-ja-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-kk = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-kk-17.04.1.tar.xz";
+      sha256 = "097ms01vx5ibrpdmcnshsg44vild3a8gkkh2lwkdcn2h1dm4f8dz";
+      name = "kde-l10n-kk-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-km = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-km-17.04.1.tar.xz";
+      sha256 = "01x46n9schmbsamickxdqmnq6prywpn1i7l1izqmicgbwrik4jy3";
+      name = "kde-l10n-km-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-ko = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ko-17.04.1.tar.xz";
+      sha256 = "1nfahnsrlvmf8mxjs0m6zs6sz3b5kv117sgz1c7cf1bb07qjldmg";
+      name = "kde-l10n-ko-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-lt = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-lt-17.04.1.tar.xz";
+      sha256 = "035nxx0psh77xv5mfiyjkfdz9m0pgk5ghbid4rrp8qhhw4zn9iq9";
+      name = "kde-l10n-lt-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-lv = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-lv-17.04.1.tar.xz";
+      sha256 = "150av9ah9xqkzsw2y555yh41y8gy3r494mx29fnwjvnc699yl7w2";
+      name = "kde-l10n-lv-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-mr = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-mr-17.04.1.tar.xz";
+      sha256 = "17zcfxpws1q1cw286xx2zzv3pykx4830lv44vpr7b9aqnkj8i2r4";
+      name = "kde-l10n-mr-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-nb = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nb-17.04.1.tar.xz";
+      sha256 = "1cgc6k22iazikvwsdj0jfssx0gajiz414bcq9fffpdzsxvjqjll3";
+      name = "kde-l10n-nb-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-nds = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nds-17.04.1.tar.xz";
+      sha256 = "0k4li1kzk728h9vqy3wzqxpwwmsk6qgl4dpp9q4drvb74iwjm0hs";
+      name = "kde-l10n-nds-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-nl = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nl-17.04.1.tar.xz";
+      sha256 = "0gbwg30lf5w5dvrxi3kzwbwwiglb0247pqybva5irvprw9vcnfsi";
+      name = "kde-l10n-nl-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-nn = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nn-17.04.1.tar.xz";
+      sha256 = "16chm04bi7bjjbw9d3w9ljj6cd21k29qmsy6d7sdnhqxda8lv74q";
+      name = "kde-l10n-nn-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-pa = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pa-17.04.1.tar.xz";
+      sha256 = "1hg1sz2jr2v1w4gal2zr4k4vbx6fidns1hdx04ain2qmm4qxi1yq";
+      name = "kde-l10n-pa-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-pl = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pl-17.04.1.tar.xz";
+      sha256 = "0j3nwkadncw2bqf06cznhy7n1zcksk1x11sq3yz3ykssplbf3gr7";
+      name = "kde-l10n-pl-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-pt = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pt-17.04.1.tar.xz";
+      sha256 = "183lwmdy5lq1picvvl1607xq8zj9lp5b9nc3lz93jswkd266707l";
+      name = "kde-l10n-pt-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-pt_BR = {
+    version = "pt_BR-17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pt_BR-17.04.1.tar.xz";
+      sha256 = "0sc6hr35ly9jxm8wqnw2y1y94xcyba74qfpr19pr53791bcnrdaw";
+      name = "kde-l10n-pt_BR-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-ro = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ro-17.04.1.tar.xz";
+      sha256 = "0v98kgm6x1anld8yqykkwf2c30y9qh8sr9nv6v3ipxrf02pz67g7";
+      name = "kde-l10n-ro-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-ru = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ru-17.04.1.tar.xz";
+      sha256 = "01cdgj50vz47pa4k25l6ykax9jfvjbg5gsc8cf5ibl5rp57fxxfc";
+      name = "kde-l10n-ru-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-sk = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sk-17.04.1.tar.xz";
+      sha256 = "1jq9rj8xb1z3992sakm47y95v0kyfx5535wn882kxx3ac18pyflh";
+      name = "kde-l10n-sk-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-sl = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sl-17.04.1.tar.xz";
+      sha256 = "0zpj50sf9vn9dkdrvf533wrlxivqxz1xdavkmasnjbpf6w910rr3";
+      name = "kde-l10n-sl-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-sr = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sr-17.04.1.tar.xz";
+      sha256 = "1r6i7qy19k4m13vrv6sysqb308kgaqqfbcszm2xw9dvlwcl0xsi8";
+      name = "kde-l10n-sr-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-sv = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sv-17.04.1.tar.xz";
+      sha256 = "0chpjchpcjk3jvrs9fgc48aw1j54nxp8q8p5z2p534c6ncwgqjh4";
+      name = "kde-l10n-sv-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-tr = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-tr-17.04.1.tar.xz";
+      sha256 = "0k3bsfjqkgqyk2vnzpzkp5m5006vbxgkxn5fahjybj4p206ry2j6";
+      name = "kde-l10n-tr-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-ug = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ug-17.04.1.tar.xz";
+      sha256 = "0dx9yv7680aqmbfqzmn2kv5kvfx4w776ihw3ag8z0m6acjzk7k4m";
+      name = "kde-l10n-ug-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-uk = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-uk-17.04.1.tar.xz";
+      sha256 = "1iq84dpsj49wb0qp37hykjfw391pffsrdjngv5jh5p6hiq1k6ajj";
+      name = "kde-l10n-uk-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-wa = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-wa-17.04.1.tar.xz";
+      sha256 = "02b2yvi3r014h2vya54p42lwwk75zxg2dqhs920mc4sydnbrc90s";
+      name = "kde-l10n-wa-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-zh_CN = {
+    version = "zh_CN-17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-zh_CN-17.04.1.tar.xz";
+      sha256 = "1bggh1p2ahcjnslcgrikdk0954xyqkls32w1ckmfp1ixc1g4bkxh";
+      name = "kde-l10n-zh_CN-17.04.1.tar.xz";
+    };
+  };
+  kde-l10n-zh_TW = {
+    version = "zh_TW-17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-zh_TW-17.04.1.tar.xz";
+      sha256 = "0c5h3q39hb3qbjcbh09gwiw2mqb2sd16jrb69r1xf0vxxmam5xvq";
+      name = "kde-l10n-zh_TW-17.04.1.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.31";
+    version = "4.14.32";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdelibs-4.14.31.tar.xz";
-      sha256 = "00ai1s0wz4nyg7fhj6g7cp3p5sz8rw676dv127bpbvm5yszlz561";
-      name = "kdelibs-4.14.31.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdelibs-4.14.32.tar.xz";
+      sha256 = "10xxhgs0k2k2qyw5gjrsqckg0bj2fc3wcskapmspq68wn9iyhcr1";
+      name = "kdelibs-4.14.32.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdenetwork-filesharing-17.04.0.tar.xz";
-      sha256 = "176n41xnz2v3wn62nip5sdv966g4rs15ah27zzr9cx32jrs52z4c";
-      name = "kdenetwork-filesharing-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdenetwork-filesharing-17.04.1.tar.xz";
+      sha256 = "14rnggp7dc99ac8gf83njw28ihw621dsawk361gf5b5x9kjcc8yx";
+      name = "kdenetwork-filesharing-17.04.1.tar.xz";
     };
   };
   kdenlive = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdenlive-17.04.0.tar.xz";
-      sha256 = "0kd93zxz5fch1ski9mbz2sbfda3spq9gsfgzvik2mzjwr994x574";
-      name = "kdenlive-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdenlive-17.04.1.tar.xz";
+      sha256 = "027d9azwg5mghj7a2v3z579vyp2vvzsp55crz19ansszsbapj70v";
+      name = "kdenlive-17.04.1.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdepim-addons-17.04.0.tar.xz";
-      sha256 = "01qyg9p6nh2n2hsmmjfyjcd80z6cfpw509zmgs608lmbm8hskzxd";
-      name = "kdepim-addons-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdepim-addons-17.04.1.tar.xz";
+      sha256 = "07s9sn012vscxabj4y5kvjg3qcjx4i8bzg9mxzvspkal1kq32nip";
+      name = "kdepim-addons-17.04.1.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdepim-apps-libs-17.04.0.tar.xz";
-      sha256 = "02igc1c8zykwf5yydmk0l1s4l3z3m5c90jlhyrqjkpmkwvnkrd3n";
-      name = "kdepim-apps-libs-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdepim-apps-libs-17.04.1.tar.xz";
+      sha256 = "17rsw0471398ramyp8n1xipxlkrcfxdbx3a1yf65r3d0bvayl542";
+      name = "kdepim-apps-libs-17.04.1.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdepim-runtime-17.04.0.tar.xz";
-      sha256 = "00cjlnqq029850n2ib1r5ylass8q1f71p24sqicbfcfyd6vksvdl";
-      name = "kdepim-runtime-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdepim-runtime-17.04.1.tar.xz";
+      sha256 = "07wjz79l02cnjk5jg5bw9ind0braypd9gssc18larhr8086h8722";
+      name = "kdepim-runtime-17.04.1.tar.xz";
+    };
+  };
+  kde-runtime = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/kde-runtime-17.04.1.tar.xz";
+      sha256 = "0rradnyh2mn3nk1z7xxda6dbh4jls7rblh2sz6rvr90cgr5iv80l";
+      name = "kde-runtime-17.04.1.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdesdk-kioslaves-17.04.0.tar.xz";
-      sha256 = "1rfj2zk34i7i3289n85b57szd4154zj6r4m7zyif2cc019ax5b0q";
-      name = "kdesdk-kioslaves-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdesdk-kioslaves-17.04.1.tar.xz";
+      sha256 = "09jc1nxrbmzylhp7367g9r38dww3i9q3q7vhy3piwgnhn5jyba8h";
+      name = "kdesdk-kioslaves-17.04.1.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdesdk-thumbnailers-17.04.0.tar.xz";
-      sha256 = "145rgk62c083g1nl7ssx9xalv0plsjdlyp4a7jqv83vqphcyd789";
-      name = "kdesdk-thumbnailers-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdesdk-thumbnailers-17.04.1.tar.xz";
+      sha256 = "0c6zg5cb3mg0qzpzrq8f885invqjdzcws50z21klbg2d4fvz2qx9";
+      name = "kdesdk-thumbnailers-17.04.1.tar.xz";
     };
   };
   kdf = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdf-17.04.0.tar.xz";
-      sha256 = "1bavp593622014ik1h066mdldlzlyq5f2rw93plsv5i2lpabdbfd";
-      name = "kdf-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdf-17.04.1.tar.xz";
+      sha256 = "1shb4zk27v5mr5v8iag9dw58g8x649pdvdbq1y7cnphg8xsgk3v6";
+      name = "kdf-17.04.1.tar.xz";
     };
   };
   kdialog = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdialog-17.04.0.tar.xz";
-      sha256 = "0vdlfnkm9949rjalmf8f9dc86jsha63lya0fgl34admrs8d530hb";
-      name = "kdialog-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdialog-17.04.1.tar.xz";
+      sha256 = "004wj2q0ljcbmzb1m3gmfaawb6b8pxsfzzw3bbcsm5qcniky8lap";
+      name = "kdialog-17.04.1.tar.xz";
     };
   };
   kdiamond = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kdiamond-17.04.0.tar.xz";
-      sha256 = "021mmygp28z7vvg2gjb4p781kcg33qj4lcz9vqvyh5qmv81qh93w";
-      name = "kdiamond-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kdiamond-17.04.1.tar.xz";
+      sha256 = "0dqvxxdimhr4ax3cpc3jx18p56rqc4jrfky5zw9h4zznn2f3g17n";
+      name = "kdiamond-17.04.1.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/keditbookmarks-17.04.0.tar.xz";
-      sha256 = "1daab64k5kk6krphi3k3rgprmql126bwykl8aaa93ls890xln3g8";
-      name = "keditbookmarks-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/keditbookmarks-17.04.1.tar.xz";
+      sha256 = "0h7h6czfjbjw24rs03xsbx7ygad85ymmsbz2sff2s3nwf7qpzdh1";
+      name = "keditbookmarks-17.04.1.tar.xz";
     };
   };
   kfilereplace = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kfilereplace-17.04.0.tar.xz";
-      sha256 = "0prc6v9kps1yjwccscm7skcapnzza53xh36pbdavhw81pag6wwsy";
-      name = "kfilereplace-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kfilereplace-17.04.1.tar.xz";
+      sha256 = "11qmxdv7pnsadk698223a8bcg4fsk7fyjcz39ms6g0wy5i8h3qc1";
+      name = "kfilereplace-17.04.1.tar.xz";
     };
   };
   kfind = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kfind-17.04.0.tar.xz";
-      sha256 = "08hlylw13frq7frjz4rvisr0001n44nkafh2ga84mvkvlgxl0602";
-      name = "kfind-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kfind-17.04.1.tar.xz";
+      sha256 = "0kic45g57fnbvszg8yk86v9wxb34xwljypnxga30i37hbr589cnn";
+      name = "kfind-17.04.1.tar.xz";
     };
   };
   kfloppy = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kfloppy-17.04.0.tar.xz";
-      sha256 = "1di15ri8y3qinr40j83hrvfc1h3y8pan0mbfin1jdm4vwgjwgrqn";
-      name = "kfloppy-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kfloppy-17.04.1.tar.xz";
+      sha256 = "1faxviqz8shmh2msphglrc77h6srj0055qgsbms9cikp2pk1lybb";
+      name = "kfloppy-17.04.1.tar.xz";
     };
   };
   kfourinline = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kfourinline-17.04.0.tar.xz";
-      sha256 = "119jrs63dfbdpq7a3ng0fy0dri1jw7dbaz6n5hyz6ihzizsr9nm2";
-      name = "kfourinline-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kfourinline-17.04.1.tar.xz";
+      sha256 = "1gh2d883vicpp19ag4yk7n82w2mi25sxw4kl46kk070dj8k1448x";
+      name = "kfourinline-17.04.1.tar.xz";
     };
   };
   kgeography = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kgeography-17.04.0.tar.xz";
-      sha256 = "17kwpv352aiacghacjp0bz1ak19jh52300nmjhlj8ysl57q48n3z";
-      name = "kgeography-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kgeography-17.04.1.tar.xz";
+      sha256 = "0hifb15fnvmj0w9119v66cybf0971r4s88yfa6b3rq4nc6m59zal";
+      name = "kgeography-17.04.1.tar.xz";
     };
   };
   kget = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kget-17.04.0.tar.xz";
-      sha256 = "093mrv9c699s8jwrf4lxfg78ajiqhlpbi7swpgmhk2545wg1ngn7";
-      name = "kget-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kget-17.04.1.tar.xz";
+      sha256 = "11sxrq6fpx30xfn3z8yi6isa7i2fbx36bfcphmwy0nq9xalzmwf3";
+      name = "kget-17.04.1.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kgoldrunner-17.04.0.tar.xz";
-      sha256 = "1in4ddlrn1lnjdgww4saa7is6v8lj33n31bmrf2f6hmq7sg3i6h9";
-      name = "kgoldrunner-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kgoldrunner-17.04.1.tar.xz";
+      sha256 = "1hnz1nkv3m4127vk15wvp2rcy02by7ps87pmm7yjg3lwz9fgxr64";
+      name = "kgoldrunner-17.04.1.tar.xz";
     };
   };
   kgpg = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kgpg-17.04.0.tar.xz";
-      sha256 = "1i9pyz35pzn5p3p4mvkxwxfrmmpmf7ngpj83m28zxcj654dfcl6x";
-      name = "kgpg-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kgpg-17.04.1.tar.xz";
+      sha256 = "1gdfrrk724kr5jpwpf5q7sqyqqig0rq7bzp0r2nknq42p29ssd79";
+      name = "kgpg-17.04.1.tar.xz";
     };
   };
   khangman = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/khangman-17.04.0.tar.xz";
-      sha256 = "14ddaqvhmlwwb85bl5hi0r0m61akx38aabzrs9ys045z64si8b9d";
-      name = "khangman-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/khangman-17.04.1.tar.xz";
+      sha256 = "12dxbj07qk5zqfw6x6prb7kap9vk8h1q5a0n7k81a0vsp5qqqpqr";
+      name = "khangman-17.04.1.tar.xz";
     };
   };
   khelpcenter = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/khelpcenter-17.04.0.tar.xz";
-      sha256 = "10x8c18vbwg7j6nfrrl7c0wj9x882ijv33mfnrhj0vpdc2bnkkxn";
-      name = "khelpcenter-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/khelpcenter-17.04.1.tar.xz";
+      sha256 = "1h6sl83dcycpi8k5mv2q8dgqf73kgpbkbr5l1if4znicsy7k52a5";
+      name = "khelpcenter-17.04.1.tar.xz";
     };
   };
   kholidays = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kholidays-17.04.0.tar.xz";
-      sha256 = "0k0dm17bvr9snxmc87gicizpqqdsr95gxypnhgyiwc0mz90l5qb7";
-      name = "kholidays-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kholidays-17.04.1.tar.xz";
+      sha256 = "09j7594yd54pz187qg4lxm82jf9043nk79y4s9x7xgz708wvy911";
+      name = "kholidays-17.04.1.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kidentitymanagement-17.04.0.tar.xz";
-      sha256 = "1vrmj0ch1zg8hh1qqjv0i7fys5nrw3g6rj5sns6ghi0kswlskwfw";
-      name = "kidentitymanagement-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kidentitymanagement-17.04.1.tar.xz";
+      sha256 = "15mbd1a7ix028r3my22r34f5i2q31wq39zqlbf5hr0vq9kh0a10w";
+      name = "kidentitymanagement-17.04.1.tar.xz";
     };
   };
   kig = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kig-17.04.0.tar.xz";
-      sha256 = "0bx4vzg5x4lp7k49i5a55ka1c60iy3d1xjlrcx0gjx2bj35k6893";
-      name = "kig-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kig-17.04.1.tar.xz";
+      sha256 = "1rxdqdgy93l0j37ycqlhm6cnjmy8jrvyhj85hw14b083nbrng7hj";
+      name = "kig-17.04.1.tar.xz";
     };
   };
   kigo = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kigo-17.04.0.tar.xz";
-      sha256 = "1vi07v5nnwxpm04hxspxadf0qw7qka7pajggn54frc37hq5ibxia";
-      name = "kigo-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kigo-17.04.1.tar.xz";
+      sha256 = "0ghpnngpgqcbsh2n9sh9vnglig5zcwcwksfad8kwivs72ks5989j";
+      name = "kigo-17.04.1.tar.xz";
     };
   };
   killbots = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/killbots-17.04.0.tar.xz";
-      sha256 = "0ccl1249x7lpkm6hpani1fyvdgs0dqlxd250f9hm7k6j8b6jwg01";
-      name = "killbots-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/killbots-17.04.1.tar.xz";
+      sha256 = "1kbh25hzzgdbcn29wxa3pj4fnw0zxvnvxjn1ivfr7srqfhdqcpq7";
+      name = "killbots-17.04.1.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kimagemapeditor-17.04.0.tar.xz";
-      sha256 = "1n828j0sqvas9c3iqmbj3jl8bmhyw7bqj3s6zf0qifjdxvlxpwaq";
-      name = "kimagemapeditor-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kimagemapeditor-17.04.1.tar.xz";
+      sha256 = "1q54zrmsjmrsmlinagzg8szbwp6mw9vbwx60fhmnrsbshp85mldv";
+      name = "kimagemapeditor-17.04.1.tar.xz";
     };
   };
   kimap = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kimap-17.04.0.tar.xz";
-      sha256 = "1xgaixdplpycsdd2w09liy1vxp0lx5p2n6bmbds5dq887dwmj73i";
-      name = "kimap-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kimap-17.04.1.tar.xz";
+      sha256 = "1wd445s14kl2lk7f3fk2pn0qdwy3pahmc7izzxh66jrrvbwg34jn";
+      name = "kimap-17.04.1.tar.xz";
     };
   };
   kio-extras = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kio-extras-17.04.0.tar.xz";
-      sha256 = "1kvah1qg98zlsps5qv6by7ic1mjmnhk6xs2041cf143k0kifrsi9";
-      name = "kio-extras-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kio-extras-17.04.1.tar.xz";
+      sha256 = "14gw6wrhbc7lw8pjdv9z38spnciw24566b6flzbbkx29vl9m8rdq";
+      name = "kio-extras-17.04.1.tar.xz";
     };
   };
   kiriki = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kiriki-17.04.0.tar.xz";
-      sha256 = "1xmvamriklxhs9bwv75z2668by0w8nx95hb4l56z9yck5f7dlh6m";
-      name = "kiriki-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kiriki-17.04.1.tar.xz";
+      sha256 = "033g2v76ryjzsyv6scv4j5k7b9wdszycsw4zxdlp6zslbmsfi1lr";
+      name = "kiriki-17.04.1.tar.xz";
     };
   };
   kiten = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kiten-17.04.0.tar.xz";
-      sha256 = "1h6cxp4qpzgdd67s05zr403mk5jswzz7sk38j78fapmfc9hwz7gh";
-      name = "kiten-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kiten-17.04.1.tar.xz";
+      sha256 = "10xc1zmyq0byzvpaqk3k5mrs54d7rcixsb5x8ga1axhya25n2nbi";
+      name = "kiten-17.04.1.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kjumpingcube-17.04.0.tar.xz";
-      sha256 = "1las1sb01zm2vdr77fvsz3spjpjnv5fjhvdah17l4rlgdww2kqwc";
-      name = "kjumpingcube-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kjumpingcube-17.04.1.tar.xz";
+      sha256 = "1qvkwdnpq50waycizdp0m91ypydsh2718shz8dk586ka314jhw17";
+      name = "kjumpingcube-17.04.1.tar.xz";
     };
   };
   kldap = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kldap-17.04.0.tar.xz";
-      sha256 = "0b19si2nx7mimxxsdr1vp4bh3zr8ddz5k7217fa5wg190143zi9b";
-      name = "kldap-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kldap-17.04.1.tar.xz";
+      sha256 = "13dnbxz57idslqsawgkrf4qahipdxi3hl8lzzzh6342dmy7pfm2s";
+      name = "kldap-17.04.1.tar.xz";
     };
   };
   kleopatra = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kleopatra-17.04.0.tar.xz";
-      sha256 = "1l823l9wlqqzkcycqzfca6l3yfpr70a76786mvajswnkwasgfwyc";
-      name = "kleopatra-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kleopatra-17.04.1.tar.xz";
+      sha256 = "1s6fwlpq4ljhfr0kxdvzzgqp78sq4rh9wr9xz68xrq76i6r71zkh";
+      name = "kleopatra-17.04.1.tar.xz";
     };
   };
   klettres = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/klettres-17.04.0.tar.xz";
-      sha256 = "0liaym1cnnysmpd3bj3ss2bgrds9xh0f0i631vpj8z3n6pdm70s9";
-      name = "klettres-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/klettres-17.04.1.tar.xz";
+      sha256 = "0ai4hlc8fd1r82mn2qws3dbm6wm6rc9cwbni74ahbv6y7qdlsn8x";
+      name = "klettres-17.04.1.tar.xz";
     };
   };
   klickety = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/klickety-17.04.0.tar.xz";
-      sha256 = "15rjg09xa48082va8gxz51d3wacmfivla7bhmqdcgddagkmjy9cd";
-      name = "klickety-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/klickety-17.04.1.tar.xz";
+      sha256 = "1y1nlg1hmr0020qx605r71q9b7q6nmrifacw66bh52yvscrjh8bk";
+      name = "klickety-17.04.1.tar.xz";
     };
   };
   klines = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/klines-17.04.0.tar.xz";
-      sha256 = "0ix039d89mjm581zx1fchhj0vmjwx3da1l3indprh62664v2ihwb";
-      name = "klines-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/klines-17.04.1.tar.xz";
+      sha256 = "0dnvm0xmj6n3g23fcabmqnh6qjszv12yjq7pmhg0zy7bmf6rvg5g";
+      name = "klines-17.04.1.tar.xz";
     };
   };
   klinkstatus = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/klinkstatus-17.04.0.tar.xz";
-      sha256 = "102djlmp8dcha1p5iacrnyjgjp1w4qi5sf04lnlq43j2k2qhvr0r";
-      name = "klinkstatus-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/klinkstatus-17.04.1.tar.xz";
+      sha256 = "06qhkc7hm79fda2a5afl4b8dqck8m56yqcajpn679324847qg4hx";
+      name = "klinkstatus-17.04.1.tar.xz";
     };
   };
   kmag = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kmag-17.04.0.tar.xz";
-      sha256 = "1jfs9n880yva5vi36gc25kz4d6vy7djpa05nm2niga03gbv0r0lx";
-      name = "kmag-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kmag-17.04.1.tar.xz";
+      sha256 = "1aqfm6nsanzym2n20spkkm21mrvjmnnb8mysv9ll6zg32qpbyyak";
+      name = "kmag-17.04.1.tar.xz";
     };
   };
   kmahjongg = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kmahjongg-17.04.0.tar.xz";
-      sha256 = "1k9rmcdlrybxnccdh0w5ggy4p41l19ccv3hsc2ph0aj9cxh9svac";
-      name = "kmahjongg-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kmahjongg-17.04.1.tar.xz";
+      sha256 = "0wgrx88alkk3w3hm4dv3rv0nv06zhxq5v35ywrd2xjhlnfp8aqbi";
+      name = "kmahjongg-17.04.1.tar.xz";
     };
   };
   kmail = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kmail-17.04.0.tar.xz";
-      sha256 = "04cfdjsy2gnwkcjhq0ikws68rpr65ycycdnwzrvskg4whmp5h01a";
-      name = "kmail-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kmail-17.04.1.tar.xz";
+      sha256 = "0jfs12k2kf3rxliq0v1hl622vgz8as5zw0qpp8k063m26x54ymb4";
+      name = "kmail-17.04.1.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kmail-account-wizard-17.04.0.tar.xz";
-      sha256 = "03c5gg980r18rjwsdkgclyw2qd3l1vc7grwdbfm2kib5fqk61gd3";
-      name = "kmail-account-wizard-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kmail-account-wizard-17.04.1.tar.xz";
+      sha256 = "0h0716cmpcymi47xqdpg2bm6ggz57vzlfahjpr6apcxmxv1fg812";
+      name = "kmail-account-wizard-17.04.1.tar.xz";
     };
   };
   kmailtransport = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kmailtransport-17.04.0.tar.xz";
-      sha256 = "0683lrmadw51h1q345lsdy888dynph06ani54awx60qdc1crnx7j";
-      name = "kmailtransport-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kmailtransport-17.04.1.tar.xz";
+      sha256 = "193azi5n134kicpwa08g2vkcwjcnjhsb4dl8fwk99wyvnjd2b79j";
+      name = "kmailtransport-17.04.1.tar.xz";
     };
   };
   kmbox = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kmbox-17.04.0.tar.xz";
-      sha256 = "001f32yrxhavrk2plyyl05ny6gcazj6a9h51gv0fc5mb850w1ryq";
-      name = "kmbox-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kmbox-17.04.1.tar.xz";
+      sha256 = "16fq3m8m2wqa9xzfxggsq9r5jggax27nxlw6dn0ryg7fcbn1bdr7";
+      name = "kmbox-17.04.1.tar.xz";
     };
   };
   kmime = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kmime-17.04.0.tar.xz";
-      sha256 = "1bywzanv82xpxscxpgxfj0bivx9l6vwlspgdbvzh3nnhjv2g41qp";
-      name = "kmime-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kmime-17.04.1.tar.xz";
+      sha256 = "0blskiiiihnkyn353iajlfydqsqk01b2yvmz1hf4v2219f2cgyr8";
+      name = "kmime-17.04.1.tar.xz";
     };
   };
   kmines = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kmines-17.04.0.tar.xz";
-      sha256 = "101midljjq8ws7l3n6a8kym13n6c64xyhzv1d6py35cawyg3zfpv";
-      name = "kmines-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kmines-17.04.1.tar.xz";
+      sha256 = "1wwk8phpljccqdiyzr6156pc5a86zbag1x20r7jkzv4q1r8mm3mn";
+      name = "kmines-17.04.1.tar.xz";
     };
   };
   kmix = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kmix-17.04.0.tar.xz";
-      sha256 = "0qyml01rmf5p4qlwi7y96lc6hjdy70xbq6z4pwyy0rpk254jz754";
-      name = "kmix-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kmix-17.04.1.tar.xz";
+      sha256 = "1zkzcmd8x76ijnhbnam3pd0dbb41m5s0g6j39f1hk37bp5d4l2md";
+      name = "kmix-17.04.1.tar.xz";
     };
   };
   kmousetool = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kmousetool-17.04.0.tar.xz";
-      sha256 = "0chybr31ag087zfq47f8scvlzli2yf8l18gq965b2nl7vnz7kr0s";
-      name = "kmousetool-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kmousetool-17.04.1.tar.xz";
+      sha256 = "1g17jhwwqfzf8d73c4bj22c4z83v147n3x97y5yr8ybj2yfw2fpa";
+      name = "kmousetool-17.04.1.tar.xz";
     };
   };
   kmouth = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kmouth-17.04.0.tar.xz";
-      sha256 = "0k05g7rhcbl7mq4sv05c8kghmrm5cpdhj46vvmz5alqdik5g06xd";
-      name = "kmouth-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kmouth-17.04.1.tar.xz";
+      sha256 = "1k4k3n2127qr1bldvvqfxii3qk61z49jnyn3660q8xy7d2hlgrhn";
+      name = "kmouth-17.04.1.tar.xz";
     };
   };
   kmplot = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kmplot-17.04.0.tar.xz";
-      sha256 = "1n3skmyrmhl8p0kypm0wfvm8whw8fhq5byv1hjj0xdpwdv9r7n1j";
-      name = "kmplot-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kmplot-17.04.1.tar.xz";
+      sha256 = "10iqlm72i69wg6m1zx64bqijpvfvg9gg4f91ais5raacw4fzxz66";
+      name = "kmplot-17.04.1.tar.xz";
     };
   };
   knavalbattle = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/knavalbattle-17.04.0.tar.xz";
-      sha256 = "0m3y39lfngbc9ddnh2cifhc6qh4i1vlz983mhyz1psgamvy71djx";
-      name = "knavalbattle-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/knavalbattle-17.04.1.tar.xz";
+      sha256 = "1j0ivzjxi15yxv2nsbnypp7i3vq4c71n0rra7nr2mds29n33vrw3";
+      name = "knavalbattle-17.04.1.tar.xz";
     };
   };
   knetwalk = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/knetwalk-17.04.0.tar.xz";
-      sha256 = "1z5brajv2kq4c617zyphcpk5as2dibb14h9l8vym9v1j3k59jqsh";
-      name = "knetwalk-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/knetwalk-17.04.1.tar.xz";
+      sha256 = "0m0ywdh6hyl06cypq0ql4pzxrwpwcpzdd1q54a02z7vhz3pg4y7i";
+      name = "knetwalk-17.04.1.tar.xz";
     };
   };
   knotes = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/knotes-17.04.0.tar.xz";
-      sha256 = "051y5ghrjs87xhdw7mih4gmbp93s23vicpsnmawi98hcbqh16n6c";
-      name = "knotes-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/knotes-17.04.1.tar.xz";
+      sha256 = "1iv7r1ick6m3692l0p3hjval4g5swbg55ac3mrp5nxxczwl2m9h1";
+      name = "knotes-17.04.1.tar.xz";
     };
   };
   kolf = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kolf-17.04.0.tar.xz";
-      sha256 = "1rvvy52avlpbdgvd7qbw73kfarn77h7ka9gny6q3xsy0knhgxy3a";
-      name = "kolf-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kolf-17.04.1.tar.xz";
+      sha256 = "0g6j8irmbs7j2h4bdjixqxl25wbk672cdlfj0r6icv7s43cbkm61";
+      name = "kolf-17.04.1.tar.xz";
     };
   };
   kollision = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kollision-17.04.0.tar.xz";
-      sha256 = "18k88jj9vyplh3lffw86pjwy0w568ddf17xza1spam3xpmlh9fix";
-      name = "kollision-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kollision-17.04.1.tar.xz";
+      sha256 = "0h50dg4ch7ll8naz3ivvlwn4bk686322064ycggbb77nqny9pjlx";
+      name = "kollision-17.04.1.tar.xz";
     };
   };
   kolourpaint = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kolourpaint-17.04.0.tar.xz";
-      sha256 = "1qmwpx0ql3nl5wnbh21dfw369cb76ll7n55w6pfja8izljic67xh";
-      name = "kolourpaint-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kolourpaint-17.04.1.tar.xz";
+      sha256 = "1mzp0v5l4y45zdb4y4qwy6blnv3ndw009dcsgaylzb4vx7d39j3f";
+      name = "kolourpaint-17.04.1.tar.xz";
     };
   };
   kompare = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kompare-17.04.0.tar.xz";
-      sha256 = "06ix1x7hvryqnysg256z2b0igjqaqya33mm24p9sw75misi7ay6f";
-      name = "kompare-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kompare-17.04.1.tar.xz";
+      sha256 = "1y19xx5sgnl8p5kvpyqcrgji8ccrkj0m24lbli3scqwngqvv4qj9";
+      name = "kompare-17.04.1.tar.xz";
     };
   };
   konqueror = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/konqueror-17.04.0.tar.xz";
-      sha256 = "0crqcnqk4bl6wg6izs34b6dgdh19rsnid0dpcsdminfglj6kb9lm";
-      name = "konqueror-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/konqueror-17.04.1.tar.xz";
+      sha256 = "12i82amdi9lpq1iwbmzq975190vssl99bw76mbf285r2bk3w0m5c";
+      name = "konqueror-17.04.1.tar.xz";
     };
   };
   konquest = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/konquest-17.04.0.tar.xz";
-      sha256 = "0fgmh3z012k710c098bp02dj5v2gcmfp1dg29257zglk7qkvaa0b";
-      name = "konquest-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/konquest-17.04.1.tar.xz";
+      sha256 = "08r3kanqhvfkfr7mk9c5xdlcag6knmqhbldvxj5f6ikf3al61n7g";
+      name = "konquest-17.04.1.tar.xz";
     };
   };
   konsole = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/konsole-17.04.0.tar.xz";
-      sha256 = "01iasaiabqnr8fsjyl250h2ha0l788gx58xizafzj2q649ijbj4h";
-      name = "konsole-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/konsole-17.04.1.tar.xz";
+      sha256 = "0km8w0mjzywpzz7qq7fchm0s9q2pzrq72wsqsc5gbd1ip5wlgcmk";
+      name = "konsole-17.04.1.tar.xz";
     };
   };
   kontact = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kontact-17.04.0.tar.xz";
-      sha256 = "0i2k3ay7n92sd8gxhqy4ld8g9qzpwy9rxzm3qj70r4v0byw8a176";
-      name = "kontact-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kontact-17.04.1.tar.xz";
+      sha256 = "1ik4qib3wsqw5vwnd794w3jig9zngsv3ss9jdlkw0y4q5695wrxi";
+      name = "kontact-17.04.1.tar.xz";
     };
   };
   kontactinterface = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kontactinterface-17.04.0.tar.xz";
-      sha256 = "15dd5mfgrqayfs522wj4c5lhvfv474whv7r5zimi9ngp0n4zwjl6";
-      name = "kontactinterface-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kontactinterface-17.04.1.tar.xz";
+      sha256 = "1yb3dmfhsgm2pmbha3q22lzpfgj63d6qhanrwpmc2zy67r7r26ap";
+      name = "kontactinterface-17.04.1.tar.xz";
     };
   };
   kopete = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kopete-17.04.0.tar.xz";
-      sha256 = "1wdk5i7vj5ssw65majvl0h7sn9h5npdb3v81m0qbp4m94zlv7njh";
-      name = "kopete-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kopete-17.04.1.tar.xz";
+      sha256 = "1cv9fg4jr88w60ajgnbfhbvlylvxbv6r4j01sqmljwn8gsgbhpyi";
+      name = "kopete-17.04.1.tar.xz";
     };
   };
   korganizer = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/korganizer-17.04.0.tar.xz";
-      sha256 = "13mdxsvimlp0rvi2by1vg4aqmpamwszy35qi4wrynnq3ndn3cd1s";
-      name = "korganizer-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/korganizer-17.04.1.tar.xz";
+      sha256 = "1dlv5gcv4ic7np4raxirgjcrlvmqkzmblhws1v0hwy49dximic88";
+      name = "korganizer-17.04.1.tar.xz";
     };
   };
   kpat = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kpat-17.04.0.tar.xz";
-      sha256 = "0597z2pzxplcjsynkw9igs24fbsrj317xgyc0rmkgciilv0w69vy";
-      name = "kpat-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kpat-17.04.1.tar.xz";
+      sha256 = "15sxp8f7cr91s1iczqqnh92zsj027r67hq8a6sgkrkvsb5f3j9a8";
+      name = "kpat-17.04.1.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kpimtextedit-17.04.0.tar.xz";
-      sha256 = "1050kc0d81kgqh6w44nahaddgpw1big2gwyxzdyvrvipkiipp42i";
-      name = "kpimtextedit-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kpimtextedit-17.04.1.tar.xz";
+      sha256 = "1lazicp6a2j9pj4sh0q8cnd6k9imcr8j0l9y7ix3gad3mfh9m0y4";
+      name = "kpimtextedit-17.04.1.tar.xz";
     };
   };
   kppp = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kppp-17.04.0.tar.xz";
-      sha256 = "1kiwc8rgh6vnvkpqsw2pz4cflwnsv0j86b8idkap6zh9vbajyln1";
-      name = "kppp-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kppp-17.04.1.tar.xz";
+      sha256 = "1wqam64c2gmmf1ckwwyhaf7n8sqzn7liy5jx0dr4icppxpprc6ki";
+      name = "kppp-17.04.1.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kqtquickcharts-17.04.0.tar.xz";
-      sha256 = "0sq4xs4ispb50wcyibwln1d8vlh698d0pw408z8gzwvr384gf2bk";
-      name = "kqtquickcharts-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kqtquickcharts-17.04.1.tar.xz";
+      sha256 = "10bmkwq58yqkhchgz59gi3x8lb4lr8rhpwji3jysz3sfkvz765pi";
+      name = "kqtquickcharts-17.04.1.tar.xz";
     };
   };
   krdc = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/krdc-17.04.0.tar.xz";
-      sha256 = "1ryzk0k8xm9ych562qapjwawnljxz834vvwcnx2kv1n7gilqkdqh";
-      name = "krdc-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/krdc-17.04.1.tar.xz";
+      sha256 = "0d5m8sizvjn6pbn63686vhfkh1cklxwjlphs2zrg0yaa00c71k2f";
+      name = "krdc-17.04.1.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kremotecontrol-17.04.0.tar.xz";
-      sha256 = "07w5fpwp4rjm8sdf6wadsf82a4f2igav8yb9m04pj70mymqhr4nn";
-      name = "kremotecontrol-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kremotecontrol-17.04.1.tar.xz";
+      sha256 = "1855hsz5cndc26g7x0rw2k2mdvix80bi251dh5gz92w5d3jms9mz";
+      name = "kremotecontrol-17.04.1.tar.xz";
     };
   };
   kreversi = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kreversi-17.04.0.tar.xz";
-      sha256 = "075nmgnxlw2h743zj748xr6xdfj7w05ndyi85yfarpls5qf1qrz3";
-      name = "kreversi-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kreversi-17.04.1.tar.xz";
+      sha256 = "1x99b5q03vhxxr3xy2qxh6rglcz3qld62s29bnykpbzl2h2wdy63";
+      name = "kreversi-17.04.1.tar.xz";
     };
   };
   krfb = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/krfb-17.04.0.tar.xz";
-      sha256 = "11kavv3h0pvwqd0y6xxb08bliclszqh7ijvjgzazqhvwnd5pmsby";
-      name = "krfb-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/krfb-17.04.1.tar.xz";
+      sha256 = "115jrbf4nfdyks90gf1lmz7fl3cj07kqn0pg8mq1dhrv8vh4v6ys";
+      name = "krfb-17.04.1.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kross-interpreters-17.04.0.tar.xz";
-      sha256 = "17wgckmz17zrc7cbjl9zif1x8nq31551hsl8psnj1wpb78pv1b56";
-      name = "kross-interpreters-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kross-interpreters-17.04.1.tar.xz";
+      sha256 = "0mnfj0rjy6lv5ps6rmxr2ci16bsialpinnr7imh493rxhpnkaqa3";
+      name = "kross-interpreters-17.04.1.tar.xz";
     };
   };
   kruler = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kruler-17.04.0.tar.xz";
-      sha256 = "1rkhrzn54l8bhd37gyc3l27frxgxlyh28cq73p7id87qa62wcya9";
-      name = "kruler-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kruler-17.04.1.tar.xz";
+      sha256 = "1dc4n8awj5hj8z843a4x10ijx4p5y5v1w26zvw5mfixznv3csry4";
+      name = "kruler-17.04.1.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ksaneplugin-17.04.0.tar.xz";
-      sha256 = "10w92awf66q8mg796pva6hrx8cjzhimg70bqldb4fb3nni5figrn";
-      name = "ksaneplugin-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ksaneplugin-17.04.1.tar.xz";
+      sha256 = "1b35jksdyvqaqchdgixx7arbgwd9p6wpsqgvs3br4za4z2mccrvw";
+      name = "ksaneplugin-17.04.1.tar.xz";
     };
   };
   kscd = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kscd-17.04.0.tar.xz";
-      sha256 = "0lrdjawim18bzd2z9328gdqrjklrkr6wlx3jlmh5bd8iw52akdxa";
-      name = "kscd-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kscd-17.04.1.tar.xz";
+      sha256 = "18mdkkwr843kpb1hf45lvmmbl9m5nyzxx6i1yd3nllcja8ybdx0j";
+      name = "kscd-17.04.1.tar.xz";
     };
   };
   kshisen = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kshisen-17.04.0.tar.xz";
-      sha256 = "1l4f1akiagz4yhyxvvk14papnim8jfvikypkbsw3bqy1qbxbph93";
-      name = "kshisen-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kshisen-17.04.1.tar.xz";
+      sha256 = "0xpnn1hg73lmb1zhdzdq4wj99fmyn085n3kggqzb8w2mspl431r7";
+      name = "kshisen-17.04.1.tar.xz";
     };
   };
   ksirk = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ksirk-17.04.0.tar.xz";
-      sha256 = "0ifqyf6plgq0n60llncc1ipdnlqhwcr3ml86k3kch5w2gmypzyj0";
-      name = "ksirk-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ksirk-17.04.1.tar.xz";
+      sha256 = "0rjjgz6s05zv2clh9h75qlmdqq2dijd3avpg7hdczx425ji96fgh";
+      name = "ksirk-17.04.1.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ksnakeduel-17.04.0.tar.xz";
-      sha256 = "1zjfca5qlmsqdx09958h7l169i1pvbgny800q8v6wxhc6c8h4g0r";
-      name = "ksnakeduel-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ksnakeduel-17.04.1.tar.xz";
+      sha256 = "10lqvf9904yc9rbmhicjbsq2dhnar55kk4dfp4w9lwy39snjpaxl";
+      name = "ksnakeduel-17.04.1.tar.xz";
     };
   };
   kspaceduel = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kspaceduel-17.04.0.tar.xz";
-      sha256 = "0z4ffrpmij99ybhzl2dvg89a8whandggc24fxalpf01kxz4vw3v4";
-      name = "kspaceduel-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kspaceduel-17.04.1.tar.xz";
+      sha256 = "00sghhxbkpcig2r9sdhyfqkmlk03f34vf44iwma1lyi2vb22bjsj";
+      name = "kspaceduel-17.04.1.tar.xz";
     };
   };
   ksquares = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ksquares-17.04.0.tar.xz";
-      sha256 = "0mzgwvf077jpzvka1hyw2vm93v9mqng8hnr2nzk38zxbjhb3fkf4";
-      name = "ksquares-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ksquares-17.04.1.tar.xz";
+      sha256 = "11y7m98x1zxk3wk9bc91y9m9j5d4bhgzk504k0zq0nm4hbxrvj81";
+      name = "ksquares-17.04.1.tar.xz";
     };
   };
   kstars = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kstars-17.04.0.tar.xz";
-      sha256 = "1hpadx9fq3bcdzq2lh9csxnlm96q5n1fmss1lkxby7hac28942fk";
-      name = "kstars-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kstars-17.04.1.tar.xz";
+      sha256 = "0n2yjnaks4l2irfh978bdmifvrpfwgqlanvssibnnnarlq99mmbb";
+      name = "kstars-17.04.1.tar.xz";
     };
   };
   ksudoku = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ksudoku-17.04.0.tar.xz";
-      sha256 = "0411s9dpzb6sicb2wcg5mv9sy7vi27lkrg7ssdna9k0wp0d9aqvs";
-      name = "ksudoku-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ksudoku-17.04.1.tar.xz";
+      sha256 = "1ba79iy8qly5js7ak2gycvmbhqzh3wk3xkms5fphav06f9xxapd4";
+      name = "ksudoku-17.04.1.tar.xz";
     };
   };
   ksystemlog = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ksystemlog-17.04.0.tar.xz";
-      sha256 = "162lclr2zx80cwqj0r1gm0cvijciab0rkhl5fyz8bb0xk7ihrimy";
-      name = "ksystemlog-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ksystemlog-17.04.1.tar.xz";
+      sha256 = "0jjy6l8dvs56qn1gnb3zz5aigy3lz89f3xb412k500mx8sghlghn";
+      name = "ksystemlog-17.04.1.tar.xz";
     };
   };
   kteatime = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kteatime-17.04.0.tar.xz";
-      sha256 = "0rklccjb7qi4mir44fp71aiqxb44s9mwpd7aj6yda80ic8yafvhw";
-      name = "kteatime-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kteatime-17.04.1.tar.xz";
+      sha256 = "1dnkpjxs5a1s5lz1kdxp51yaix5wbcxd93hljzv82kr8j60jgi06";
+      name = "kteatime-17.04.1.tar.xz";
     };
   };
   ktimer = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktimer-17.04.0.tar.xz";
-      sha256 = "0px3dxndyhy0xi3s3pac2baw1a5g3a9hg46aj01mk1143z0l8nfz";
-      name = "ktimer-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktimer-17.04.1.tar.xz";
+      sha256 = "0l34i73464jc2ij6ain01wg91047vfi020bxd3kn056064pv0fz7";
+      name = "ktimer-17.04.1.tar.xz";
     };
   };
   ktnef = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktnef-17.04.0.tar.xz";
-      sha256 = "1azy1j045br0xdzyc7nx8h7lvxzzwcvvv223c39d5s008d1i9xp8";
-      name = "ktnef-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktnef-17.04.1.tar.xz";
+      sha256 = "1x112a71b2ccmhd9i3rpp7fjdns4338c3cwd3w6ajq5rwiw5nkw7";
+      name = "ktnef-17.04.1.tar.xz";
     };
   };
   ktouch = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktouch-17.04.0.tar.xz";
-      sha256 = "0d4d7mzjm2lnisih9i94sblspkdqvphqa0irk9ps1dyykdwhbw08";
-      name = "ktouch-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktouch-17.04.1.tar.xz";
+      sha256 = "1jx915vxln4iyxkv01fnpqsy3mwiyds1shpxah7ldm2jwxffb672";
+      name = "ktouch-17.04.1.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktp-accounts-kcm-17.04.0.tar.xz";
-      sha256 = "0bh8s8yiajxxvlnisjlv4mg0v7p51vy5jncmqg6lrq3y29zycbwc";
-      name = "ktp-accounts-kcm-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktp-accounts-kcm-17.04.1.tar.xz";
+      sha256 = "1mgkbgj61y4y5jwi8mm7i94wgrdk4xm541srvyi2qj6hif6m46zg";
+      name = "ktp-accounts-kcm-17.04.1.tar.xz";
     };
   };
   ktp-approver = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktp-approver-17.04.0.tar.xz";
-      sha256 = "06vcxq72idrx24l9y5mvbbxashaqdkv78ihx7qcxq9v8b2kv9ph0";
-      name = "ktp-approver-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktp-approver-17.04.1.tar.xz";
+      sha256 = "03m7fp3bas46v9qf0mdcy429nmbbng12ypc73prw1y46i8qxhf5b";
+      name = "ktp-approver-17.04.1.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktp-auth-handler-17.04.0.tar.xz";
-      sha256 = "0r0yp2xhi12wxk7yaqxwnxg27ccafxlcmn2pzsjf278azymyfral";
-      name = "ktp-auth-handler-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktp-auth-handler-17.04.1.tar.xz";
+      sha256 = "0pd803ygjdv1ip27ipjwygzv0gs7a9wjkiv97cs0z5pwvy9aa9gl";
+      name = "ktp-auth-handler-17.04.1.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktp-call-ui-17.04.0.tar.xz";
-      sha256 = "1bpvisfg58dvpywhvwgb8n4vlai14f7wayzbw1a30344lhca1aql";
-      name = "ktp-call-ui-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktp-call-ui-17.04.1.tar.xz";
+      sha256 = "0knn3nz6fml04yg8j9sl39w3c2kgnlhp416vsp0flnxaqlh2jpb2";
+      name = "ktp-call-ui-17.04.1.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktp-common-internals-17.04.0.tar.xz";
-      sha256 = "1bp2x8f4ymav53icdfxpmdd58kms676qgj5x4jnjbjypw9iyxy9j";
-      name = "ktp-common-internals-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktp-common-internals-17.04.1.tar.xz";
+      sha256 = "1jb3xjdr6jmawc5rdd6fp0di2gw0hqkqffbxnjvszdpnck2dk550";
+      name = "ktp-common-internals-17.04.1.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktp-contact-list-17.04.0.tar.xz";
-      sha256 = "1nldhg221kf9y0fakanj1kj47jrgz820ql766f2yb276y4da31cm";
-      name = "ktp-contact-list-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktp-contact-list-17.04.1.tar.xz";
+      sha256 = "16qwkbhxk5n11j6f02wjq2sjid7apn8xxcn157pinhg0wfkvbysz";
+      name = "ktp-contact-list-17.04.1.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktp-contact-runner-17.04.0.tar.xz";
-      sha256 = "13q31cqpmafimx0nk680z0szxgzanmcqr3xay78ndc9fsg21yc83";
-      name = "ktp-contact-runner-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktp-contact-runner-17.04.1.tar.xz";
+      sha256 = "1x7zkylc4p1al3ikb0srf4yx3p3qdwi2jas88pz7gyrs8sk1d3l0";
+      name = "ktp-contact-runner-17.04.1.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktp-desktop-applets-17.04.0.tar.xz";
-      sha256 = "0fihfqn5wzcxi7kj3lsnnimaiz4k5vzzcfx81rklf75d327lnkvx";
-      name = "ktp-desktop-applets-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktp-desktop-applets-17.04.1.tar.xz";
+      sha256 = "0djjcd4rnqvjqijyygcaiv0p0yga5gx28lfqa3pjbwfqnqwp1r2q";
+      name = "ktp-desktop-applets-17.04.1.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktp-filetransfer-handler-17.04.0.tar.xz";
-      sha256 = "0xm9znnk38xy6z3ndb8i9yjkbx5jv240j4niaagr4kpnsfcmq0yk";
-      name = "ktp-filetransfer-handler-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktp-filetransfer-handler-17.04.1.tar.xz";
+      sha256 = "1f3ks1m30k496yxlhjnbxnnqmj6y3arxw0m2fwjykk5c4jxq6h3a";
+      name = "ktp-filetransfer-handler-17.04.1.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktp-kded-module-17.04.0.tar.xz";
-      sha256 = "04mng6j3fz1glfa3c4jx9360hd6blplnba02257s3vk2kqiah64i";
-      name = "ktp-kded-module-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktp-kded-module-17.04.1.tar.xz";
+      sha256 = "0smgqwbkfnkcyk86whrb1mazmglrmgczd5y3a0ah4ry5z0bqgv4m";
+      name = "ktp-kded-module-17.04.1.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktp-send-file-17.04.0.tar.xz";
-      sha256 = "0iz544hn8s93dxf40vcg80fngq2mxzmmyzd4iwjxk218md86k9wn";
-      name = "ktp-send-file-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktp-send-file-17.04.1.tar.xz";
+      sha256 = "0pjc1qpx4jnvvpjvc5np3w2bsvkaryb8fa1zkx5a0dzcg0dwr7ab";
+      name = "ktp-send-file-17.04.1.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktp-text-ui-17.04.0.tar.xz";
-      sha256 = "18yl0yb3ccwykxn24gyv9i6mw3xbz46mlgygrn7iswgwnrqpckwa";
-      name = "ktp-text-ui-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktp-text-ui-17.04.1.tar.xz";
+      sha256 = "0jmpnv2mb4s9pxyifggj5qaafw9l54af3dgmgmpyhjyhl3g8rpcb";
+      name = "ktp-text-ui-17.04.1.tar.xz";
     };
   };
   ktuberling = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/ktuberling-17.04.0.tar.xz";
-      sha256 = "0i9f5nf1zzvw7xgwi4j3g0bilmcknihh3f1as1mhxjgwfslk5xar";
-      name = "ktuberling-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/ktuberling-17.04.1.tar.xz";
+      sha256 = "0plzn26j9kinaq2amm9x6mr57zl5mp79k7g74mrnpw1qbvvfbnsf";
+      name = "ktuberling-17.04.1.tar.xz";
     };
   };
   kturtle = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kturtle-17.04.0.tar.xz";
-      sha256 = "1f8bzfwjwlhvz8y1hm4if03kbllk85gdq3ih709xikj6vs922jqj";
-      name = "kturtle-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kturtle-17.04.1.tar.xz";
+      sha256 = "0i8h202irr40lw5n1rwq4vzwd6ifmbhww8yfj4jlm2vacsc9qs7a";
+      name = "kturtle-17.04.1.tar.xz";
     };
   };
   kubrick = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kubrick-17.04.0.tar.xz";
-      sha256 = "15njanlbqf73khgk42n7sqkhsy8zhdhxn45n2bq5ak5wirf1gqs9";
-      name = "kubrick-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kubrick-17.04.1.tar.xz";
+      sha256 = "0jasrbiafhxv5fdcmsrhwfszq5il6671ng4wlngmny660y850zh5";
+      name = "kubrick-17.04.1.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kwalletmanager-17.04.0.tar.xz";
-      sha256 = "0x8l9hzwwd97k8cj6nwgb6wyzx2zgral4sx98hasvg52cn82zfb1";
-      name = "kwalletmanager-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kwalletmanager-17.04.1.tar.xz";
+      sha256 = "0wn0z48nnay2ch6nqnkfz8lbwajcdy84xhxi1wbr7xm8w2qy07f1";
+      name = "kwalletmanager-17.04.1.tar.xz";
     };
   };
   kwave = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kwave-17.04.0.tar.xz";
-      sha256 = "1232sr45qbbdkafpbnz6ddbqabc5jasp43v5lyi3lhgppfz4gz43";
-      name = "kwave-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kwave-17.04.1.tar.xz";
+      sha256 = "1rzm48n3kgh8xhpvjg9r4ifa67v800q3km8fblznqzkarihmaiff";
+      name = "kwave-17.04.1.tar.xz";
     };
   };
   kwordquiz = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/kwordquiz-17.04.0.tar.xz";
-      sha256 = "1wp8ccsamz6b2yk85i85r8a1r10r7b4lhxg82r8z5gv8im7g1glb";
-      name = "kwordquiz-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/kwordquiz-17.04.1.tar.xz";
+      sha256 = "024hypbi1d2j8vj2fnv1smqc0avp9b24lm6v15g50rhzrlzhz71s";
+      name = "kwordquiz-17.04.1.tar.xz";
     };
   };
   libgravatar = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libgravatar-17.04.0.tar.xz";
-      sha256 = "06d5c2kn2l5rvg23frj5hhr0hnfx5ncmhr8dlqdxz0x7pmyjbign";
-      name = "libgravatar-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libgravatar-17.04.1.tar.xz";
+      sha256 = "170ddmgclpw3ww1d7ars96ccygr9zpd9b8wxw2c93gjc2w92b9gd";
+      name = "libgravatar-17.04.1.tar.xz";
     };
   };
   libkcddb = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkcddb-17.04.0.tar.xz";
-      sha256 = "0rfvq4g4d9l85p3jcqgs54bnskq2w5bqfw2j0jgizkdffk0dzvfj";
-      name = "libkcddb-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkcddb-17.04.1.tar.xz";
+      sha256 = "1xyyy74nx8h0zljj0mf2i88jj6wrawi2n9wlzbcb5qn2jxbswkjk";
+      name = "libkcddb-17.04.1.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkcompactdisc-17.04.0.tar.xz";
-      sha256 = "1bfli5za4rcf6ixmd3j6g9xzh6d5cp9838m6c898317sac00b957";
-      name = "libkcompactdisc-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkcompactdisc-17.04.1.tar.xz";
+      sha256 = "0s0a84vxy3lahjdsa18cwx1pm5pdlrrx780plw1phs0vv1wwyhiq";
+      name = "libkcompactdisc-17.04.1.tar.xz";
     };
   };
   libkdcraw = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkdcraw-17.04.0.tar.xz";
-      sha256 = "191cqv8q43zg5s9f52bwyrj1visf39i03d1d9d74sj1lfw7ghqys";
-      name = "libkdcraw-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkdcraw-17.04.1.tar.xz";
+      sha256 = "1a0qz0zrplyzfcsfgajflfxb0yiz51chfkjy2b9nmnrp43qbjrpy";
+      name = "libkdcraw-17.04.1.tar.xz";
     };
   };
   libkdegames = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkdegames-17.04.0.tar.xz";
-      sha256 = "0ydja5fmyrgkxjnbcxfgyz0x5m3ymkkp436z30ikx9d5s0kyhl6k";
-      name = "libkdegames-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkdegames-17.04.1.tar.xz";
+      sha256 = "1zccwm3cdwdqimq6q0rbz6kcwqig721fq2gz6vip7ywv79f0a4rm";
+      name = "libkdegames-17.04.1.tar.xz";
     };
   };
   libkdepim = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkdepim-17.04.0.tar.xz";
-      sha256 = "00whk97jkycxg6s3n6dsb5addkwwk4bs696brsm1vj93rffhbslf";
-      name = "libkdepim-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkdepim-17.04.1.tar.xz";
+      sha256 = "10dlvlh01c3mm84sbk9zkmcfclzs2n38ga0w1p7cnqj1ln7p497x";
+      name = "libkdepim-17.04.1.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkeduvocdocument-17.04.0.tar.xz";
-      sha256 = "0c1rj2rds7q779rfapn79w00qzdfhla8bngbnpa8s2qghb965lff";
-      name = "libkeduvocdocument-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkeduvocdocument-17.04.1.tar.xz";
+      sha256 = "008d1cpxv9by2b4a7bbf0k0g9pib5nc22k6hxcpg6qds2wivdgxn";
+      name = "libkeduvocdocument-17.04.1.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkexiv2-17.04.0.tar.xz";
-      sha256 = "07iwwfvj27m4m9h81jsrabyqamhh9gyqx1k265jxq4nll68nh0px";
-      name = "libkexiv2-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkexiv2-17.04.1.tar.xz";
+      sha256 = "1a01y4hd4ysz3icp2l88qly2mzpy5kgr97zs8ck62p4dr8p06q62";
+      name = "libkexiv2-17.04.1.tar.xz";
     };
   };
   libkface = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkface-17.04.0.tar.xz";
-      sha256 = "1bazry6pmmdppmpr7fdzj61cykk9h4kwz67zay7vck0jk77n5myr";
-      name = "libkface-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkface-17.04.1.tar.xz";
+      sha256 = "0hjq0zv36fp2yyryiz3bbq0v15xl6qhnlpj1ixx3d6krmc5pkyia";
+      name = "libkface-17.04.1.tar.xz";
     };
   };
   libkgapi = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkgapi-17.04.0.tar.xz";
-      sha256 = "0m3walc6hw5nmsr0cjlspczjlc90jzqam8xk32if5pl8bynmgh4c";
-      name = "libkgapi-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkgapi-17.04.1.tar.xz";
+      sha256 = "19iv2mzmr3wp1grnjdmck4i22jagjzr49lnpdb5ljgyf0xlqzwir";
+      name = "libkgapi-17.04.1.tar.xz";
     };
   };
   libkgeomap = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkgeomap-17.04.0.tar.xz";
-      sha256 = "1la4pggz7kbppmhvdv4g4szh3dyw4d3kas2m00xdvfbdjmmxswp3";
-      name = "libkgeomap-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkgeomap-17.04.1.tar.xz";
+      sha256 = "1bh4h2ymb4gh0bhqg8akwpq9d8a5vcwiscavnnc9ihjjhnhzz79w";
+      name = "libkgeomap-17.04.1.tar.xz";
     };
   };
   libkipi = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkipi-17.04.0.tar.xz";
-      sha256 = "0yzg9dml7yjqmp1niqc003baxavvr4bprkpvahigh84r4kxbba6a";
-      name = "libkipi-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkipi-17.04.1.tar.xz";
+      sha256 = "0bqxjhj9h22r7i770ibfsxzyxp9y81174xvn9fvi0v77m2myfnb4";
+      name = "libkipi-17.04.1.tar.xz";
     };
   };
   libkleo = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkleo-17.04.0.tar.xz";
-      sha256 = "1bx9g4dc1h7vy3157nshlyn3m42x88dzffhcix9kw6cw5c5zfinl";
-      name = "libkleo-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkleo-17.04.1.tar.xz";
+      sha256 = "1541aalr8pw690qp2rh133yyby877c5fiz1x3qmzhznm7jhjh293";
+      name = "libkleo-17.04.1.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkmahjongg-17.04.0.tar.xz";
-      sha256 = "0q6n15aa9hqh3i7fm6c7q37p38clasc2xqvyz1nha5s8rkm0dw73";
-      name = "libkmahjongg-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkmahjongg-17.04.1.tar.xz";
+      sha256 = "0wjyy5ic7draw09s8kfcng6m0bp0sxd0nr1vqgfcjg4gqicdqpc7";
+      name = "libkmahjongg-17.04.1.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libkomparediff2-17.04.0.tar.xz";
-      sha256 = "0p3iys22f21fqz31dxnrrc1kkz234zrpfcv5dj9kwh114va64j5r";
-      name = "libkomparediff2-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libkomparediff2-17.04.1.tar.xz";
+      sha256 = "1rc0kvxjmnwhaadl6f9x61n4lnr50g7w0k8d7k9y73fib60wjcvp";
+      name = "libkomparediff2-17.04.1.tar.xz";
     };
   };
   libksane = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libksane-17.04.0.tar.xz";
-      sha256 = "1yr21f0mvvgb2p29rfp8b6c33pfz893wk1xqdfsbiar7p1l4by46";
-      name = "libksane-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libksane-17.04.1.tar.xz";
+      sha256 = "15qmlrxhs45xscjsrnr8c0ag20l4wclmbbmsb3cpa35lrfh5ybp0";
+      name = "libksane-17.04.1.tar.xz";
     };
   };
   libksieve = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/libksieve-17.04.0.tar.xz";
-      sha256 = "04bb0k06p384p0a0i02kj80a1kszcg6nfjal227mmj4qdra9i0nf";
-      name = "libksieve-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/libksieve-17.04.1.tar.xz";
+      sha256 = "0i5qy9skd100y4khsr8wnyibz2jmjk5gwz21afhx6hrrv5sv8bbg";
+      name = "libksieve-17.04.1.tar.xz";
     };
   };
   lokalize = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/lokalize-17.04.0.tar.xz";
-      sha256 = "1gjlidbhkx0alcydc8z7pi4m5gzhcj0bqpascj905vk72az0by8j";
-      name = "lokalize-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/lokalize-17.04.1.tar.xz";
+      sha256 = "06kvrg6dm4hm7dz2lkxmqk5q2nqpxhwcqfwgh1bzlp7lydych5nx";
+      name = "lokalize-17.04.1.tar.xz";
     };
   };
   lskat = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/lskat-17.04.0.tar.xz";
-      sha256 = "06nk276dsbrbw6jilh3kpjcf1nlx8vbqkl61g15m8dbhrrz833rd";
-      name = "lskat-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/lskat-17.04.1.tar.xz";
+      sha256 = "1062qyih9dsybkp5njd6r71r6hz6ymm60gga7v17sfj98995znwb";
+      name = "lskat-17.04.1.tar.xz";
     };
   };
   mailcommon = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/mailcommon-17.04.0.tar.xz";
-      sha256 = "1lbvzgbsn1fh96m1ck56dafsglbq7f71w9wknwm7d3afl8jp2rr6";
-      name = "mailcommon-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/mailcommon-17.04.1.tar.xz";
+      sha256 = "15gykamn47cc2n9k7b7dwly3h1s6j3j9hqr68p2bv6sf11jg32sn";
+      name = "mailcommon-17.04.1.tar.xz";
     };
   };
   mailimporter = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/mailimporter-17.04.0.tar.xz";
-      sha256 = "1dpvxp704cmaj1yzp2wbib4avlwmgmbizrr19mssby467qb09j6z";
-      name = "mailimporter-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/mailimporter-17.04.1.tar.xz";
+      sha256 = "0h7hy57sm9f2wivwd82fpw6jrrl546hapca2bxmnm1z654amh480";
+      name = "mailimporter-17.04.1.tar.xz";
     };
   };
   marble = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/marble-17.04.0.tar.xz";
-      sha256 = "0w47v85brj18g2s63axqmfrqz6hs5fq1vvbs7gr6gyirw9vbg2ka";
-      name = "marble-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/marble-17.04.1.tar.xz";
+      sha256 = "1hr8lgc23m7lbai92nh8jms4v1iqw4gj8yh78manyhdam42h1vm5";
+      name = "marble-17.04.1.tar.xz";
     };
   };
   mbox-importer = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/mbox-importer-17.04.0.tar.xz";
-      sha256 = "1jbia6zxcammk58hlyawhwr6j9022vvw69r0vsqnczys0qw3cbyd";
-      name = "mbox-importer-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/mbox-importer-17.04.1.tar.xz";
+      sha256 = "1bndznqwhgn5cpp06wdq5qap324cmh2yqxcmrbfz2cf2hb1bdqgs";
+      name = "mbox-importer-17.04.1.tar.xz";
     };
   };
   messagelib = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/messagelib-17.04.0.tar.xz";
-      sha256 = "0qcrfbzx8mw88wdjzrd8ipj2pi5l14yka0bhrw1zmsm0p1f0n34h";
-      name = "messagelib-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/messagelib-17.04.1.tar.xz";
+      sha256 = "17fdz2c4n7wl3895cmxs245bzv6w7g6sgz95fs1il94ghj70ldqc";
+      name = "messagelib-17.04.1.tar.xz";
     };
   };
   minuet = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/minuet-17.04.0.tar.xz";
-      sha256 = "02m2l7d9703j2ci386wy9vxyllxqf177d2bcdhcx5iqlq4194jks";
-      name = "minuet-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/minuet-17.04.1.tar.xz";
+      sha256 = "0qqgld8rf99n9djbkz1i2s5d2kx163hpc6fpk5gabjkkm7m0rsbn";
+      name = "minuet-17.04.1.tar.xz";
     };
   };
   okteta = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/okteta-17.04.0.tar.xz";
-      sha256 = "12d2hr8dw6qjhcza9ly3nkglll703cq1ywz7icp4x2xdklsv2qyv";
-      name = "okteta-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/okteta-17.04.1.tar.xz";
+      sha256 = "1kg4s88vfapdn349jl76l4rdhvp45hzb6chs00akb3n40migx7yn";
+      name = "okteta-17.04.1.tar.xz";
     };
   };
   okular = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/okular-17.04.0.tar.xz";
-      sha256 = "00wqflixzzn0blxd0anrfs1kjhrknny18ia95wxh0zpafvi1ga74";
-      name = "okular-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/okular-17.04.1.tar.xz";
+      sha256 = "17mw0j3ngrwj39bjr0nsx3jl4vq8sra7x13zldy2pjryx236hh7g";
+      name = "okular-17.04.1.tar.xz";
     };
   };
   palapeli = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/palapeli-17.04.0.tar.xz";
-      sha256 = "1hjspg44py4rqzqr5w6f0lw6nz4ilwgr701s1m1pw4q0f6j80b6i";
-      name = "palapeli-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/palapeli-17.04.1.tar.xz";
+      sha256 = "0mx60j52i8dr9wq6hhls8zvrrlc42j3f1fc8zqz1mmvqyym8053j";
+      name = "palapeli-17.04.1.tar.xz";
     };
   };
   parley = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/parley-17.04.0.tar.xz";
-      sha256 = "0i4nhwz7b7gmnlq72limp6cpsjaccc03i5qr2pdv8hb2336nabc7";
-      name = "parley-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/parley-17.04.1.tar.xz";
+      sha256 = "0is581jhb17zzhy7jbrqfy1r33wcrficfbvrv989i45jhcp3hr2h";
+      name = "parley-17.04.1.tar.xz";
     };
   };
   picmi = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/picmi-17.04.0.tar.xz";
-      sha256 = "0289qq4f4njv6yb9hg61ap17q2fvaandyxa8kz68v3yc7jlpsvlw";
-      name = "picmi-17.04.0.tar.xz";
-    };
-  };
-  pim-data-exporter = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/pim-data-exporter-17.04.0.tar.xz";
-      sha256 = "1j8qdr9hdjzj6jn94hq771mnfwspqwb47nrrj25ghbl6d8b19qfd";
-      name = "pim-data-exporter-17.04.0.tar.xz";
-    };
-  };
-  pim-sieve-editor = {
-    version = "17.04.0";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/pim-sieve-editor-17.04.0.tar.xz";
-      sha256 = "0l7vbgzjrkpvad0q8yhcgx78xcxs0llgmqg7madv06lnxbry02yf";
-      name = "pim-sieve-editor-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/picmi-17.04.1.tar.xz";
+      sha256 = "0byhmm9sczl0swibg89hl6sq9m8hba6pn9q0sfjsa1y8k3h34mi7";
+      name = "picmi-17.04.1.tar.xz";
     };
   };
   pimcommon = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/pimcommon-17.04.0.tar.xz";
-      sha256 = "1k04zfmzvjpnjwjr42p4ixkwnl1raxr9mpqb13qhr9ln4qsnsq4h";
-      name = "pimcommon-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/pimcommon-17.04.1.tar.xz";
+      sha256 = "16x789mf7zgxdig48ixz0n4x4iq3ik4dgr60ka2qwfvcqgli4sx2";
+      name = "pimcommon-17.04.1.tar.xz";
+    };
+  };
+  pim-data-exporter = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/pim-data-exporter-17.04.1.tar.xz";
+      sha256 = "03wj8hjn1d6jkamh1p06jcpm8f2sxdimkxdzhd7s08rhdi3pz90n";
+      name = "pim-data-exporter-17.04.1.tar.xz";
+    };
+  };
+  pim-sieve-editor = {
+    version = "17.04.1";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/17.04.1/src/pim-sieve-editor-17.04.1.tar.xz";
+      sha256 = "0cfc0hj3d5xgq4v8z9pmzwb161qvvrcsrg5wsk99hw05dydz6sfc";
+      name = "pim-sieve-editor-17.04.1.tar.xz";
     };
   };
   poxml = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/poxml-17.04.0.tar.xz";
-      sha256 = "1chl7mizmgvmzhi0pz111p2lkpmh4j4nbn7hfaksmvmvrlrcjj8z";
-      name = "poxml-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/poxml-17.04.1.tar.xz";
+      sha256 = "00hljgjacsmr8kjh37m7bsvk3a0h35q8zjrdj2m2wdj65x7hw517";
+      name = "poxml-17.04.1.tar.xz";
     };
   };
   print-manager = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/print-manager-17.04.0.tar.xz";
-      sha256 = "10zkf8azgn79rq9b0amhaanngfd1pv51zr7qy10z5jd62bxxcf8n";
-      name = "print-manager-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/print-manager-17.04.1.tar.xz";
+      sha256 = "1hjnfzihcn9mh9k9w6a2zjzly2cd2xn8fc96sa4c82pvb0606a7b";
+      name = "print-manager-17.04.1.tar.xz";
     };
   };
   rocs = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/rocs-17.04.0.tar.xz";
-      sha256 = "0jb7nwg73kagw0mrwhx7nph5m2nsq7220hr5bfcnndw1in5bwnbx";
-      name = "rocs-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/rocs-17.04.1.tar.xz";
+      sha256 = "0jja9nd8c8i06vmc2n71d4pynxp868zzahcr3mvf3s4cvm6ysq6l";
+      name = "rocs-17.04.1.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/signon-kwallet-extension-17.04.0.tar.xz";
-      sha256 = "1amvrrwsfh7d9c284ksvqm4x9f4d36abbq2fal4sicplqp4ag4z0";
-      name = "signon-kwallet-extension-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/signon-kwallet-extension-17.04.1.tar.xz";
+      sha256 = "0m91afp5haissvi8jl0mk0b6q55hm9vkjya0dff4vgzlsas5kilg";
+      name = "signon-kwallet-extension-17.04.1.tar.xz";
     };
   };
   spectacle = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/spectacle-17.04.0.tar.xz";
-      sha256 = "0vmmyvbsiffj9g49f39dar6b34rk8badpah3rzq4af0xzhlc0z0y";
-      name = "spectacle-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/spectacle-17.04.1.tar.xz";
+      sha256 = "0jzcc63xlpmp88af381nrckqd0yd6hbbh0a8jhipxcf6p3f13sjw";
+      name = "spectacle-17.04.1.tar.xz";
     };
   };
   step = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/step-17.04.0.tar.xz";
-      sha256 = "0j9wlys17rdrnq2l0cprnw4pp2ks439ihyx4v1m4sdrxsvqxz4lw";
-      name = "step-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/step-17.04.1.tar.xz";
+      sha256 = "1rln0vczinvk2hm0hvmy62rk5yywdik8kprjs1axdhm9l4rnvy2h";
+      name = "step-17.04.1.tar.xz";
     };
   };
   svgpart = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/svgpart-17.04.0.tar.xz";
-      sha256 = "0yv9a7ndfix41f875hw9fy9snqdanchvqb87rbm09dhc0fniwnir";
-      name = "svgpart-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/svgpart-17.04.1.tar.xz";
+      sha256 = "1aqnn5s275rz7axgmn1w6zv4109m2kbmw0lk2g1179vfgip8zwss";
+      name = "svgpart-17.04.1.tar.xz";
     };
   };
   sweeper = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/sweeper-17.04.0.tar.xz";
-      sha256 = "08jbp2kdlchvzmd9kpilypvm9466niyc4cwmya6crnn7khn03c05";
-      name = "sweeper-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/sweeper-17.04.1.tar.xz";
+      sha256 = "176qx6g6mamqkzsyi2vn4574h5dgcci4hmx4nxq4zcdzxamixq78";
+      name = "sweeper-17.04.1.tar.xz";
     };
   };
   syndication = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/syndication-17.04.0.tar.xz";
-      sha256 = "1irmjs40ghyx9vx1d5x30x34s8vwrqm7j6xf7m2s7s63jmmsk5w2";
-      name = "syndication-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/syndication-17.04.1.tar.xz";
+      sha256 = "0hw22qvlslichvjgpis1zwmj1cbk2fwkmkshwpf02bz38kzpls1m";
+      name = "syndication-17.04.1.tar.xz";
     };
   };
   umbrello = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/umbrello-17.04.0.tar.xz";
-      sha256 = "0dkarqk4a3y4npk2nyyydizll4kmlg1lgddwx49gsvh120fy1zfn";
-      name = "umbrello-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/umbrello-17.04.1.tar.xz";
+      sha256 = "0dmkdzrgn004j59s97m34mz54zs23rkbp70cypksvl1mc0vg1h3v";
+      name = "umbrello-17.04.1.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "17.04.0";
+    version = "17.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.0/src/zeroconf-ioslave-17.04.0.tar.xz";
-      sha256 = "1m149lmjfh6nxkbax2vifirwi6jsp5jqzfai7kcyvzwp60ff6y0z";
-      name = "zeroconf-ioslave-17.04.0.tar.xz";
+      url = "${mirror}/stable/applications/17.04.1/src/zeroconf-ioslave-17.04.1.tar.xz";
+      sha256 = "1yqpkmvcx7zbx17qlcimqshn2iivyji70zwb8g3lg78asxil02n2";
+      name = "zeroconf-ioslave-17.04.1.tar.xz";
     };
   };
 }

From 8fdbc828b99a4c2fd3703a0d0090be99b33992f6 Mon Sep 17 00:00:00 2001
From: Tyson Whitehead <twhitehead@gmail.com>
Date: Thu, 18 May 2017 18:32:09 -0400
Subject: [PATCH 151/206] clblas-cuda: requires ocl-icd now for libOpenCL.so.1
 #25902

---
 pkgs/development/libraries/science/math/clblas/cuda/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/science/math/clblas/cuda/default.nix b/pkgs/development/libraries/science/math/clblas/cuda/default.nix
index 6d3faa2fb7f..ae568bc6db1 100644
--- a/pkgs/development/libraries/science/math/clblas/cuda/default.nix
+++ b/pkgs/development/libraries/science/math/clblas/cuda/default.nix
@@ -5,6 +5,7 @@
 , blas
 , boost
 , python
+, ocl-icd
 , cudatoolkit
 , nvidia_x11
 , gtest
@@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
     gfortran
     blas
     python
+    ocl-icd
     cudatoolkit
     nvidia_x11
     gtest

From 6679dbbd60d2c04865411458b49a1d85eb99d461 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 19 May 2017 01:59:44 +0300
Subject: [PATCH 152/206] ffmpeg: fix arm build

---
 pkgs/development/libraries/ffmpeg/generic.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 8c74abc5709..57ac086368f 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -55,6 +55,8 @@ let
 
   # Disable dependency that needs fixes before it will work on Darwin or Arm
   disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isArm) && reqMin minVer) then fixArg else origArg;
+
+  vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm);
 in
 
 assert openglSupport -> mesa != null;
@@ -121,7 +123,7 @@ stdenv.mkDerivation rec {
       "--enable-libmp3lame"
       (ifMinVer "1.2" "--enable-iconv")
       "--enable-libtheora"
-      (ifMinVer "0.6" (enableFeature (isLinux || isFreeBSD) "vaapi"))
+      (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
       "--enable-vdpau"
       "--enable-libvorbis"
       (disDarwinOrArmFix (ifMinVer "0.6" "--enable-libvpx") "0.6" "--disable-libvpx")
@@ -197,8 +199,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "install-man" ];
 
   passthru = {
-    vaapiSupport = if reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm) then true else false;
-    inherit vdpauSupport;
+    inherit vaapiSupport vdpauSupport;
   };
 
   meta = with stdenv.lib; {

From 8e7c7af3b88ca7df22e02f054f8fe07df52923f6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 18 May 2017 23:25:10 +0300
Subject: [PATCH 153/206] haskellPackages.hoogle: don't override
 haskell-src-exts

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 67fe4415787..2caa10a8411 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -688,9 +688,6 @@ self: super: {
   # It makes no sense to have intero-nix-shim in Hackage, so we publish it here only.
   intero-nix-shim = self.callPackage ../tools/haskell/intero-nix-shim {};
 
-  # The latest Hoogle needs versions not yet in LTS Haskell 7.x.
-  hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };
-
   # https://github.com/Philonous/hs-stun/pull/1
   # Remove if a version > 0.1.0.1 ever gets released.
   stunclient = overrideCabal super.stunclient (drv: {

From e17744067a5d3460e06d531a93b2527757b20a55 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 1 May 2017 15:23:41 +0300
Subject: [PATCH 154/206] displaylink: 1.1.62 -> 1.3.52

---
 nixos/modules/hardware/video/displaylink.nix  | 27 ++++----
 .../os-specific/linux/displaylink/default.nix | 61 +++++++------------
 pkgs/top-level/all-packages.nix               |  6 +-
 3 files changed, 42 insertions(+), 52 deletions(-)

diff --git a/nixos/modules/hardware/video/displaylink.nix b/nixos/modules/hardware/video/displaylink.nix
index 2a9382f3941..669ac849cba 100644
--- a/nixos/modules/hardware/video/displaylink.nix
+++ b/nixos/modules/hardware/video/displaylink.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
@@ -6,7 +6,11 @@ let
 
   enabled = elem "displaylink" config.services.xserver.videoDrivers;
 
-  displaylink = config.boot.kernelPackages.displaylink;
+  evdi = config.boot.kernelPackages.evdi;
+
+  displaylink = pkgs.displaylink.override {
+    inherit evdi;
+  };
 
 in
 
@@ -14,15 +18,11 @@ in
 
   config = mkIf enabled {
 
-    boot.extraModulePackages = [ displaylink ];
-
-    boot.kernelModules = [ "evdi" ];
+    boot.extraModulePackages = [ evdi ];
 
     # Those are taken from displaylink-installer.sh and from Arch Linux AUR package.
 
-    services.udev.extraRules = ''
-      ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{bNumInterfaces}=="*5", TAG+="uaccess"
-    '';
+    services.udev.packages = [ displaylink ];
 
     powerManagement.powerDownCommands = ''
       #flush any bytes in pipe
@@ -32,7 +32,10 @@ in
       echo "S" > /tmp/PmMessagesPort_in
 
       #wait until suspend of DisplayLinkManager finish
-      read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out
+      if [ -f /tmp/PmMessagesPort_out ]; then
+        #wait until suspend of DisplayLinkManager finish
+        read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out
+      fi
     '';
 
     powerManagement.resumeCommands = ''
@@ -40,10 +43,11 @@ in
       echo "R" > /tmp/PmMessagesPort_in
     '';
 
-    systemd.services.displaylink = {
+    systemd.services.dlm = {
       description = "DisplayLink Manager Service";
       after = [ "display-manager.service" ];
-      wantedBy = [ "graphical.target" ];
+      conflicts = [ "getty@tty7.service" ];
+      path = [ pkgs.kmod ];
 
       serviceConfig = {
         ExecStart = "${displaylink}/bin/DisplayLinkManager";
@@ -53,6 +57,7 @@ in
 
       preStart = ''
         mkdir -p /var/log/displaylink
+        modprobe evdi
       '';
     };
 
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 87cf7c18caf..1f923b9567a 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -1,64 +1,47 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, unzip, kernel, utillinux, libdrm, libusb1, makeWrapper }:
+{ stdenv, lib, fetchurl, unzip, utillinux, libusb1, evdi, systemd, makeWrapper }:
 
 let
   arch =
     if stdenv.system == "x86_64-linux" then "x64"
     else if stdenv.system == "i686-linux" then "x86"
     else throw "Unsupported architecture";
-  libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 ];
+  bins = "${arch}-ubuntu-1604";
+  libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ];
 
 in stdenv.mkDerivation rec {
   name = "displaylink-${version}";
-  version = "1.1.62";
+  version = "1.3.52";
 
-  src = fetchFromGitHub {
-    owner = "DisplayLink";
-    repo = "evdi";
-    rev = "fe779940ff9fc7b512019619e24a5b22e4070f6a";
-    sha256 = "02hw83f6lscms8hssjzf30hl9zly3b28qcxwmxvnqwfhx1q491z9";
-  };
-
-  daemon = fetchurl {
+  src = fetchurl {
     name = "displaylink.zip";
-    url = "http://www.displaylink.com/downloads/file?id=607";
-    sha256 = "0jky3xk4dfzbzg386qya9l9952i4m8zhf55fdl06pi9r82k2iijx";
+    url = "http://www.displaylink.com/downloads/file?id=744";
+    sha256 = "0ridpsxcf761vym0nlpq702qa46ynddzci17bjmyax2pph7khr0k";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];
 
-  buildInputs = [ kernel libdrm ];
-
   buildCommand = ''
-    unpackPhase
-    cd $sourceRoot
-    unzip $daemon
+    unzip $src
     chmod +x displaylink-driver-${version}.run
-    ./displaylink-driver-${version}.run --target daemon --noexec
+    ./displaylink-driver-${version}.run --target . --noexec
 
-    ( cd module
-      export makeFlags="$makeFlags KVER=${kernel.modDirVersion} KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-      export hardeningDisable="pic format"
-      buildPhase
-      install -Dm755 evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko
+    sed -i "s,/opt/displaylink/udev.sh,$out/lib/udev/displaylink.sh,g" udev-installer.sh
+    ( source udev-installer.sh
+      mkdir -p $out/lib/udev/rules.d
+      main systemd "$out/lib/udev/rules.d/99-displaylink.rules" "$out/lib/udev/displaylink.sh"
     )
+    sed -i '2iPATH=${systemd}/bin:$PATH' $out/lib/udev/displaylink.sh
 
-    ( cd library
-      buildPhase
-      install -Dm755 libevdi.so $out/lib/libevdi.so
-    )
+    install -Dt $out/lib/displaylink *.spkg
+    install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager
+    patchelf \
+      --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
+      --set-rpath ${libPath} \
+      $out/bin/DisplayLinkManager
+    wrapProgram $out/bin/DisplayLinkManager \
+      --run "cd $out/lib/displaylink"
 
     fixupPhase
-
-    ( cd daemon
-      install -Dt $out/lib/displaylink *.spkg
-      install -Dm755 ${arch}/DisplayLinkManager $out/bin/DisplayLinkManager
-      patchelf \
-        --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
-        --set-rpath $out/lib:${libPath} \
-        $out/bin/DisplayLinkManager
-      wrapProgram $out/bin/DisplayLinkManager \
-        --run "cd $out/lib/displaylink"
-    )
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61e16743d32..87fae1fcf02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11516,6 +11516,10 @@ with pkgs;
 
   disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
 
+  displaylink = callPackage ../os-specific/linux/displaylink {
+    inherit (linuxPackages) evdi;
+  };
+
   dmidecode = callPackage ../os-specific/linux/dmidecode { };
 
   dmtcp = callPackage ../os-specific/linux/dmtcp { };
@@ -11878,8 +11882,6 @@ with pkgs;
 
     cpupower = callPackage ../os-specific/linux/cpupower { };
 
-    displaylink = callPackage ../os-specific/linux/displaylink { };
-
     dpdk = callPackage ../os-specific/linux/dpdk { };
 
     exfat-nofuse = callPackage ../os-specific/linux/exfat { };

From 030862f63c8804f3e5aec66e17af2297bfb265f0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 1 May 2017 15:22:59 +0300
Subject: [PATCH 155/206] linuxPackages.evdi: init at 1.4.1

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

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
new file mode 100644
index 00000000000..d1e8a466953
--- /dev/null
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, kernel, libdrm }:
+
+stdenv.mkDerivation rec {
+  name = "evdi-${version}";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "DisplayLink";
+    repo = "evdi";
+    rev = "v${version}";
+    sha256 = "176cq83qlmhc4c00dwfnqgd021l7s4gyj8604m5zmxbz0r5mnawv";
+  };
+
+  buildInputs = [ kernel libdrm ];
+
+  makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
+
+  hardeningDisable = [ "pic" "format" ];
+
+  installPhase = ''
+    install -Dm755 module/evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko
+    install -Dm755 library/libevdi.so $out/lib/libevdi.so
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Extensible Virtual Display Interface";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    homepage = "http://www.displaylink.com/";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87fae1fcf02..d382141896a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11886,6 +11886,8 @@ with pkgs;
 
     exfat-nofuse = callPackage ../os-specific/linux/exfat { };
 
+    evdi = callPackage ../os-specific/linux/evdi { };
+
     pktgen = callPackage ../os-specific/linux/pktgen { };
 
     odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };

From 965bffdb6984979d8e69479f195127342e431888 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Thu, 18 May 2017 23:14:50 -0400
Subject: [PATCH 156/206] bazel: 0.4.4 -> 0.4.5 (#25821)

Also added zsh and bash completion support
---
 .../tools/build-managers/bazel/default.nix         | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 16e31eaf5a8..dcdc55f0aef 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper }:
+{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper, which }:
 
 stdenv.mkDerivation rec {
 
-  version = "0.4.4";
+  version = "0.4.5";
 
   meta = with stdenv.lib; {
     homepage = http://github.com/bazelbuild/bazel/;
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "1fwfahkqi680zyxmdriqj603lpacyh6cg6ff25bn9bkilbfj2anm";
+    sha256 = "0asmq3kxnl4326zhgh13mvcrc8jvmiswjj4ymrq0943q4vj7nwrb";
   };
 
   sourceRoot = ".";
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     zip
     unzip
     makeWrapper
+    which
   ];
 
   # These must be propagated since the dependency is hidden in a compressed
@@ -58,6 +59,10 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     export TMPDIR=/tmp
     ./compile.sh
+    ./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \
+      --spawn_strategy=standalone \
+      --genrule_strategy=standalone
+    cp bazel-bin/scripts/bazel-complete.bash output/
   '';
 
   # Build the CPP and Java examples to verify that Bazel works.
@@ -76,6 +81,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     mv output/bazel $out/bin
     wrapProgram "$out/bin/bazel" --prefix PATH : "${stdenv.cc}/bin:${jdk}/bin"
+    mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
+    mv output/bazel-complete.bash $out/share/bash-completion/completions/
+    cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
   '';
 
   dontStrip = true;

From fe666125a65366b610d623b93f780ad6138ab39f Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 6 May 2017 23:34:03 -0700
Subject: [PATCH 157/206] ffmpeg-full: add enableLto option

disabled by default, allows the user to specify if they would like a
link-time optimized build or not
---
 pkgs/development/libraries/ffmpeg-full/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 1839f4d0ef3..bdd3b5cea50 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -17,6 +17,7 @@
 , multithreadBuild ? true # Multithreading via pthreads/win32 threads
 , networkBuild ? true # Network support
 , pixelutilsBuild ? true # Pixel utils in libavutil
+, enableLto ? false # build with link-time optimization
 /*
  *  Program options
  */
@@ -257,6 +258,7 @@ stdenv.mkDerivation rec {
     (if stdenv.cc.isClang then "--cc=clang" else null)
     (enableFeature smallBuild "small")
     (enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
+    (enableFeature enableLto "lto")
     (enableFeature grayBuild "gray")
     (enableFeature swscaleAlphaBuild "swscale-alpha")
     (enableFeature hardcodedTablesBuild "hardcoded-tables")

From 577327bc9f6b5234a92df16953e847b85ab65e40 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Thu, 11 May 2017 17:35:22 -0700
Subject: [PATCH 158/206] obs-studio: bump revision to fix Settings crash

---
 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 9c0d8c6b004..fb3434e7458 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -31,8 +31,8 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
-    rev = "26c28b45";
-    sha256 = "06rr70z2p2l8prxmd075pnlc759ddlqn3jprn8ns148x6s2vqik2";
+    rev = "2bf9d548";
+    sha256 = "036l29m3dlqadvaazj0nmgi2lcji8zckdvx3gjrx1kp96yd5myqd";
   };
 
   patches = [ ./find-xcb.patch ];

From 769e14a4228093f999bf2cb932368d80f210a5c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 19 May 2017 09:24:46 +0200
Subject: [PATCH 159/206] multi-ghc-travis: update to latest git version and
 install both scripts

We're using the names 'make-travis-yml' and 'make-travis-yml-2' now, which
feels more in-line'ish with the Cabal file hvr is distributing.
---
 .../tools/haskell/multi-ghc-travis/default.nix    | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 71b363b2740..90b61ec4124 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -2,30 +2,27 @@
 
 stdenv.mkDerivation rec {
   name = "multi-ghc-travis-${version}";
-  version = "git-2016-10-23";
+  version = "git-2017-05-18";
 
   buildInputs = [ ghc ];
 
   src = fetchFromGitHub {
     owner = "hvr";
     repo = "multi-ghc-travis";
-    rev = "03dd35f3801d6af4224906d45e982a748de9960e";
-    sha256 = "1s08n8diis22cafych66zihdnd5q3dkv8m6i3a2s5g5f1phsk3mi";
+    rev = "3e1b3847583020f0e83c97fcf4bcfb7c90b78259";
+    sha256 = "0hnwp9gsv2rnkxqiw4cg1vdi7wccajx0i9ryhw4lfr8nhkizbsww";
   };
 
-  patchPhase = ''
-    substituteInPlace make_travis_yml.hs --replace "make_travis_yml.hs" "multi-ghc-travis"
-  '';
-
   installPhase = ''
     mkdir -p $out/bin
-    ghc -O --make make_travis_yml_2.hs -o $out/bin/multi-ghc-travis
+    ghc -O --make make_travis_yml.hs -o $out/bin/make-travis-yml
+    ghc -O --make make_travis_yml_2.hs -o $out/bin/make-travis-yml-2
   '';
 
   meta = with stdenv.lib; {
     description = "Generate .travis.yml for multiple ghc versions";
     homepage = "https://github.com/hvr/multi-ghc-travis";
-    license = licenses.free;
+    license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ jb55 ];
   };

From 2b7eb321de0fb18bbee9ba7ab8122b27799f5e68 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Fri, 19 May 2017 10:11:46 +0200
Subject: [PATCH 160/206] matrix-synapse: 0.20.0 -> 0.21.0

---
 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 f6b21149a8c..39be4e8bdad 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -24,13 +24,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "1ss89dd4xn80y0zafs6dc9c24ba1kxk20jhjvqbcbbng6mlynj9h";
+    sha256 = "0mxgpfyh7265kh379hsb53lni43xcq9nffanbxwrg8hp8c79pcg3";
   };
 
   patches = [ ./matrix-synapse.patch ];

From c392d1f9c9e7f2eb0a36ba7da62321c86c3c14a3 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Fri, 19 May 2017 03:33:32 -0400
Subject: [PATCH 161/206] salt: 2016.11.4 -> 2016.11.5

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

diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index f4267833b76..7fdef68f30f 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv, fetchurl, python2Packages, openssl,
+  stdenv, python2Packages, openssl,
 
   # Many Salt modules require various Python modules to be installed,
   # passing them in this array enables Salt to find them.
@@ -7,12 +7,13 @@
 }:
 
 python2Packages.buildPythonApplication rec {
-  name = "salt-${version}";
-  version = "2016.11.4";
+  pname = "salt";
+  version = "2016.11.5";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/s/salt/${name}.tar.gz";
-    sha256 = "0pvn0pkndwx81xkpah14awz4rg9zhkpl4bhn3hlrin1zinr0jhgv";
+  src = python2Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "1gpq6s87vy782z4b5h6s7zwndcxnllbdr2wldxr9hyp4lfj2f55q";
   };
 
   propagatedBuildInputs = with python2Packages; [

From 0f59c9ce834f2133720bc6ca033413d8290cbf21 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 19 May 2017 19:29:29 +0800
Subject: [PATCH 162/206] libguestfs: fix build

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

diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 7902cf67c8d..73424902cd0 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -35,11 +35,15 @@ stdenv.mkDerivation rec {
     substituteInPlace ocaml/Makefile.in            --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
     substituteInPlace v2v/test-harness/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
     substituteInPlace v2v/test-harness/Makefile.in --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
+
+    # some scripts hardcore /usr/bin/env which is not available in the build env
+    patchShebangs .
   '';
   configureFlags = "--disable-appliance --disable-daemon";
   patches = [ ./libguestfs-syms.patch ];
   NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
   installFlags = "REALLY_INSTALL=yes";
+  enableParallelBuilding = true;
 
   postInstall = ''
     for bin in $out/bin/*; do

From 8633aba1e1915560beee92ed14800c3a3bba4b14 Mon Sep 17 00:00:00 2001
From: Andrew Miloradovsky <miloradovsky@gmail.com>
Date: Fri, 19 May 2017 09:30:05 +0000
Subject: [PATCH 163/206] dale: 20170419 -> 20170519

Includes some stability/predictability and portability improvements.
---
 pkgs/development/compilers/dale/default.nix | 22 ++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix
index 358bb060e48..6d9adaa1518 100644
--- a/pkgs/development/compilers/dale/default.nix
+++ b/pkgs/development/compilers/dale/default.nix
@@ -1,19 +1,27 @@
-{ stdenv, fetchFromGitHub, cmake, libffi, llvm_35, perl }:
+{ stdenv
+, fetchFromGitHub
+, cmake
+, pkgconfig
+, libffi
+, llvm_35
+, doCheck ? false
+, perl
+}:
+
+let version = "20170519";
 
-let version = "20170419";
-    doCheck = false;
 in stdenv.mkDerivation {
   name = "dale-${version}";
 
   src = fetchFromGitHub {
     owner = "tomhrr";
     repo = "dale";
-    rev = "64e072d0520a134b9ae8038104fa977776b6e0af";
-    sha256 = "1apvq3v6ra8x0sj8gg9yavqsyxiggh2wnh1zbw2ccpg723bssl4a";
+    rev = "39e16d8e89fa070de65a673d4462e783d530f95a";
+    sha256 = "0dc5cjahv7lzlp92hidlh83rwgrpgb6xz2pnba2pm5xrv2pnsskl";
   };
 
-  buildInputs = [ cmake libffi llvm_35 ] ++
-                stdenv.lib.optional doCheck perl;
+  buildInputs = [ cmake pkgconfig libffi llvm_35 ]
+             ++ stdenv.lib.optional doCheck perl;
 
   inherit doCheck;
 

From 4a9b30028d4acac2cab98990bb7d354be15c48e2 Mon Sep 17 00:00:00 2001
From: Lukasz Czyzykowski <lukasz.czyzykowski@gmail.com>
Date: Fri, 19 May 2017 13:54:28 +0200
Subject: [PATCH 164/206] bup: enable darwin build

This package builds fine on macOS.
---
 pkgs/tools/backup/bup/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index 0d60930b1fb..ae8752aa7c1 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
       Capable of doing *fast* incremental backups of virtual machine images.
     '';
 
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ muflax ];
   };
 }

From b646ead55794824669cff84c0bf4c5785ba316d2 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 19 May 2017 21:12:33 +0900
Subject: [PATCH 165/206] firefox-bin: 53.0.2 -> 53.0.3

---
 .../browsers/firefox-bin/sources.nix          | 746 +++++++++---------
 1 file changed, 373 insertions(+), 373 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index e17aa7f0cc3..44066161448 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -1,935 +1,935 @@
 {
-  version = "53.0.2";
+  version = "53.0.3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ach/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ach/firefox-53.0.3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "c41598e7ec66939c2774ec14d37b8574091368ca3dc854266b0a1b4f78e07dfea4d50106919ef4970e904e2b69083fdb67a41e865b4d3548d49754732233b909";
+      sha512 = "3ed2b420a4e9e1d05c4fc8750f0f426283a8c10ef914a163ed203ce65368bdaf11191151a17b0a5efcf80f7fc5ca5d910fd58e7afabe650328792aae36e1ab52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/af/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/af/firefox-53.0.3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "54ad5d661a25cc93e2100a5a14e0a5261bff82bca81d8699258b1ab72699c9638e1ac32b1827e7788062849b33b3603af1162820770263ff4d5e5c65db092ee9";
+      sha512 = "e3fd2b922d6371ac4908dad8a18ab5fc2a331f6f07b369bcd25465f958c6425a61a737b20b490a59cd27484fde718ebe5139c8fa5149ea48d4a47d7149d7ee28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/an/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/an/firefox-53.0.3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "208b3189db2a8c9d00fde4e841d8f242c2f56f3aa976267a0b410a44fd9a02877c2ae69747f581e1942cb3883bd3db619a2505865bb7fdf93801a8f425d2f096";
+      sha512 = "ead664ef262bccfed1326f55df271afdcbcbd1e172dd413c0488b2590a22ee8ba828d4e78df77ce7df3310b0e6e64cc446775093efa858baacee88f5a986901c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ar/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ar/firefox-53.0.3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "3d2a4a2c4b446a0ca0ef1ce3d40c39df1005d4bd218d820e9af30cd0cdfc0bd524c34cd9e49314b505885ec2aad8cf99ef41516a4f1dbbcc2480c2f4ab0d6232";
+      sha512 = "a4a50be0ddf294f11f083956583c0ad2e2475a77d9f7d93669ef0fa9b81c11a3bbb3ac3531b213ebbc0be1ab68dd8c9ccdb1d6308eca91b48de9bd5712ac90ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/as/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/as/firefox-53.0.3.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "9d30039d84fe28a4bcba2454d7585bef910a8ae42e157a2d46416a30a3a1716a79d53422d6d72ce2f0ef40560eb8e6cfdc364b1ff429afdd1798deec9bb07c87";
+      sha512 = "93260ffc4f050ac7731771e07b84b749e7dfa1b5ae44daf9e2149e794220911805837f56a47777debb5dd321a50295723e9c6289f02045db949a1e5bc773a3da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ast/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ast/firefox-53.0.3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "893d2df74e6b80559fa0c1df553bacef1e30928950232344db5fcd2c41d885bbab9b9ef6ec4f9889e0c0371a4c04af950775736845afabf646a75f7f0722c4d0";
+      sha512 = "f55ef36a1985d30852b84b6fe0255534c1d425e54dbfdb8a50c538869cad59f8a9089f0129dfe61f9c2f834c560050233c9ba87638846eb833d112516273c54b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/az/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/az/firefox-53.0.3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "7dc712cdfe7ac831aecbac76aa1ee724ab6177200cc3d0de3eeb4cdd6add35c913dcc74ceb35e3f43752207c91891d3510adab85395e3132e5fe2b162ca8e9ee";
+      sha512 = "0e07ad2848c0c2f45fa7cbaaa80ccc505458766dcaff7cb9bbd060c1a05bcf6b1ca85e602a78cb6cb6b57b95c7b49df374021a2ac429a4e8f99d2b08864ab215";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/bg/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/bg/firefox-53.0.3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "8486700e1eb12175c04ac3b57eee5b6288ea77b7c5c52f41fcfd133eaca66b0aa3254cce9ee06cbd24df55419b92b2b7bcef4fae8f3c6424fd80c9f16d980620";
+      sha512 = "a1d253a65f790faf026dc4431fc090677a001697d575c172270228abddf29a3574d2a30f519938b1a950b2f3a3bfba8efc5218fea90e5a9d11c158a8d1dd6491";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/bn-BD/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/bn-BD/firefox-53.0.3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "5364241e97381d6c4c675fb5b1e352f01173653a29bd9ce42a2fe4f3afe8e81d6da57905f0db2b395b40f594370f0c6299d0a7c4fe9113cca2480091a182a0bd";
+      sha512 = "1a5dbe0fc52a8daf5c13b055b1cb12bf7eff5b5ca6715abe78b6ef1093efcdb3744fc268955d62258a7580b2bd363435bdb289f9db5c91eff294736b272b20f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/bn-IN/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/bn-IN/firefox-53.0.3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "878e9cfe6051460d3cb0d8a3525083561c081bcde7add0eeb74da70b944e002c74682520c30debbd5b49eeb75c02b617ef3f6744942284f13bfe3c257e8f2f0e";
+      sha512 = "487fc98d5a1b15344287e8088053c43a81633ac4a6b567c41fd4b15886a02830e12dfa98c673f1076ab5b90e1e7ceae924e28415913a6cfefe6599915177c17f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/br/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/br/firefox-53.0.3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "b951465b65ac6132d609c3e8618bf1e832949338543439e3d95d69d2fad37ed1586bc3c73ad9dc37fb6f44299fb836ee329db4d037a43494616c787826f4617c";
+      sha512 = "37bca2e9f120ab1a491ca318e0440a3704b4b1c7d01c7704af5ac3a32295b0896e9944a8c41e01b6b4a7bf08093fa947376f69103abefd568d3bc4a78991958c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/bs/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/bs/firefox-53.0.3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "4a1874cd0d7795158dfc19d838d7b05dd103cae767f28e66f235a5a76c0b5a116042477ce970d34f4db3b4d583e6b8cb440ae18eb504d4a0083c903ef18ca3fc";
+      sha512 = "0f2b0572d5f77d046a095e89e0a449015ecf0bb6a4ca38573fe20aa2ab2971c7f5f38a7efc5ddddb84cff5758c4b62928f369f037841485d16dc79e1c660b233";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ca/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ca/firefox-53.0.3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "118a4332fd94895c3db8f4d92b76a51b47257add34305cb16cf23798dc47fc9fa59ad48adf42ed1691bf468dfbf33f9777417776cf6709d3ce71e5c90e504aa7";
+      sha512 = "2380f8a53e96bd7ac2b366eea27483d181c347bfdec3ffdda9e31b487bf93a1ae80d950cb5321c6c76bc8808e03feb0d3eeaa466f6168c7f4db5cd358076ec28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/cak/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/cak/firefox-53.0.3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "34d316be2c15fb84e7eae6fc488868d5810a1a0fd55d315a9ed33671f0817aea995403531df606063fc71133f1d624a7359571ce14953a000037d2c99f95fd66";
+      sha512 = "df86bac5a6fd67c3bedb9a04ba1f1de27090f58dda3a0e1b5a5d23569e610d1d16a1bbc5c9d1d068d73d6ab0f87f24d819293189dcf1e562e58772f63ee7a11a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/cs/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/cs/firefox-53.0.3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "801a20976aee31134d928a71929247fe8dafa35d7aa937774e3c097944ac6514a846b6fb2c103992e804cc21a95993b9e8a2c85ddf0c2003a2275d593b8cf246";
+      sha512 = "6d17878babeeea65e7eb2b32c44b13700b2a294eb75116e98e9b4603c921614cb5278142cbafdbbdac5948f33e5381ee266933beb53bba1cf76152a60c402808";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/cy/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/cy/firefox-53.0.3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "7c29b00887feb28ef0c2df83a70c4838c7f8ff177294f48653d1d23c2b4c5982f748cd2c0460565834c027b974bb3a7b09df0a56ae5ad641e3187bd0b6ecab36";
+      sha512 = "9088b69d9bcad59215fd64905ada085f9b5f27c850e73174bccc9b6beb99d7423d1b688a36e82dc4fb4923e1fe3624ac2039175a08389f1a3459b856ab762f9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/da/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/da/firefox-53.0.3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "4f4f44ee3c8448a9c1db802ab1516f30c4dec807ad2593ba627c267314111b8131a50e3945e9ed1f8365f2e79484aa61b6ee6335e383954734d5577e8ac8bc61";
+      sha512 = "4333533bc2496b5059dbd0d727de207419008d5e1a45855504e602d7351d27419abf0a82b56004a35fe6c104370c44eaf52d240943641a07bc281d23f3294fa0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/de/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/de/firefox-53.0.3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "41f09a17b10fea4b37a1fd9fba564de47bb56df414ba11a581251b6ea0cd531236f7d127b1e7b249d7c65b9f5d8f1261afda7782583cc78fe8b82c64de357229";
+      sha512 = "8962dd969b0f6e4c03d52dd222cd1307d838ef5e03d938852e11ed3ba0df4578f1fdcce0ab560772d1b3810982b011fae9846bb93f723be1103686012447141a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/dsb/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/dsb/firefox-53.0.3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "aec9f19e991cf0292b98a8112509fb737b8eb7bf446435641cc9a758b4c7965c613a74c0806bd432402481aeb6ee03cec930f8134ea6501acccffcf689d003d7";
+      sha512 = "b33a1fe8f235d6522345bbbbcca791036236c6ceee16d42883830048f866b1bd816d4f065350cda7fc7be2f0bb8bad1a37c455ac3353b8db7aa80e8bb3921c30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/el/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/el/firefox-53.0.3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "57fe8cba44aa68809eed40e3f6fd9fee2612198b1568505cbd9fa0475a4babe4d9d6cf4f5b65edaaa43ddb59202832e4a59dee75d4257633f510b66101019db9";
+      sha512 = "ff32cf67e9d5e424fe318fbefae5c10fca855f8105b3a0ced52a4a894b76731fd8e581ee9835d5424e3a08aefdbb4024fc94f02dbaa1ba6beeea0e07dd67e22f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/en-GB/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/en-GB/firefox-53.0.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "86d8b0ae4a935c06da4b2459fcfaa837b3b9b5aabd82426d3db9e37a59d00ff1d2aa943fc43c2342cac2654df02dfaebf6537cc9de98158cf0b3a9e7f06cb76c";
+      sha512 = "863336e62c3ef2e99babb2bd08a57b29097a9b7fd8a9b5a790bb7002a6a6f7cdc29d921783845271b7602af6a40c8905c3b075551f0a5e73887177417887770b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/en-US/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/en-US/firefox-53.0.3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "3d672bd7ef62b4fa6cdf9ad77249c7c05bb39a6eeac785baae609db8f46a0c82d6ab07aeb3cb5c0c8887c11708ecc5055d18f7524c89dfeee27162684a7c3383";
+      sha512 = "57d31466390e60d45a77ba2b41a78bafc17d22c4258d184252993a9a1ce9334988cdcda45fcec43afd23f13db5438d04d795e6da383434e434c1b426c2f53362";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/en-ZA/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/en-ZA/firefox-53.0.3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "cb95aa1322f5f43e0137b6a78ebd1ee4a7edf9439d1cd714374fc98eaae83a46e42419882af1496a6d33b78121312619cb2e1e19ded3b3c9463efe0ac60b24de";
+      sha512 = "3283d2a67baca3e552a1c7507e4ec3d36679c61501773d1ca2c8d7e972a864c59f24ba29895e0ccd11eca0ad335f4a47ffb5e6bc2f1282c451d1b34aa306ea0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/eo/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/eo/firefox-53.0.3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "00c0f95289dda5a82919f57892e33c2a1dbc0cfcb9e9f93d63fc494a10f8396b7fc2ce9fa128d8b8f3519eda95d8ded06df65b4f4bd4ed92ccbaea4680943774";
+      sha512 = "a708cd2f3bbdabd87a07d957db31dc2fa7bb873f50f0139b5feca2d95b9ad1424ea0c809d194dd38cc0c33170be34dd4ddcb1fc1da52d91bfb1006d066b4688a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/es-AR/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/es-AR/firefox-53.0.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "7e9aa2ab1ac9c43974079d46f46fa3945a7aa388e57e2a2ace6cb4279544f896ae6e4a9fbdb74f781ac8dd54469fd0dea5e7528bac82da82f998365a2562d1ba";
+      sha512 = "ef930196f23ef40dffef2bfe9772ee65306497019200b8932865bd03f2053069c02a08bf4857bc291e7d3d6597dba7e90c82a15cb33eb99d2818a1ce5390879b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/es-CL/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/es-CL/firefox-53.0.3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "769badc85fe0039d6f7ab14b16fa8cded51a2a822a7d4f647b910380ca7e9e36a3312b1b71f1cbcb606228bce334f2775e81d83013fab06eabf1394839fabe6b";
+      sha512 = "6f16598409eee0b14c98185d764d691c31f1da63a66e0be70261227d5c7739010964b54ca42dd3aabce0ae82448a6839b8abdf5794a5bed621dab269a3ff5866";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/es-ES/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/es-ES/firefox-53.0.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "4fe46829fc8f889a479f8f5fb686905746b0953ce8afe38b8e787e5132a623666506a790879aeeb65145c6e759847c449392c668784ccbe21e0939e1e3524742";
+      sha512 = "6e6a5f74d26cb0b53a53e1a600ecf34efeeb79f56d36747116e11ab25a63c4b48bab7c7d57b2cc8748297a1b106671367b4ed463f56978a4142f830cf1a2ed9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/es-MX/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/es-MX/firefox-53.0.3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "ce5da1141631b027b788881430e36f3a6833e56c110a5e0ac7ce4c95662d7feb3eae3e928024cc9daf31ffb460316f96226a13b4d6bf45f087a35568195b0178";
+      sha512 = "3b5eb1e55060caa77c86e56ff11d89435b816e2ae0b42c3059be5c0f50f3e4d3ed6e818386cd0ae75d00fb0e6541df0c3d3cdb313237d504df48667818f3a204";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/et/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/et/firefox-53.0.3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "bd752d6d01236e93d29b4dd605f6be724e362ff9dc00e15356f1685e8dcee4f3a2dcbf005f9b7fe819f33575a2662e9b261c89ecf989202fc112b99cde095265";
+      sha512 = "7d1bd7e1fafdb2f58c09ea30bfc52ab233ef744465163fb39c59b2481090c1e3d3ed6d2beab304aa6d2784ee4240c7c9f13cbea787ceb505ae7be369669d785c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/eu/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/eu/firefox-53.0.3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "a728bac7416e9dd0832c087e906530b051c0f945d076665c1d5c4e3b2c0e0f46f443baf2467a5affa828ae3eb1cdd1d7e98d6248052d9bf5583d6a47db20f8cd";
+      sha512 = "f8829234556a6fbacddc2e5702c9ece833414eb480421e6a6820ac854377b5d9a7f704fe8e9f793b09598695e8cfd256bd0dab357c81d6530a2d7fdc1934afbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/fa/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/fa/firefox-53.0.3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "ece7d2194351e170907e288d90462b086a2cabdcdc29dee7685711a143e22cabd5bef5e1653a9258a09e76f998823fb8d7902ff2461a203ce79b9828f05749fd";
+      sha512 = "40016acde4a5cea189fbe1abad75851e054b69d1446216fddb553151732466f48a93443d377b989e0092cb01276a45cee56436fab5275fac84f4dceff3f93225";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ff/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ff/firefox-53.0.3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "0257cb7b0a68897d4e8078c7923baee96647fdb6c3d55ea5818e9ceccbe8f66d71dfa2244dfeeb8d05d18c119c07f962953ad584331afad11a70c38538712e44";
+      sha512 = "5eec968da6bac4064562309c3253d2e57999399f241d9e59c83284fb6fb35e0619180e1c41d1e39c9741037d3419d6ff7fb2560d2c5c1b1eea33d56494d52d1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/fi/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/fi/firefox-53.0.3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "95b6d417f7457f38a7a70097cf4984e0870bd512229de5faf0ca4ccfd080e7d1eed8e6bc687de6ee6ef4e941364962fefdb89237b46a05f093a62459b1766d6d";
+      sha512 = "f90b091a238398259972884fc759c48d5aba51b4879dd70595139202119eb8982a51d3c6c38ef5efcd1c7774a27dbdfe95243e7f22ae62c510c41131c77d4c07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/fr/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/fr/firefox-53.0.3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "4262e0c9d57be49a573fa0b9d04c29dcdc6dc96370f4847380070100299845a0b708fed88f43f822cc8346cf71488d9d1beacec8044a3e569861cfd4ac18a877";
+      sha512 = "18772c36b65bfbb383b1b953e2505275bfce8096278ef9d0ea31d421368bf5d71d48b61b15c0c1de603439a584656870292abe46a37a3a1e6a6630b759fa7c4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/fy-NL/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/fy-NL/firefox-53.0.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "17b4a6a822195630fb184ee1b1512fd4c1f1e0ceecde55309ec65ff095cdb0671d2ce8b634403531f5a6465d24289989f140f002bb3de9f02e048fa05ed55a99";
+      sha512 = "3cde666bb2f708450e094a20d452ce4b5f1e69f345bde017c2d61bdd5dbf90172caf2f4f27f2dfae3a68fb27edf11beb0152fbaab981d36d34e0fc96b9b09801";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ga-IE/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ga-IE/firefox-53.0.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "be878431ab250504dcdcab9f75e30492150c67fbdaf85d44467de5103e65d888a2e75e7e7342101b0157d6bdf322990123556f16d4146447b6948ffa7a65033c";
+      sha512 = "02324de8476db9c5d64aa04e7e034856495833f01b115e1ea8a9063b778e74e19350f9352f1c0d544837ca7970b871525d28785af54057064fdee9018eae1d38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/gd/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/gd/firefox-53.0.3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "b890c674789b4a27aae2aed9de983f9490b3de58bd0aadef80b0eed392a2c330bf476f54acd6de1c4d223e38566d4ee086ab500abf97032abff24e4519f23bd9";
+      sha512 = "d08c084011c92b161245587d1c01870332bc82c3f032dd2198849f1a87eb31eeab6daba435193cbc2ccf9086e0a3008a9ab50c5a938260ae7c14730f60608d8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/gl/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/gl/firefox-53.0.3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "4f21dc22d2a2292c1647faad0e8aa79c8540fda5e3056aaa5e5413ca901ac5b5ee29660d143167e3867806fc1ed28e3ddbf34db4a124d7c23af8158c37fb3254";
+      sha512 = "fb9cc6fc39708c04d7581879977de4f4070f7766e8050889302d9cd0c4faaf0b25dfc41f46f7ee380f416bda55deba0b7f9e6baf69a8d9abb643d60ab009d57a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/gn/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/gn/firefox-53.0.3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "8c8492d72d5233e903907686199509f28041c9b2219f318b1531cd272c6e6a5cd895244ce3cbc30955ee5d5710dcc1fa9d1322327d3916d5342b7270d1fbbe00";
+      sha512 = "b836aed3b5fa3cc5fd4675753b090305d195bdce97de29865eba72e7f5faacb5ba21b0646d9766f5545151650157e4bd5a6e0a6f43c6fb452ee590fef886ffc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/gu-IN/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/gu-IN/firefox-53.0.3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "61273cbe0a77fd5041db324ad949b8969902c7845037ee11de1f06ee5e5c62442f2ebe1f2a0ba3839f72d29656b311cdf392d0970c8a8d5050626ba8dd602e08";
+      sha512 = "2c2325aa1f52d3e5ca639d95f76fd7671805c5402ae9b943f416260184bc03fe087f2186f21b935e12c0669720bbad3aeada2286a6c77f06ff76c0663b86954f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/he/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/he/firefox-53.0.3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "cc9d0d4f692201e56a134d078557adb71d844f65e15cd5804b90f2e3d5f18701498bc60ce3ce0abe861e13b77c8912a551523e20c052fe2c58713bad2ae4c5dc";
+      sha512 = "c00eea318d9e96e3da14b815f0dfd75aaf196aa2623dc7732ff6dedd911329445b4eb2d2ee2fb0004a68f461c15210c2b1f867d41ecc808bba21cd5db7cbd790";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/hi-IN/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hi-IN/firefox-53.0.3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "7fe1b7965e8e36f895bca0bda78cb45a7b828d6e1d9db3052124a1e7f727bf738e5a6a51568c4b74cfccdd58c8485c33f2c9c07132dda87d7d6acdb3683d9b1e";
+      sha512 = "f301e9983fc30107dad8ba206ba0ade4a24d845395333bf7faeffb1eaf688a5854798ade11692326e14a7107d407542199cf3db4903c2fbcb3a20bca29e31e0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/hr/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hr/firefox-53.0.3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "d67bfc3cfb9b803fc7189356855174fcb0c23d22cc85acc4424c55db9f2e2c6d4b79fbf6aa046164af36b5cfee5b4b11c289f29b54f05fea9b859cabe9923d43";
+      sha512 = "931681f57455ef67512d5f68a8c0b2284314dbff1e7f5aefc7d08048ff4efc083158daf6c4b41310943063d91afcf15f952b1b3a743ba18158b9a88290751b2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/hsb/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hsb/firefox-53.0.3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "3e6a07d23815c5048de053e69b0e6f55cf70713c4b389f1e9cc36ee2234a498e0f5bd07015343f7f070ddb196b9402ca3836a031224bf53a0dccf0c902b8888f";
+      sha512 = "840e9c919251be5f31d692ceb111272611c7f4b468304b643580b0b4b12baa54b1a2e2f208369013854f145bf747aa326e4f2767534e49c27e62ccbe626bf8d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/hu/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hu/firefox-53.0.3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "54f620c88fff02e38a01caa3aed92934a2b153d56f00cb845944e2a34fb8fed2c3080c2f5ef8066e4923d396c10a9157fea4cddb89b504ddc09f76f8041da6fb";
+      sha512 = "05b04d6ee4ce2c0999397471eda64305afe5f5c4d714a404f5ed98f6298d77599cb7c10225e876559a790cb37984db5a3a1fa31f3db83adb04f505f46eca9704";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/hy-AM/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hy-AM/firefox-53.0.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "ff3d40b1ed5fc58495dca2f232f93aa53b55a7570526b57734c082a74d56aecab03fc72ac8e819119f61774b42c9fb872d0e776ffd8aababb94d8174ba7adbe8";
+      sha512 = "3696cba2a380c8d0b1a2c116dfac8dc3c3afb9f28e0ba5f03b07b52f23c52d5b6fce293b3c83d8ed041df3a2f4f9c387113753387e1ff94a2854d09284a322e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/id/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/id/firefox-53.0.3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "085960896ac7e3d7d793b9061ea1a95a0a43f1809147232187b97fe16a5661522214083186784e500a602aa8a3f44698545b82d54a640f63765d53e77daeaad9";
+      sha512 = "fda5ebc2e4e0aff27a3ed719fa9caaca3d622221b9288d4075e3964fccbb3efca312f0cb7c36090474d3296aca6944967ba9fce7446c9bc33d82c5518ad182f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/is/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/is/firefox-53.0.3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "b7bf680a1b2dd6efd427c79477172a7e599001b8cdbc961b0c3f08cec3a4ed87dc7ab3382242720580f0f2266ddf6a898349c7f4062ce59484092001884cf27f";
+      sha512 = "4c106cce385024290a02953f793caa5f28b65b9a2369ee9644d64d3f547d0c4fb6a9e4fd4f2a03337b8c29e5559c1df7bec9f6138b74fb199a0b259fe599b493";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/it/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/it/firefox-53.0.3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "669ad672b1b033522b3fc5eeff0765959a6aac576cc6eb631de6e1f2f528842cecb620459db87f2966f5d61888d07ad3ce207745fb9dcc06e7393fa3ec2e828d";
+      sha512 = "bdf7c1f37b60ba514ff5098917f82dcdcd96a871bc546f9aa951153e8c633fd218411a2c10481c6d0f1a02b22db10b51751ea9c5a954155ee7fcc43e2e160b63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ja/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ja/firefox-53.0.3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "868f9f5eb13e6d5b6c0737232b38e1594e0b8484c1c16b8d077354a6342c60e92059c4223d4387829305d91a48a0dc9bd47a94d71ef569dffa2464789d1161a7";
+      sha512 = "09b741a0edd5608f96a5309167a5fb082c004fc2c7ca6ab2a9ddf8133d106563a942cd3763966623f2e98407375987071f8fe05e8132fbb28fe68589e6c1ffe3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ka/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ka/firefox-53.0.3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "bbee1307f89b1098f05df946f18e79ee648e8f9725d0180c5ff870721e81e3f0660eed935f782ed5cd8c71cf2ab35181cdb45a7dfe53acc67e3e6ea49c05c098";
+      sha512 = "8dc9a1fedc8f0a4fbb7b85cbb1f2571f13d6e1e3a421b84b6efc80a7ba69fce43eb11e9ce2b5969bde8443062340515e875ac14246905421b4832c771277125e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/kab/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/kab/firefox-53.0.3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "5589b35278a281f2c18c29ba0bfd01fd701ef89d4ca2020d98da906484632f1ec2ea576b59f833de3cea8a53635e7b50f3497c283251c9a6966d7b40f867ad90";
+      sha512 = "63db0e66a5696388887077b8666fbe4e9706c9ad05ee3c2ba5e7fddf8a861ba03da3ab2fd80ac005595f59ee3d5f0a85a7e38e7f9d8032052ad1d56335790c2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/kk/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/kk/firefox-53.0.3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "98897ac2d87e6cac14cc027f5c4d9f9d7f7ae4c50492c0649ea6450e3fe2d537cf3b7779c4f131144850c05b234ef5bc882c34c21b41cfde73036bd8321f8875";
+      sha512 = "a9191d0d3ad3f42de52cd63631acfc1829b5cdba4b92d59d6966bc9a0ceec93aa0d1fbc258310706c9993df51f5a917fb781f936cbac3a1d1848de281a00eaad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/km/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/km/firefox-53.0.3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "9b0cfbee863bc4e46d07b5f0825b6e1bb23e877396d57c8d0163118c16b6566b4c83ad23748b948b490af1ac193155815b3124ec4fdcd4fd8d2d330d222b8421";
+      sha512 = "3ceda47889de3f7041dc0acda2440ce25285aa21a9d4323da8c50d7e1c3abc03c92806195afe25e8f4998a97d481aa8be3f0761b679795f57eb2edaaf1b92092";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/kn/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/kn/firefox-53.0.3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "029d72cc08c35fc922983043505fc0ee57c4326da434125c69b021b439fb63c9684117e6dfff26894c42440a355a3d23159f41e2a793bd9960acd38ad15838ad";
+      sha512 = "fecfd001bebf9ed11dfdbfaa96933eec721a12d213fc5b3e7f115cfb8de27d01792662799856ba26d2f3529d10a8ecdbf08df33124c7f60c18c8ffe45e35994d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ko/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ko/firefox-53.0.3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "bd81a5f91d7a7cb28eee3e0c592588255b6a92d7e762cf907253dc5be5b8c2405e4e5e6b5a56a89a7f73b6bea2bcd2ebd405be7e4379d13a8e5203a6b130339a";
+      sha512 = "c863345b98c37662b8848ddbdd3f567e1b14ad1c303fca517918126722c7819f57ee4b4ab7e222c1e7d84f7b04aaa6bd7ab1bc1e68df27086ef48b785c3d4047";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/lij/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/lij/firefox-53.0.3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "c98eb851a39bfc6fbaf63926711f1e24f91640037ee09c85a172003dbde446e5d4dd3fa63ab72d5c48895ee189b3ae81d24a0520bf8391b0514a595ce1fcb9f0";
+      sha512 = "5b0d6dcf400e32d51be63feb5fdb0d8161ce4fac9ebb2f6f2f70dac6d3df052bef7aebd25d53f79db73589e48145945ba2671bc0a34a429822e56d9913405136";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/lt/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/lt/firefox-53.0.3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "2f0bf399dda75ced33bfa4304543fd9b7deb28d21483bbfe85062238aa1bcb402bf00521a8e031314c10d5056b4afe0b2b0bfc11f1d5670ab0249cf7354e0f66";
+      sha512 = "3d9bad39dcd2cfc80fc16c7a443d8553540b0f22d712f6ec9a6b98de988442e1fcc3a57b1424ae784ebf5dd9e6fffe64b9ba6afbc09ed8942a6bb7f8b4ccf805";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/lv/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/lv/firefox-53.0.3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "b288d3ead6588b3e1b9c47d3ab2290e66394f2da85e6e811305d0d9f7a5eaeebda63e364a3fb6c7632a3e270ff88f6dd243fe58fc69e1411f4246d2657872fd1";
+      sha512 = "d2ae12c346575f634801bbdde46791cadf0002508c210fd76970201786aa849e18abdf433ab3917056c1b7d61f02aefbf7f43bfa940dcde76ee16b1cf307beb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/mai/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/mai/firefox-53.0.3.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "6560693584ce7ac60cbb368228fe1d95bdc258e098858546353718bcd44911b549857c5d44e01f8144824731ba377ab345df2112a917792451f0b054b50f09f2";
+      sha512 = "5b60c10506d243bc557e791edc8eb92830346f309a514b98d42b75340e330367eae6566b4eeb20d4c7e63d0cab0f74686ccdc6eea48b816b13fe27e7f311de4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/mk/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/mk/firefox-53.0.3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "78260740b8a961c8cda988bbd82052771dbd7211412ff803725c666b8a264a3e783b68b432fc89bf5c54959aa75bdfbf11045c2175469059e6ce26a0859e340f";
+      sha512 = "44636a0e2b9424ee2fb0db99d2bf080f2c1d5b5c27642486bea11d70c3db41e9013e6095f502c426c3ae22bc13cdd414f0561579abe08e9f81324125cf2f2b70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ml/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ml/firefox-53.0.3.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "42b8428a873ae20f868f22e1c45e4409e4e1538700bc166ff1c3f4888be68d7815ca5bbffdb97224d0902ee469733cc367a492c98f2d62c60872904d24ffb217";
+      sha512 = "2a1d4a1890ba1dc90e79a92589b713fb1b0d3485af70cd37a04e5e75cfe5d5474fb98e1ecb18c819570e7b1b2f9796a8440b08b0b72c38757f5399ac6644d54a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/mr/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/mr/firefox-53.0.3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "850fdb89d2de2ebdb2506775987c8ee3eb14e6a7372594112da1abf7fa2d00812518388ae06063af467c2de9f0c1dd6f2a40615f9423d8c0683b78601bb4273d";
+      sha512 = "e637a7aeb70e77299eef5dcb351822158a876d9c09eb32baba0e3d48627114ad3f2776d0fe58b9b1979a2ac49b1930656ce46877773fc0981c39c114c0bc7464";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ms/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ms/firefox-53.0.3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "f45db626ccb2a0aab7998dea85d0fa2c7d5fd136336f50fbbdd2b7509c483087a680a9b4ec5263646a5130dcae4acbc362729c03f1def4432f4c0c28c25f7e72";
+      sha512 = "f112dff09f6589982d3ef7f9861302cb161274f9a54b1884955472b0e4032c5686e6e459a925bb34f060e8fe820ce012d7ab2cdf11181bac795f58a379499ccb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/nb-NO/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/nb-NO/firefox-53.0.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "f90d06502a7d94ecbe9102b03257ce80eb1fe89f4883c3376c570f882bd0e18229d4a9f5e6f3e29f066298e9a3d41d5eb193318511b650bc3cc181686d6b47e9";
+      sha512 = "121ccfff0492ee00ce4934fe741247a663f36bdbb65944d2f21fbde45d7f5dcbbc42d1770b31d5a23d3369d3e6959edfd5231900ed8d905ed55c43e0f528f1c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/nl/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/nl/firefox-53.0.3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "cabc9efbf4e9fef178b830a6ba0fafd080d8ef053c2f1e665a72cd3ef4fac2f2d221311417c21c287531bd28e3ce9d6a30480f69a04cbf64170802673d1f7409";
+      sha512 = "c74a422603fbfc1afce6b5bf3da5197a9a5b10c643ada427a7833e7331c1a307212960b6a8252ccae876a33743a0d14393260bff7914f7527bd1c79868618d00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/nn-NO/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/nn-NO/firefox-53.0.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "8f9ca72e3bbd576dc5b1fecbf837624fd4552634cda8b9c83a3622246d33b8268057b5d93b30dd87f7198f651811247dcbd020dfa1ccc0814940d79b4cf9c70b";
+      sha512 = "da0e91486235f65ed42a3bae7e230313a75020e3d0f0da5c10822cb91eb2aa4db2566ce33149bce25fdacea768f516e45ae6b5cd071d332f94d6ee2d3ad7aa3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/or/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/or/firefox-53.0.3.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "04054521630f7e3aba5f339f39d165a26d1c21e978d2ae5d84b4a5fa1544ac371349b7e1a3037bc7f4d52b789eca580ffc1503d185cb5c848908dcecd81aa90a";
+      sha512 = "e47f99475bd827edbc4bd79499a481333823a138a4d5ffc105105e3ef707ace1c695db0d4d9cf4ed41f8e498f6e1152d8905e84ea45b7407c4a14b7bc7668833";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/pa-IN/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/pa-IN/firefox-53.0.3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "8a119d580a1c4ef3ed7125b72465ffe1bb45538e299695b284d411ff8003319bb3d2d94dc3933fd1035ab6b902f27808a9de538f9868ec9db6972593cbefbe5e";
+      sha512 = "e90471400caf622d690c0b3bd7abbb55094871742a263aefe89a83add637459bb4f004d9bfabac7f32258f77123e5a85bd414fe56cc286a2eaa7f0342ef8e46d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/pl/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/pl/firefox-53.0.3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "9f5c2119906f05f56affcf1fe8c2bb19427a0ea2fccd27c0840b1df9230472720dfae780fef0ac0e87c0f8b4970ec50346964824000c731191a3f3dba171288b";
+      sha512 = "ae97799d80447aa54c9989780fcabe3f2840bbc1bcc9ccf2378de85eacf5957b99522b345c528d751cf055ce04a90bf206da3f53c55ff704ad8202e6f0d298e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/pt-BR/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/pt-BR/firefox-53.0.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "babf4496784ac2719381350cafcbbc13f633f6f3817246d0e84adfb943ed3fe46c98416c15a991a170a44139f8877a55778448347c87a0875a87121029240e09";
+      sha512 = "7fe17634ccb071ff55eb49c63cfe6e0fe7ad5b65aa158bf64d8cdaf4725fa54feeb7c5546c057f5f73690cc805637d6149e3ca938bc31f1798337f69a79eb0f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/pt-PT/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/pt-PT/firefox-53.0.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "1134100490eede87a5c222fe49ba32e16507bd1369c5868aed674e4c454adc9c12200ede6c1c2c7a39a1e806688c504f4ad3050d861bc5143d25f06f74a0218c";
+      sha512 = "50d0597479e726eb8342eb0ff41be5130a991cdeefcf0a020e46fff70940bcd4422ed9cdb12260d9ccb91ee04cc2cd2d3d103aed6cc49f4ebd40270fd7180954";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/rm/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/rm/firefox-53.0.3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "fce2d515ec7a8c1158b01d0204ab4f3f12b78d051001418d19164cbe2d105613f1bb3a4c3e83904ca1ede0abbeebf15a85593882f5c182e892f9b2fdfec6f444";
+      sha512 = "5a7c05944c5cd97cdd45e467244cfd0118cf960f8353d34746463eae627a2aadf298097d97f5545a570e7a3eddfaf2dfb02541efe9cb24fb36b8bcb3d1b8e1f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ro/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ro/firefox-53.0.3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "ee85146cc481cbf60fdaf70f985230db47759c4db012713051b227d597d3f03fdbc65acfc9f106c18f1fb079c0327edf4a474d78ce0c4ac9827a562297e6c845";
+      sha512 = "daba193469d8114eb8b6fb85b0f79ce7b7a9a6f61b34bc6debcd9ef5254e0f716024cee6760a3ccb2fe3c0f0e5948fd56753e0a3036177ea4bfa3c3f11c5561e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ru/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ru/firefox-53.0.3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "5383ccb011599de8c3a46a1e1d19035083b329ae63b27f34546a99d31fd65f14480faa49c29a8a5de34a68c51ac11f2c9e2501995bfa93c8b941b4c9e040d4e8";
+      sha512 = "2421185e831ba4720c01f471fc919ffefeeb5684050834fcc039da0508fe71a2a3bfbdb1a8968d1dbd1d282ba6b7075a8568290f32adca9d987fe7c1cfe83a4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/si/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/si/firefox-53.0.3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "f776882a300d8749b7459d094560bf04b351c945f6ec2343907c9e9a38c1b7148abe64ffcd5b447b7825168116a274946344c7278161522ffe9a520e95bb9bf2";
+      sha512 = "d8ece0794a893d1b0469203084720bdf06c8e68c31ed9c84c4f998061c310460849d979c7cf4d30a6e339ac05191a5196c280ce8c734378082b629090e2c46cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/sk/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sk/firefox-53.0.3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "75f6d7aaac1228ec3458b09a18f7bcfca51198ed52c71556829781765815a512306d22c17c4462c0475d5034622126cb89476c7df3ed228e35724399fa4896cd";
+      sha512 = "9ebd01ceaee3927a4a45e0add1de69b2a3b142c00a3495488f649a56884b503235ccb67fb0f693c305a5c5c13f1f314c3e9ecf4a7d6887ac6f22f14186ff9508";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/sl/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sl/firefox-53.0.3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "18c9947fbae41dcbea389ee0ed5c712a8fdac309d90d2641090cdb7d489ff1e6a3a3100dac4edfdf1ed8f5a8883036f71c42b7a0b09c2d8054aed320d8ce87ba";
+      sha512 = "9517e4379531feb4741e6f679e8e7e366a75c61fb9f47885ee7cab83446807ec91519a2829e2cb947d0816b5801788d21ff7d4c17181403703aa26c849d14e89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/son/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/son/firefox-53.0.3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "00922938a16627a98a73e6c8142ebe911eefa9538be4617683ecb7a588eb29364fd509b9d1cce62d3107d357680535a5497c523e121588682cab31ad6af0f019";
+      sha512 = "1f3ea9241c91249f7dd35da0ca27487a844e9902fc6ca567bde28306f2556448dd32291bfffe3567ccd12162dfc92b06c26b25cbd1af8565cace2934993ea358";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/sq/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sq/firefox-53.0.3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "0d65960e38bb9ae22943720dfb36f212829a12a0b9ffde682b3a681f7a594280dba7f65231984060b5171d7e5e26c605286ab78a0702b71c1396023141783747";
+      sha512 = "1359d549c9bf298b869968d5d5fee722ce2ebc11095f3b7472111df07d2148153358e0ed31a722192deba68b67fc9d5a1f237f975412fc5d762fc3f396652b5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/sr/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sr/firefox-53.0.3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "d22ce895fdcc1e6535aa5ad5d5a8a3c8dff0044760ea1f275ecec9686b2aac5564cfba0bd6c87689afef3c79adc7ef6e7444e8cc6a30035f630f7d9fc05f6813";
+      sha512 = "4200ca53e3b4b61baa929385dbaab5bbf4b5f8fb922695c8ee378f5be6ed7b4c505c616782fc992df0f88ba5cc95a06ca1f8cbba79319f2e9734be42ab336093";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/sv-SE/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sv-SE/firefox-53.0.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "5130bce1623122ead6292ac47ea6379a223d3caf59d162ac6c5aaea3bc2f6c5bdf86e766b90da783f1bea50003e05f8ff7587d2614c4b5115ca3ea6ebc98d360";
+      sha512 = "5208eca959275c6c491b609f9afa750c7c509eb8fea1a7996ef74314c6001797879887111048071bfa06583e9caf710be75edc8015f16b4e0975f949a21a9229";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ta/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ta/firefox-53.0.3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "2202a149406f11be5ac3c5944b3bccebb796107a4ba608cdf27bf0ef132f3a0911eda47b918e6e19440b9ccd7e781f73bcc640d07e15ccf181faa0802791c6bb";
+      sha512 = "a3c9dcdf28703bbe2ec1243e93074462729c4ff81c0cd0c8d8b83dfbfe1f0d1e6d0480f292a6df5b6f961f928fb503563ad5ac19c02802ae69fd415d9b4782df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/te/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/te/firefox-53.0.3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "31624bf225a6ea8d74181ba03a19058d66661fe410815948f7b99714c0a376a4aaa17dcde3d92e5e3eccd009a4ceb032ddc41c7847065fbbecb00dca7a425d5c";
+      sha512 = "d39abe44752af8ad2eaed332306c5708c619cb8223f47bc639d0872e3199561a2546c003c39a6e14ce7ffc1ece686314cb0ee93e747dc89ba699c5ab2f9de2d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/th/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/th/firefox-53.0.3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "ee2100a45e362ebc16d39f0e3b71aa58e7c090f68ad6d1939fc8cd9ddd8426a2e3d09908f5135938b83b126d04f1910cfa09ca6a7092d299a6636cc977cd2b7d";
+      sha512 = "1f2900ca72f19786ff7832d4b279c26ae56fbef6e85f12f41c0fb180fc84da7dc795c6b09e413a616325744d6a970a8aeba037bca2bd2ab136f68f658bc255d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/tr/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/tr/firefox-53.0.3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "d582dedf76d504585d0cfb71e89d3956bbd274b5848748502417987a3338250826e409a17d11ad07276186dbfde9d98acde9233b722a92b9ee3c85c926bd582a";
+      sha512 = "7854700e0274974799e1f7496896a06122351c8915d30eecd9b0109a94dc22f095d964187614cf38d4be4d453231b07ee9517227acc6cbe4003856e18455539b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/uk/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/uk/firefox-53.0.3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "f9c508615fb0a156f619e840aade5562870e7c1cf25e48b3292e9cf5e88e5fe24e96c9350bbf5db848e9f7b3b52efedb7725d6840164465ec5769eacb32f784b";
+      sha512 = "536075f5842b5ecd79032cb9a62f7d5efe8235ca34b3f089bf9e7b44af5e9e39dcdc8ca04b45392ffb943f2d53c64fe39e34b28df1345beb63307ef359d66ede";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/ur/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ur/firefox-53.0.3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "56506e75e316e628ad426cef81de4e9f22826644437096e6a85422ba53dd2a987bb1021674cc7c1c729277a2835555f1063e633480c6f2486679a5ec4c038c2d";
+      sha512 = "219c7b7437e70a7970bac631bdcd1d70c98bb19bb51a7f95ab45106b97f2207a3d19f45b55fc8b26d136029f2ead5767acf6bb241b1e62b0d4e45cec6fdb6d19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/uz/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/uz/firefox-53.0.3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "3730743fc4e31062851fa7a7f428f84ffcca03f6eb5bd52f92a70e6aa45292536ed17b4f84fc83fabf4395b7ff116a1055868e1cd156cd255c8f2461e0e652d9";
+      sha512 = "c90d39920c732bf022a417c7ee4ac6ff616274cd37c3a0263afd97efd9edf992aeae7dd9a3a7303a2d4e65b1bac49e70554e9e0310088c5367aa7a15963ab233";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/vi/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/vi/firefox-53.0.3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "6bc444c9b2bec6ef38956e91c0d3dc442c2263147b63e19461d16f6c5d074ac5be4b578a86421b72c80da6da29f017c2583e65522480e76aeba2edd0d463c2f5";
+      sha512 = "66f08964c0eee2befc58c8edd0faa9140ea3a9a2ea90a31cb28dc20faf3aa471f06ac12568ca0d8ded0bd6dc5e34b90a141602c37742bd6918f00a0d02a20972";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/xh/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/xh/firefox-53.0.3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "2a3e0455a1b1bc88911115a51e60431bd5c0d77260ff1cc8a59cbbad924ec2217a08f39b17940146a4dd0c2183a62466727c3ed56bf91059a393282ee267fa81";
+      sha512 = "06510ed45ff6eac5af3a5ce6e58487abc849b91148587dc8905cabd2762ab04890561dc0f49959c51fd52fdcc9664fee4452de189f13c4acabc99308f6db16d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/zh-CN/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/zh-CN/firefox-53.0.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "e0a3dd2a9e2b7572ce94d765a339d1d7e928d89b266bebd681edd32732f448f37aa93f9da46708b726a79e228bebff6d41d36de18510e1b9422d50a7adc84078";
+      sha512 = "e9c6459671027431433a8734e9126575713a1bdc6c4059f0010c9357f6cc6474ab294c6b1db093513d51e6ba48afa1b467ea90502ee92c09b540e93b5eb80764";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-x86_64/zh-TW/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/zh-TW/firefox-53.0.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "f8d8680c5eea8406be735cf4166affc16166f5c56aa2cb3ef68924f3d449a14a6620cd181eda64e3fce0762a58199af30adc14bbaff8601b514d8779283c7b6e";
+      sha512 = "a1e9b1490cd6d309131cf3432aac9fb82d4f473d832c935252fa9c3cd5dbeeecceacf31f11bb51c06c58ef998339201331663f12d9e586f4d3a2abc1bcbf7f4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ach/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ach/firefox-53.0.3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "887b4854e0df5ece1ba8109ce0f12e803d8c947069d1166b2031db55ee9ca72f9853eeb8c6c6772cc4981163739eacffe87ac2691bcec8ae48169a8c11240d07";
+      sha512 = "9644dc1f73f520aa89998e7ef37fe658a63cd625d90ea0ba478f321506aafce4a1c18470f94adac25ce1be2aed8dfbf2e255984febc4008bb031b369dbf494ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/af/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/af/firefox-53.0.3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "57e65f2067f6b8364db8e6853c185fb04d210bc96e0a92e70f91ff32960865de9f23e40e53dd138b82ee42f2e335d1ce8a738041d043146eff759ec297e96fa9";
+      sha512 = "98b2d5862db2853d0c9253ba63604ff55766d7e601620a1dfbca8a4bc8c356652e24e91892c530195651fbe93ab38b69eea7e4a7aa8da8c1c19b2489790f88b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/an/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/an/firefox-53.0.3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "403fba7832f909a76a9fa0f236c9fd342ae4df7104e60616b129337177315e82e60969974db600b54f4f9a5b1988c7f4a8a4258ea2bb94585ef06ec0d35a6460";
+      sha512 = "d69ac47458c5ba751f21db719336114e49a6601db52b1c4d2fb6636cf4d869ee5eca1f32e9d106ae384719d511bfca595445dfa30a8ec2347b544661e7203177";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ar/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ar/firefox-53.0.3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "637959a58905ebc2746ca622b198ea04eaaf5a3fecff0751c5eebb0e08957b0682e5ba19fe516fe5946778af1f81a7da0377991ac6912a0b10f4ecac357ca8b0";
+      sha512 = "6f09ceb03ce77ecf8eaea8cc4087f8531290ba0c1c3bb727811fa03c25228f0d38cea020281cff53d7acd682560590de2e2355d3ca5c46e8e777696e6424717c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/as/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/as/firefox-53.0.3.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "d7fb9123537241cd12be7c56fb49ca5b3b49b01a27d042dd0e9f585a79aa2f11857117061d0abfce77c1c72ad0c397d2d0b0dc8ec8f149483432da27f167b4eb";
+      sha512 = "428974d2c110cc2bc88c792c0fe835232a51cc5b2c8bff1ecc08490a20e9641b3a465b3412e0a05dfa8859bd2839846a7ed75e26b31456db77bf35a9079162c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ast/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ast/firefox-53.0.3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "32da8e9f23722fac8997f0c32391020b058f21f483f5e97e7742ad19fddc921d386bcc588e2c5be7bc4f6cf314a8538c80b71cb0707e50f33b456700c48b93f8";
+      sha512 = "5368dfb536053eff3ea846366e8d5b4c025c3c5b828f41bb015276ca40c9c6b529cdac715a181d53e70df3ff99b1ea310b1a9c5a5da74e36ab97504b03c99e3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/az/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/az/firefox-53.0.3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "8484e3f9c02c500e33a52253000996f51527c4053c7ef11f576ee6372019b3fac120eba18d5f6a9d153b16a2187db190e90799d1efd021e329dcf2b2eb9cca76";
+      sha512 = "d9c69659d8f77949b3c12419202ba95a53c2a0bd9a8b1e580afafe93e245609071239cd69722e391af7373ad431f1acd09dd9484038d6eade48d0642c667f137";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/bg/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/bg/firefox-53.0.3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "0d79a2b5f58263f15dc012698f4f10ebdaa7e893f25c13700a255144d326fc0a3eed8695989c3c4bc7ab6623fa4d3f3bc7980cffb57b351f0973d3ba52a781b7";
+      sha512 = "20dceee7ca9dedd1fc063fec6485acbfca5db804d6f7dec8a8fa0513615f1a8b73c51f8dc4cd427e5e06d1fa49e74f2b94293880a47fec95e7c670f0a6c9fc2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/bn-BD/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/bn-BD/firefox-53.0.3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "23b99e43a66c0ef50a1b4f98e38032c8a2f24477a683144590954b87a22cb9178fef44ccd6f08eb4d8f2d8d8f8a4fa2c7364123f0cdd4924b0737d490258f56e";
+      sha512 = "00050cc713a7901848eb73bcfe15c3757a028391e71d59d6e20843b67aa1f19283e45fc5fd22e9301a15a4178f2f461a5984ff196473125682ec5eb5dcab41b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/bn-IN/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/bn-IN/firefox-53.0.3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "48ca30ca3b260c318a82dd91914eaeae123d4bc741a8bff863d60b3117bccc2a2e25ba56201a601618b4b413d57ab2e3928f907fb571b96a760aa89773318638";
+      sha512 = "6439b4ba4808ac648543818388f08752dd7ee07d30390afa6735777b70e84cd1110e6846d3baa1424262fd3e1fe78acec9815781a2b0a1942798b2292d26fe3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/br/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/br/firefox-53.0.3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "cdd967920fd0b860686dd1f572a6a5ffabf79f901eb305051fa69700f999a96a91d7728700b7bf44d00e4be6f2a8fff182d07eef9167986d0ea172d093f08d1d";
+      sha512 = "7d9380030df59be07f1b5d8952313d1de06b7f2d4a04edec74eab06a35997609624d8b90400158ce43638d0134db7a71fc3194db8bf60e480f0bbc4ae358a884";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/bs/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/bs/firefox-53.0.3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "833e835aae7861d42aff6076b48a70367a0f9c732b4caa51ded61fbe3272b4eb5c12ddfcf9693c13b836738a6346f5e54f742626a497cba9eec2a84119a9cce7";
+      sha512 = "0326ce367d48f4696868defb1c5ef6295d71abfb4e152df57fa37644c0e9c9ddc4d1a859bde9710baa7e1dd164d2509a690b49782e691755117f8955ce019981";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ca/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ca/firefox-53.0.3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "5bb93b07230d6280c851f535705290b6ec3ffc33f70ba88dc9227e937df37209869f7b410176505a211f64a8c1b022e822bd70c6b04101f87bfafece782245a1";
+      sha512 = "7225dbb158fafc1fd3b0aaed1b2b012b30a3595c0763b9d695a757dac6f279909a3a5ced7afe260b2b22afa1b80286f15edd04889b91d0a5d0f02d4e3af464cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/cak/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/cak/firefox-53.0.3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "bef5e6a2b0b5e7800252fdc16ba64df0a9269110bba04bafa0da4cd2053a30e6c3cabbaa0c4378602f7b1844d852be8d636642309da7bbfe1943a112c1891971";
+      sha512 = "ecad96912d70051d7ea41e32f100c028a45c5ad819e22e8e9cd60c72b87d57300f797d661f9af20bfb18bade2921b59260c0eb08b5430316a1d706ff8f0cbd1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/cs/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/cs/firefox-53.0.3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "d3accfa6ada2bee950e0ddede63cc977975c10de0da5f18c153f1f373d1cee7b5014c4df54a2647d3c4e46a0221b4eafa86c8f7f52c235a56c2787253c92bb46";
+      sha512 = "d1d78d58b141cd919153b2c2d4667628786c330df01f9183b63f4592faab8863af3103204786f14bbdbb3e8a1e769ad2578e337ab528191dabdd82f51a45809e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/cy/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/cy/firefox-53.0.3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "8deed2c54eaa2812f14a60492b7549c932a1bfd39949ca7c77f791c6a626d709169557547a175c4bc3c4bd0dba9980903073a00ccbcd6d7e0db7724ea9361566";
+      sha512 = "fa97198f6850be7fad4a6740813eee763f2a9c69d0c23cc5f1bab5067874cf843bd529f63e2078731d68f916a0b628008fede65fafc1e899441472fd32d6efbc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/da/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/da/firefox-53.0.3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "39104309f7c04e82629eaaad659406e673b5cb383c92fb8e4523b7afb8c4abe2e124438a89985a37b43a1630a7894a200c42a74fe477fa5bf6612481b578678c";
+      sha512 = "a19211b6d5aa3e4b4f3b15ea4c44355227c30aa01e0cb501187eaa92633d549a67df89e7b6edafc4671b69f7110f28d197f27c02dd7f603f9fbc7a1e70bfe629";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/de/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/de/firefox-53.0.3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "5f0d711f54b8d76a9e1f46612ac19607caae1830187d874248a3154817782df9db366b41affdcbe694fb209140c22c188149cb93a6293861fcae3c4b48cf5b72";
+      sha512 = "195878e23fcee7b344b0b318a6e8c7b2af30de97ef9228e5a0c80cce7e7c7405e6a58ee8489c100a5b2d8801c388598e80a22048686cbd9b736b30298757cc86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/dsb/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/dsb/firefox-53.0.3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "1b9ef37e0442215711c804d2a920f3fd62b8d66a65ee933c49aac51560bd1366c07fe6ff76acca1cb635faa15cf2d0136831fa97fe9b27589a7625e4aa5821f7";
+      sha512 = "b1bfbd251b59a122932edc3d4edeaa311f72fa093d103bae8f18ec900063cf9b88bf26f695decbcc2cbe7a8b0cf6c978db3ece86b8aa11c7d097db47bf8fcb93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/el/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/el/firefox-53.0.3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "8f067916b91f58d4a8177db246637e829aa6e7c15e0c6485bbb36249c0feee5df8c9d04287ccd69da8d97fb0e9edcd8c72562e97fd8de82efc7538d3323a109e";
+      sha512 = "a8cdda39a3f221adf0361871c5eba486808209809eca5a1b9d3b9d2c0c91e68569451dac2907e33018ad97efb4c3d646ddd6db87a9cd98461fe8a5a6de2a492a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/en-GB/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/en-GB/firefox-53.0.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "a80ab3a8ca1ac8154dbed7349e6679e57da228a31b122fafa8c0ba4ef2f6b003c4344de7a5e6a50500420d98128e7a94d11aa6e576496885d7c39c8c98df5554";
+      sha512 = "b99dfa1b518e7fd0b5ac3780b69cdefc6fff26d5a30a0a0c95aae9bca88def65a0cbcc1ac22aaa369fa854686dff0de75e138edee1d8d13cd5c1d25110c0befa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/en-US/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/en-US/firefox-53.0.3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "11879e829db61ab7235c469c94ee8f0357745deae44f1fe582b8bf69407f8f8701e00ba7e4c3f9004ff8638a6b4c4cb151ad3968d4f3129c0901f4fe6324b4a1";
+      sha512 = "df0f895b336faeefdb24a65f110d73709a9d9c37aeb66348d8f347db237b5f4989a4b37e3e15fd638b7cb907e567e40e88f4372fdd1f10c924f44c5bb61086a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/en-ZA/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/en-ZA/firefox-53.0.3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "6c97ec4bd96c103e8e7bc18c6d6d865372ec9e8c87a8bd56135d84b9c655592f766425aeb323ad2f95d651df9efca55b3414bb41086db3bf7ad5a1217a20288c";
+      sha512 = "928e0efcdb9284ed8eebfc9a05fb9b33ff05a72f5db28813928064970e0c6b5c67de429fbc49b85cb780fc18ed3964e14b445460dbcee8d9c271ea112c43a402";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/eo/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/eo/firefox-53.0.3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "a2be4084d40642029aa5dcd6d146213651e73bd6a730c47a2567a8beea707cbcda8a436b9a7a7ed257e84500ef8ab3ed08f5d7aaac569dfd16a28f6ef9a8ba5f";
+      sha512 = "a624a4d42a096929ac6eb467251de6bf3eadd5b6492b5b9e5ab7923601015ccee69f976186c66bbb2ea268b791cc2708fe9e128a4d978176a5d9ca3801631774";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/es-AR/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/es-AR/firefox-53.0.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "12fdf53e642e1a284bb01492bde7801dad00fd2ba93b97da78a21a1cfc2fd971670af56c203f002770edd69a175b040ea445878dc04a38bbe2208fd5572bc376";
+      sha512 = "7a2d2ff9251935b8cc3f592b2c7708ad86e85a389d8599620801f514b797a64cc28bc0458c0d7903261f5251be65e29ae8eb1628d45d9a7ae70f57ea56f20e12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/es-CL/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/es-CL/firefox-53.0.3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "e44ad4c351b7f881a0da9b4bad79a8930f6757c828766a8404ca5f6a31019b4777fe7cfbce9eda54b7874d34032bd94fb085427d52c840122234f9c700ae0efa";
+      sha512 = "0b9ccf6f2024409348623ade927d0b21df79211ef7a01f9efe414ce389a6a4d98ab5f34f8c3b4c0dd01209c8304d102068e8a9517be097b64768a163aff96ae6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/es-ES/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/es-ES/firefox-53.0.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "8e71d19bf38e8c725e0562abfba61b9e0a1827d93e989493c2ac29997e9dd3d7c359c0fce673568deb9952f2f0e7108e5cd529340dac2d96ac23bbe8644e300c";
+      sha512 = "02b8f2b83d869db41cc910f647d6c6c8136609d499b6e77f2526915654e6bc22fa202b09f9c93a3f2fca7a432deea9a08a2e983f0783b5712341d9ec02d4754c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/es-MX/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/es-MX/firefox-53.0.3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "cc59faaebba90a9d3a618e89a5e241202c86eb43f64c0cc3fdb0c30f3932726e299d1ef64fa81c1ca14bdb10b8f9d038250b38a85f09279359b8d3fcf2916d1e";
+      sha512 = "b18d0971d8b595c8a6bad2fe51fb46d995565947890979b2a157664ea9c5d20852043340c944754d90b820ad5b65f35bc5d0f847a7bcfd322b2a952b3a5fd4ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/et/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/et/firefox-53.0.3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "92f29fae84f4d572d8fd358a82f84b3136cbebfb940bcfc49a074cc6afee96f1ba0335c9163697a944a3c6ffcbfe916f6d6584fb0e203b65aacc7562266aac28";
+      sha512 = "f8836395758112d16b6ff74bd5144279184b125e9d415d239b1dbc87899da2000880af3bb9e0b4d49dfaa641f3c8cef4585c31699014fb2dc95969407fae4a69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/eu/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/eu/firefox-53.0.3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "231e6c8426e65cff22df4b8bc9e351dcb1e6d2bca52e5c7d37814a72bfe77e1ebd6690ecde89709a1643185eba9820765b3ed2a592d60c25911ce7ffa1365e4d";
+      sha512 = "05584c588f76685791c54f24bfdbeea37c9ec36f0080ea5efda8fb5db5b59789b68384be1e36aafbc79338cacb200f1246d786afe1b3331ce1b1bfcb6c86c403";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/fa/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/fa/firefox-53.0.3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "f6b90e3ef49c66c9df5c795915ae1072b9dbf6e1a257a17a110c8f97d0340ab775917bcc157bb60a30f7a16a0968de89feb354e289c64feed0d45f7003f1eb1f";
+      sha512 = "c89ecae7468b0c0689995df31c8d0b04b25ee8b3f6633db9a84197bd7e7348b4289af95b8d656794bef22250e9aa7598be3a871661e0d03e02267766c2caabb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ff/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ff/firefox-53.0.3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "7506ddba1e65915186760c2434a36e8947530107344366f190740b2e53b2a22c801e630a6bdaa8d2933789c6ff3fee2aa73368609c04841ee4b9f5a56048f4ca";
+      sha512 = "63302710dd067dac349a322fe7df8ffb33796790bf17758bb9554d1601e4d414c0f919cb92ea56f3030b4d3604caaa39149ea438bdf03fc6164f384e9cc081c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/fi/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/fi/firefox-53.0.3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "1659d11c6341dc619f53e8e91f5c789fde7a519c2e2f94fca97231c6892fee6fd80cf0eaecd52225a3b7ae6f795d6bb02e976cf524fbb66a0bd96ccfd707d425";
+      sha512 = "df62123c529bf3f9ac017a553268ce58cece1c916bf2d671b03a5207434c762cd9b2f1c81f960e5eb26038f4dd39d99ac8c65d426eca996c230694ea1b4ab2a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/fr/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/fr/firefox-53.0.3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "ad075d3909abaf76a9fc97f9d910fe29f7b6369c0f616bf44e6b48da438a63c0d28674cd4f82483efa5f3c3ec37b42de35a4e3731a6479fc94c321bae586aa80";
+      sha512 = "4e6b3b271c1ac945e05e72926a4ade75bfd2e24bb97bed78e350c5f637007810035720c25a24a6cf0c0cd24d49915259a7a38e0f792b78dbd26ac01a30092922";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/fy-NL/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/fy-NL/firefox-53.0.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "0d66079b0ac529f82cc613d6567087b62342ed3dd25ecfce1613bfbbdde0b2a316748bd46e3526ac49503f4cac4012a1619eabd9c1d9cf61ea2008d9b10fad43";
+      sha512 = "11118697039174892aaf813d434dd2f3ac93839681d9544100560e5d906ea7f71063e89b9a4e2f53e7aff3a4b83726a0645dcc4ad212255b054a51ef3d3cdd1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ga-IE/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ga-IE/firefox-53.0.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "5e3a3071430939a8c3827e3411e7a35eb8cc1c74b7c0aea49d92e4ccee642ec6a957eddeedfcdd32eed288f554a3ee7051e33d43c9ac82fabf06abfabf976550";
+      sha512 = "3d22dfe4827d218bb42a65dea5309d058f4e047a33ddbaedf95d0eb98960e567b7735fb7e25e508e06f5b92cc21494e73fd37e02a5228c87a903bb77f37bdf78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/gd/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/gd/firefox-53.0.3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "a22508842b69b59f8ac9aabb6903d553acc4be4e98d2a8c0fa63125e22aa07fd7fd17a5e08823524b45bb5ee84ed8115a32b09263a8f66f7bb4bbc920449364d";
+      sha512 = "71ea69837a36b698b483e44c87db1737a618f4099d4b6450434a5518a9f77a0d1373f85ab91f76397e7594c1a5be921c6302f1cf9b66701b5a8aadf846f64321";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/gl/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/gl/firefox-53.0.3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "726bf9da239be1fa3405555b3a85854754684475913086e93e96c994032a31bf437cbd5ca901c82a983e08f4e2008b4ae04a8b9061f4283cee19f755fdc72a75";
+      sha512 = "86db97e300e8ede881524618b110993999e08c4d21c309ea0228f742ec47a7e7d4d71c6f77eb1b57f16fbbf08fd5b5d7d1e314feeec4bcc10821047bbf1946ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/gn/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/gn/firefox-53.0.3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "adef1d5071cd07197eb67e878e2bf55d0759ab8f5128e35dac8ecfa6c9b0533cdc6f89dddaf80774279df718e0efbd398e8369142271b2ca324928fa06933e7b";
+      sha512 = "151c2c8f78f00414d358b296625dcd2c8166de12a8deb5dc31d330e5083e3020c7b12b9334dac7cb09e1508fb28b3b2601ded61914ba9df9df7e239871812f1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/gu-IN/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/gu-IN/firefox-53.0.3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "348a7ee07135d007a9d98f09b3c3881f4018c4e9cec21631e3ddc1009519e7768afba4eb24ba360841850b5fbaf589357e8c5348d35b550622888609f9b100ae";
+      sha512 = "8201dc515ebf1457dbffe1e518f4d1d4073f51b1491fe794edd86f30e8e9d7e0feace1ba2fe74b136157597ed7087a857f204e5a6bafc297fec4fc0e04acee9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/he/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/he/firefox-53.0.3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "93a5b79d11f16b1257a84c962684c4c892c80630551f3e373c72b7f083219456828d5db8b1486418105de94f6bd6596eb23e5b86aa6c5bb93f8385f561ba61a9";
+      sha512 = "4a665fbcd7e54acb84e7948a326219557e14dd7326a4a0513de7271f128661a928305814dea69ef6a48d349deb148a08bb386b381fc0ea8c18c5632c7b9a3c54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/hi-IN/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hi-IN/firefox-53.0.3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "f88899c122006e22bc4255190563caac96109208acb64ac6d4fedc3d3df8875fb3079633478e92d9d9b4d88efad5a49e77fd747b977ee7d0ce3a30ea5ae7ec07";
+      sha512 = "9e071cc2d107b04d874f3bd11b2ebc184fa4ff6534bc4b2a87f85cc3996f8b3d7ca453edbc58ae598bfe5ad90f9b23a1fbc5eb77d6e3095f09fa4b3619282ccb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/hr/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hr/firefox-53.0.3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "b01b3dd04793b773a6df51278aa2d4b0a74b4aea369184d74c36e4cca6f2c798fe5502181b16c65c4b7c8f343e3ad57c84028a58550dfa87bd6157ff6d2807a6";
+      sha512 = "263c65dcfd77a79dabb9416f23fa48400ec577ef03204daeead577c7159d5ef0b12cb2a17d2d7523078edbdfc61bd0bf41435c300b690b0121a5dbe76df76bde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/hsb/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hsb/firefox-53.0.3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "cd70c429fbfdc214bc48ef09506ad5fe35c41719b366729e7558831a149b25533308b080fc896595ad89a1ca5d40dc29be50459cac0fa030c10e162ebb5eb6fc";
+      sha512 = "78b3777c2017c60428a15a3531b7864d7a58347686fff2486ac9194852fabb658c170ff11c7b59bc96a9c73e6b35ff8074ebd9e5ee401e74c760ff598b5fc28d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/hu/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hu/firefox-53.0.3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "66826cfe3e6515b787e30aba869b1c1b140d011030efe31bf7684a59e5a95ccf6a5afd058c0fad179a1a728d42c0a2dfd25a560921b931e39cae0b1872e9cd85";
+      sha512 = "688a543527d26ebdc9fd2b2022d34e500aa0d65e6a85d504c957c988d0ea285ef2208a2a17c80be472eacd2cb726e99ddfa9048c1035c70999c0a8cbf98500e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/hy-AM/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hy-AM/firefox-53.0.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "7a40a1902157c4f1463204b732a8dbd7faf37f758784aa8330ea8ffda89bffe020e3ed053f87a8e79ce2096037f1c06453e8b4f3773e12f173912ef0fe0b47ca";
+      sha512 = "561cd5c209113abe4c36e9697323a966a09734e9039f9e2ad40bab5e7ee701e2aa5aa1f6f0ded758be914e7a9f33f59e84d895c40d3b15bbe7043b04e9e23918";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/id/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/id/firefox-53.0.3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "2acf252ed8337d9d882955a56a4a4582d9d7870f1d083a39f9c4ac09bd1e84b7a198b833801fdbde70abc33b640deaaf8b90fba0396c676103601a67b108a7eb";
+      sha512 = "c624da71c7f3fd040b5ddc6da0795aff8796c684e44a05b53bb375d69abaea436350588bd6e3c60cd7fe75c5e0d17be11c956d2e3196212fd3e4208af3c4d131";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/is/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/is/firefox-53.0.3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "163d1d388a370f7a79c8492c9556b2f1544a184c7991196ac784fa8eb19a39839635615614269bdc3f93a10cc38b2caf0a1d88adfcae4f8c341e9afbb69841e9";
+      sha512 = "f43157cc8c0bfc7108d9638c1b6997444d11c4c82fa2d937085fba02e8cf7bcf6e2c3c498d58039baea60461d8895b3a959d39af1612bf1b1f30574ab5c6a6ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/it/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/it/firefox-53.0.3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "a076c5648d6cc245910b035f13ed4f75da30b135afb76a6acd1e8756453d52994c4bcd6dfc779ce7c683c5498ed6374003a01e8cf39e69ae31a19f5989b178df";
+      sha512 = "a8278d7a14f0570f5d418c87e55b710a40dc9e76fcf9c3318f361a72f51e55777d726e99bd2afa495b09f997fef9e86f31ab7a1110a43617719d49456b7f2136";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ja/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ja/firefox-53.0.3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "3c8ee8d0e00e0d7cd1208990a48701b47ad26ae364d89de6649c7763e1c7b288886e0bbbedc8c4fa0aff37fab424e71eba31db5118dc9d3804c22089d4479131";
+      sha512 = "d9d305dda59cd09db5444f27599f9846e25869d3a43cfda90af0f8a760504e92df1df95da6559da8294baa75ce6c587721dc45a4d80163f7d8464a1039c9c180";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ka/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ka/firefox-53.0.3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "6ee0c3ff81b7b9afdcd55eba2687d29283c51dc1fd519f54767bb0e9214bf11399cb4ef15ec8959dfa838abdc88c0c6a2bf1f0b1a95105a357f47a44d7de3631";
+      sha512 = "d5d8a55002e8828f3e32c90f7a24aaede2eb820f203b3a2d5151010aaa5c3996f47dcdd36a4702ec96a93157cb7cd591ef81affa9c1750e078f3b569a537725e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/kab/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/kab/firefox-53.0.3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "cbaf120e386f0a4e340657203c49f1753252ddce0b094001da0657477048ff65044581ef587eb6fcecc12edbe94766b9b6eceb302d458b51d3dbcf112aae64ed";
+      sha512 = "31b158d5e83cd8f241740a350465ab3d4e1a12fb374d85b97b4f32f848357bcdc4f179b97ac63701ddd619f9934a2edcf41f65ad1c13b8b2141522f79f3b24fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/kk/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/kk/firefox-53.0.3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "fbdd1ac6870e619b21f3ad67bc36d6e23099c7572ec815e47b1a61ac90dc082447f13ea6b6838f8003b24464b0cbde928bc59fcec9c320dcc0376c3c25308bef";
+      sha512 = "a32d200a7715a7598fca3f3214ab4c5ad6d25ceb92224f1602d3446af75d7da15b36d8ec1f71e65ae8f74cda8650bd46b81e16b16aae7130795764a8ed2779eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/km/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/km/firefox-53.0.3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "bb3860baf2c678b2eb3f7a302724af29a8fd2326b1d98761fca5aa1f1cbd4eb835f2f9a675204dc478d7e7840bb8462e47df31c508bff03a8266545ac8c4dfe1";
+      sha512 = "9fc0a533296974bd1ab7c16d7e6d2f6c5482e292bce11ab322ae94a96003cda788750a1a26f4064e9c65144003e0acac67d214f89a388c9c433be6d2ecc5444a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/kn/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/kn/firefox-53.0.3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "1bb3401649745869a976d307dc0dc59c6dc19a6c6f83d6ea0033588a163432e8cd16a4273326718030594f1ccb9e84e83be804b950f2bc3d65ed95d910b5de23";
+      sha512 = "a613e37c8635508f728d890232e54cf69f2f66b76ee9cb1994d4c0050f579fbacba749efb2307cc40cdea32aadc024497d80f921afc632bcc6d0d4db88828b83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ko/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ko/firefox-53.0.3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "671dd07c47c4e6769aab04d954575380212ce0ed92fe81ce664210189388237561dfe023cb9c0b189163f9742a43f4f4bf54f7a020570cdfd91e1ed2098d178a";
+      sha512 = "014e823ba7c4e4b2d36283157a5931d7fd4a8bb499216e5ff9228cd598602eb426d38a5d8e50452b0187dc8475dace5844c08c18a960db78b26d2139c6d843de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/lij/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/lij/firefox-53.0.3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "cce01396d220c199798033f21b2a04c30f388c659ed2e2a2a7332346d5bfc62be2c2757435b66704bc3ef5cbd4f168cd5d79f359fab8948c9593015a402947b3";
+      sha512 = "cf8b398d2b1d47c3f5803311cee0a7f3b3ee2a28d74ff7b2b8537a14b7b05fcff37ab5097da6ad0370982cfdecc9b6bdc8b40880c745f491c42e10eeca67eab8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/lt/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/lt/firefox-53.0.3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "bba870e7fd1d5e1821c3cfedacc8c97458115c0be3aae642ae476a3a7f3ec658add4c3dc27ebee31fbeaa123cdf911f39496911f7f83c4d92f21ded46e254b80";
+      sha512 = "4dce327b10e2a7f79fff55d02e6cdbca3edefd3b5f6618af6bfb9ef4db7049499a274dd6deb3964a3bf473952377ce21b3887deaf2822073b0dff1109ef45b56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/lv/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/lv/firefox-53.0.3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "788c5abf86444d77900aab5b68606202df5a9a9a13c6d722b275b0d777e37dfd0fcf9470f43c60d037cf547dd777d2e887e5af65f1a4416e88baa0013670c24d";
+      sha512 = "c088c08ab0f6f6d4222675808928dbf623be20e64f10e08ddc01e99054724060272d1ea71df8db8e93fe107a91559005954c0fd267634b14b0b9cac874d80761";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/mai/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/mai/firefox-53.0.3.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "283d5b562fb238f4c83067c739cb8c35345e7c9d42420b98a9bca66e93def16a45a31c82bb47f87c2ca8021270d358c296c9b6d24f9b061386f1a788694ce058";
+      sha512 = "ebd15fe44dd5c8e8880f45c854ce8785c6a3fd74f4c7991c99ca47d3bcc57371d0378fec3d40d1565aca1ee4a85ba787776690892700fc6714d7212405d94a9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/mk/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/mk/firefox-53.0.3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "fe22e8da6faf0357683fadffd6c1b85abc2ed8ed4da4c68f80e56c161042996358f89021b5bd928a17f8810c4c73b9bc294683f1ffcaef61f7641d18c7bdd919";
+      sha512 = "342b993d781d170f23543bfc4e37ae624326ca0b0fea570e58ea30ca49eb0cf8e2d868dc11efec00e84aa7461c6d84594ec816ea1fd5ade1eeac3d54804363c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ml/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ml/firefox-53.0.3.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "1f9796b8c7293b8d18fe2672848979365e70d5ed24e0a2f093045b865a57f68f7bea2ad19fb855a6e8be7cebd8448f3e785022dac281cf62ec9a0ddb220586ba";
+      sha512 = "9f73181a36e7f357fafb9fd7fe740e67bdce13788674396ca34a13560aeb0aa5326efcbce88f55040e4b7516a1cf0baa933b19559eaf6c5ce0a61502c41151a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/mr/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/mr/firefox-53.0.3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "9a3954b45b212e5236857b1ebd72c7a8a6d96584558e8956dfa037e213feb81accb25a0e72d2ac3a2da3c04f726681ec00ed2641a95ada4b4299f371e374b857";
+      sha512 = "042c362723d46b32888fae19cf9b81b2ddc13fbc35123c507cba00171339e2bbb0d107b51f9c18c6d422196bba0c6c1eac2fec2828b1f2f2347eb1d78f10d9e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ms/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ms/firefox-53.0.3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "d71baf64b595ad88a4a2abb6b311ac2b980735444b3080b8993b777178c471e693cd886d5e563b6b82db0c52ed1ee9f69d8db87044f6fc94b40dc761ac568684";
+      sha512 = "aa79ef859b97021d4813535fa0ab92af86594a0486444f2ace11176f00b963b456a7c11acf0c3821ba7553777ad464fd2364cf68901e3b6e56acb04db5ad3314";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/nb-NO/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/nb-NO/firefox-53.0.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "17dee00df0787670d40888c2dd77ceab35f15037371bf0bf5531ca5ed66bcd2252207a2b4e082a31e1af174099246b040a8a00b30a7bfad56a0850c56b17b9ed";
+      sha512 = "7fc4c59b813029f55931265b65963145a0ab6460e0316dfe30810a7867243057e9dadf500224a5604381eb6b13506cf5ed54b91d673e3635c5ad4f253bc1a9ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/nl/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/nl/firefox-53.0.3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "44f8e3bab44891e1ee737a8b8975797233241253a50b0e79db3abe8ddbce356b7f476c2ddbfbd0bf58180cbb11fd6ac2ed9ef033a6209450aff2a02ea90bd47c";
+      sha512 = "991f9d18873ab9c451e0ad099f468eb7dc70a52ae70194a1133af98a293737a0846bc2cc48ef6a626bf324df2d2e5a20e0977deeccef6d34abdec463b8029a43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/nn-NO/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/nn-NO/firefox-53.0.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "02b1463579738c604331a2c66afbc10e867a20297d956355b1ffa6518373d19f1241d0e9401090d8f22e02b479125acc9a58a53e804abdb687cec51ca1d1d93d";
+      sha512 = "594b7c0de90609c9efa5b9081ade9028a21ac0e48dbe998b6dce8010159175698a091e3f06e1c996f81086a9e37a3792a55fd67f0a2435a48f4f103dfc2cf627";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/or/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/or/firefox-53.0.3.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "6c206efde0b7689d32401b9d0f02b394be66d46716dd603026c4a08a128ae783c3a6c8d6b60c1ff3c2b267b861b8dcad7cbb89f3ea91934697437a859eaf6db2";
+      sha512 = "f47de5cc05616ea138d13f29b46baaecc048e47c582c0b17a6d245acbba49dc4247eecd420616c7df62075cdabb49f014cc0028a52771b6cd7fa157e8900fe15";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/pa-IN/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/pa-IN/firefox-53.0.3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "b3f33e1d06e5405e7675844a7865c2b05cfa763855fb795eae8093e7d1c8da8f144926991ca9398772b9bb76bcedd6c5309948b50f76ce9af4a46ff0e641833e";
+      sha512 = "608e53a64a367b34621ad1fedf762fbbcd52428e1d85aa123a24ba099b676f7ab6bde953a45d5598e393b7c0ef53fb80d6189841386c9cef46445560f68fdc69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/pl/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/pl/firefox-53.0.3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "a631b2a21785930b5e857739fee16bc217305c40c0a28541bbef9317cb3759a6a733695a05d714b8cc48ce37b586ef1c95886d54bc032bcf156486523a305d9d";
+      sha512 = "169b218f454660b3fed1c1b728d14872cc839d95cbdb962c8d8e3035cba4041a111a850bb517c37b90ba0fc211effbfe0359995e030484b6467ea2b333436205";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/pt-BR/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/pt-BR/firefox-53.0.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "863268fd1ee5eb5496b8c31aece32f01a54e52fc43263da15ec449f3b00be1430d93f01e8f5df5790139d6f97c663e565e2e79a29756a923a7149d8623bfdbc4";
+      sha512 = "b9e41a078a4b73d30e1c13a6aea84e9268235229032377dca4c88607ea0c54b9addbfc0c4e5a1ad52f16033dc1d51c35150746d600220d27cc07e037ca3354da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/pt-PT/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/pt-PT/firefox-53.0.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "0cd4aae714ab15f00928fa9ffb3af39e06063c970064df07e8a0ed7ac4d6fd36e9c0e13c2843b9ed551686ecfe7280e03de1a00f18ef892bb3c471e0de12542b";
+      sha512 = "bfa18669b700abfb868265b7d5d045d4a8bcbed8b9c0d4430b8035ea9300c9c5270fb2f673d7ac5c1dfa570b4fd4a0d3c2ce43e56f19134f6004c9d5996cd3a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/rm/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/rm/firefox-53.0.3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "dbde86a15a0f8434a393a7a21bffb5e15b3c6a6cbbcdfba5c3044014333f8d6288573d3fee55c8d100bbd9978978f1e1542965f595342114de85e2244e4674e4";
+      sha512 = "67e7d274a0cac15f3d7955c1c63064f15a77d83bd3dd0d5916dd59c76affc59e1df3384c47dc5884ee7c988a3b4e21cb1363683b2b13afc03147125c85d2737d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ro/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ro/firefox-53.0.3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "33bdf5809ad48b4fee8074b598882561e46974b3d8f05e9b4a0e386728e722ed91fda5f321bb17221b1723af9a4440fa2912f2450867e735eacc7d021fed0555";
+      sha512 = "e2089b66e855015526ce1800ed93abe81b41b712474f6a29a58d7e7b814fb0838d833669cce24302f76983f1d11b90ec9e50437caf6f951be50f96ded4b22e4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ru/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ru/firefox-53.0.3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "7fbf142210e4ecc939717470749e1417041cf45e37569177d6a05fe919da639d13d61bb0c66eb3fe42cd41fefb324943f0ce8c233071e8bd22e7178d11095eb1";
+      sha512 = "e1cebc4fdd645ed6e013e189b83b923734bb910b422565a88eaea36f55bc95ce31543010c35b64198acef82618829e3de41254053242ac06ad2829b168bef5bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/si/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/si/firefox-53.0.3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "476259e9e4cdeb7d255f6656005cb346833ef555fa82519e9b9943932f885e42af1de44ea2116677581266855d05380c331c64c081d6581fdcfdf44c94384549";
+      sha512 = "65e792b47baa1de0def9e5a381c55ebbfa5e81101ce88e369c0b44781ed04671159bbbdf74461412fd87bb0ae8778f7358da357f73ecb8ed54096563b54be7ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/sk/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sk/firefox-53.0.3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "12995138d6b182cfa4b092b622cc2ac2750c9c5d1710ad27416bd91ea8f170285efca85966377822f8480b2e61e13b14c32a9e21553f9197f971bdfc63973888";
+      sha512 = "b5954bd0cb0b2184e3894d425c6af6bcc0750a302d19a220f379da848cc1faeb7d0a73809ac5d9190e19b955e354b62bb08310f06a08fe566fa90775070995f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/sl/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sl/firefox-53.0.3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "587a8a82cc2cc8ceb35128161dd046232ff42b5c760a9e777df8e120ac8822db35967974e7a31679ab9a1d79c846b3eb4768dcdd5f2e6a907f64229dc56b9940";
+      sha512 = "de7f5650e3723c4c1be6c85dfd184a47336e9912a3482b5367c734238073d73458fdf6db0350ec7fe229ac6268adb6b3c825b493f7e7c03fefaa538a9a3538e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/son/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/son/firefox-53.0.3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "92106a1293455d00ab7cb4c22a35186c101e699af8fe0bd7037bcf3e82be88aa4c588760e084187fc1698bc9fa9b7d249bf543e60a4956937c3fe8bfca07c452";
+      sha512 = "6e751724307db69ff14ca3149bd919e1d0f203083e0d15087f10a5f25715416ba84b25eeb6d8146ed97bafb3f53889fc24ad225c06bc67fa47e07dcaee8655ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/sq/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sq/firefox-53.0.3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "86b3c02078b5e29308a15ad758559cc694fbd7a8df58eef0848f1039c4107bafe9c2077d937c145b3870bd7aa234e5027f925398a993ff012160113b9697c6c2";
+      sha512 = "22e2ed05c946c91152d30bfbf0dd38396d07050690294eff0910c80cd3cd7970181b6019c22eec9dbc07f5511fbb14813e87445b04f8e4a9977c34ba242b8008";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/sr/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sr/firefox-53.0.3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "782b131e2c1659190a675b138cfe32d8c4e9b8894f0a88ebde2f5180f39378d5676f0e11116a138b38eca0c3409015794da587258f2cae042f044e82a6e6e448";
+      sha512 = "b8c6a818b0d4ea3830e5840c307f059857a323f094e32233560f34148ff7f889dc0e7af85997cbd39cc09a34ec4409e5cba8ad4a3700b9f296cc1655d76ca613";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/sv-SE/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sv-SE/firefox-53.0.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "ace27a3184b2a356249b082dc53fe4fa8ba852fb53cf8de94b25e03441e49ba9e0ba0904becbe729b4a3cde842d8f1da564ce5a2b33393925d33ba5b4ee9b6de";
+      sha512 = "8d6c1fb2c9f29c5821e7a104a131d8d18e7cca5bed59a67fb0fe7338f569b8ae514514cae3cee55cc9a28a42e429cdc3728fb73484deb85a2493c6f966de10fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ta/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ta/firefox-53.0.3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "29583c0c1a766ae6255a6c1c0e05c318e6531148143ea2b0baaaebd4e9b25bc4dc1f96b743691746b71be1a7d2ba409077c815a86be81ed838e9302995b94ca9";
+      sha512 = "5177a282aa879798962fdab652799739f30c66b5d56cae807dd2df1a58932968b1f668c4239c253fb81a4e2a51f014f17146d15f9534b8afd8f4ad76e0786325";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/te/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/te/firefox-53.0.3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "06c946d8f7e14827445aad0c26da0b91d304fe07710fc95cfaaaa13bbbf5ff238ff911bcb034a155b2579b4772d240d19e7163758851063141a3b10eff0221b4";
+      sha512 = "524913d7bd13d930501a87e63461233a8afbe5ee8efeabff09a47ce835457dba0b197766bd92e1857c2a2d957e8a37c45819514b06cc9264b6be7a91c4112ce4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/th/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/th/firefox-53.0.3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "1026a9591a9fedbcaf9d560ea1201e8c5a8518d1dfbd06b4878651d55b9ac1fa4d11131aefee953accffa4fa1d3374bc171213a0e8a1804807e34b71504b923f";
+      sha512 = "3f56c618b406e8b7a9ad2bc8646bbe3d48d405b5ca960bede132c0b05558a85a09f9054055256a53a4fffdcb7e60a4265aed09522e432b6461581b444b003501";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/tr/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/tr/firefox-53.0.3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "8f00f1237124fc63403a6d8dcb106fd029b6e02ed2088e4cd5b7252b773ed2c465bce1d849ad8529f691379e003f94126aba1ce1071591792a4accc68b573a92";
+      sha512 = "7dafa29e3663967a1fcad46395433d43e523cd48872bcd78292703610d39fd206646809f8126b87436424a3db2666585fabd2d6f8f431ba524217b4086d7ed47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/uk/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/uk/firefox-53.0.3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "a8a0aff68596dc5c389ae6dcb4f08a76407000cc130510bc86342e22ab046efef1b1aeb39ae97499b7779491c1910899347f94bbaeac38abf68e602272f23d82";
+      sha512 = "6d304c4f822f650061dff8f41803c30c767a48dd73e8f32e5b164f63d9370243d5954c280ac6a19822b85836b7a0a9202ca1bb892319a51bdee7113cdfc10dbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/ur/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ur/firefox-53.0.3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "09c54fed5c1ef2bdc2dfabe8bfac0c060bdbd77f89f9ea1e2f7f91fb9de8c7092d7b02d415fb784ac95689397a5adf35d8c8a2e1e1be118989cbcec0f636a13c";
+      sha512 = "9bb203445fbc293a2f972b39569dd31b3b87d5f5e7be4ae5fca946fed828a05ccfe06ddc0ae34401471cc08a907e7ffa336727d25610729470e0842b4680bb1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/uz/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/uz/firefox-53.0.3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "9156b44c5dbe4697da3b651fc73150523b67020c9912d587802f3af664c7a3d7c42e90ecc60ec4f4653116383f13f5f190d0bc88639f6e13c88c1d1dbbe7fb3e";
+      sha512 = "71377fb8fda9ca8a0d606ae1944328195fabc51d57923edc9e9bcc10b08859141553c855ecd325fe02cf422a6af2f1a9b104bfbfb7d96399f0d7fbb1ac050bde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/vi/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/vi/firefox-53.0.3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "57478ed975afd3906ae6353b2903d1f435be4245b06c7d82cbf5541ee4c3b57a52edf59800d31b9dcfc051429859cf7138017d6df6a9d5bb498967f5b927dd03";
+      sha512 = "a1e62493b7629b5acc950e1f0ed18845d3dec9cf01b561058a9d67e3420418110391f245fc584535c500e8bace53218305a66e60439e781de340f9bac7085f39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/xh/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xh/firefox-53.0.3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "60dd395b153cacc1e123534b041a558fbd38dcbe1a62312fba28d2cf39e03683f816f8cf6c45390cffa55e3bdf76b43dbded5ebdc2be79f4b76ce6347b00ffc7";
+      sha512 = "948854c1ddd02f6dc0df035156481c66ff66c475988c9555cc2eb79dbebf9134291e4f4624a82e95736f08c1043e2d61077bbadb22b765682ee1a76338209d32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/zh-CN/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/zh-CN/firefox-53.0.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "2aa59306efe2645b997477006ddd2144d19edbd000c869265c05d6835dc7206fb5386c7707ded5e3a9f8f606de0b743b2ffc9b0e151c73847636af2eeef7bd14";
+      sha512 = "79f2ed7038f129ea81fc20dd41d93b91731a38b0fd984f7ea2354b5d6391fda9301a99df9afc87e2130ffbb72b4efc1ba26678b2d7cf4c274f82407d6265961f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.2/linux-i686/zh-TW/firefox-53.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/zh-TW/firefox-53.0.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "34444b32ac412164d791c4aa741826de799fbee338471b96767a697eec73472fe31bc98d851b8a7d113f4b70c00d73610ffd83abf403a897d05f0adc9df53664";
+      sha512 = "f8f081aaf28264a566909d36dd63d7bdafecc8b84f2238974eda749fb83c7f90b774d5bd46aba6e8a7e7bd14c57167123eddaf2a28fb83db7c5029cef886ca52";
     }
     ];
 }

From 0460c77eb211899e198bba693c1283fcde7dcad4 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 19 May 2017 21:20:36 +0900
Subject: [PATCH 166/206] firefox: 53.0.2 -> 53.0.3

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index a3f2517bf6c..9f96a53d1c0 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -6,10 +6,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "53.0.2";
+    version = "53.0.3";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "d56d563db7e1a0faa2de9315b71b479adb9109624d0958224ad2cee331dcbdb4f414380bd91f70ee0b3e543eca812c172eb2d6f6b5620f6dd6f61675f5ac69d8";
+      sha512 = "cef5de1e9d6ddf6509a80cd30169fdce701b2fed022979ba5931ccea7b8f77cb644b01984dae028d350e32321cfe2eefc0236c0731bf5a2be12a994fc3fc1118";
     };
 
     meta = {

From 1b3f3f0f1f39e5593ae8f684e964b353ecd7b677 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 19 May 2017 21:20:58 +0900
Subject: [PATCH 167/206] firefox-esr: 52.1.1esr -> 52.1.2esr

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 9f96a53d1c0..c15e070fefb 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -25,10 +25,10 @@ rec {
 
   firefox-esr = common rec {
     pname = "firefox-esr";
-    version = "52.1.1esr";
+    version = "52.1.2esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "23f88de0a084341d54aab107bbf71b965a3f5be192ec8681b8b824c7e13d47968a0e56f4acfd2d2c5487c2e4c963e75ea6aeed400add915b3fb6403ee8810374";
+      sha512 = "76362738f6db82a41ff6af4e12a15a302068a5ce10d23739f29375f3279573d0ea43ecee9d2e46fce833a029e437efcfcceab9442c288560f476e0cff2ea9e1d";
     };
 
     meta = firefox.meta // {

From ccb850248fef11390fe89a4103e856b62e341996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 19 May 2017 13:24:50 +0100
Subject: [PATCH 168/206] bcachefs-tools: 2017-05-08 -> 2017-05-12

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

diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index 75fb00f6fb7..42fe0b7ce34 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -1,13 +1,12 @@
 { stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils, liburcu, zlib, libaio }:
 
 stdenv.mkDerivation rec {
-  name = "bcachefs-tools-${version}";
-  version = "git";
+  name = "bcachefs-tools-unstable-2016-05-13";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "a588eb0d9e30dffa4b319a4715c1454ee1d911f1 ";
-    sha256 = "1xpiwp6n6jp3zc70i648xpp54cd5yay4si28czn350bxwljbwpsy";
+    rev = "565b4a74d6c25c78b0d2b82d9529595fc6269308";
+    sha256 = "1wnis26hq67vxqkxzck6wm6caq4c1rfmy9blmmgkzlhdd2nzisbx";
   };
 
   buildInputs = [ pkgconfig attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ];

From 9b54745c619ff8bd9093e090cb1a9b92b228bc1c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 19 May 2017 13:54:28 +0200
Subject: [PATCH 169/206] libqmi: update to version 1.18.0

The new version adds a dependency in libgudev.
---
 pkgs/development/libraries/libqmi/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index d0b46722ff3..40b44f64e25 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, glib, python }:
+{ stdenv, fetchurl, pkgconfig, glib, python, libgudev }:
 
 stdenv.mkDerivation rec {
-  name = "libqmi-1.16.0";
+  name = "libqmi-1.18.0";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz";
-    sha256 = "0amshs06qc8zy8jz3r2yksqhhbamll7f893ll4zlvgr3zm3vpdks";
+    sha256 = "1v4cz3nsmh7nn3smhlhwzrb7yh6l1f270bwf40qacxayjdajr950";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  buildInputs = [ pkgconfig glib python ];
+  buildInputs = [ pkgconfig glib python libgudev ];
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/libqmi/;

From c1609e4a4d59521953aefbed13e5888f85deb1fb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 19 May 2017 14:05:34 +0200
Subject: [PATCH 170/206] libqmi: enable MBIM support

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

diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index 40b44f64e25..2e316a30a01 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, python, libgudev }:
+{ stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }:
 
 stdenv.mkDerivation rec {
   name = "libqmi-1.18.0";
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  buildInputs = [ pkgconfig glib python libgudev ];
+  buildInputs = [ pkgconfig glib python libgudev libmbim ];
+
+  configureFlags = ["--enable-mbim-qmux" ];
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/libqmi/;

From e5fbeb2f11a8a63f2bb0af5665e6d0c85f1c2f12 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Fri, 19 May 2017 13:56:10 +0000
Subject: [PATCH 171/206] test-driver: sendKeys() support for capital letters

---
 nixos/lib/test-driver/Machine.pm | 36 ++++++++++++--------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index c619264eb94..6be119bbf33 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -617,29 +617,19 @@ sub copyFileFromHost {
 
 
 my %charToKey = (
-    '!' => "shift-0x02",
-    '@' => "shift-0x03",
-    '#' => "shift-0x04",
-    '$' => "shift-0x05",
-    '%' => "shift-0x06",
-    '^' => "shift-0x07",
-    '&' => "shift-0x08",
-    '*' => "shift-0x09",
-    '(' => "shift-0x0A",
-    ')' => "shift-0x0B",
-    '-' => "0x0C", '_' => "shift-0x0C",
-    '=' => "0x0D", '+' => "shift-0x0D",
-    '[' => "0x1A", '{' => "shift-0x1A",
-    ']' => "0x1B", '}' => "shift-0x1B",
-    ';' => "0x27", ':' => "shift-0x27",
-   '\'' => "0x28", '"' => "shift-0x28",
-    '`' => "0x29", '~' => "shift-0x29",
-   '\\' => "0x2B", '|' => "shift-0x2B",
-    ',' => "0x33", '<' => "shift-0x33",
-    '.' => "0x34", '>' => "shift-0x34",
-    '/' => "0x35", '?' => "shift-0x35",
-    ' ' => "spc",
-   "\n" => "ret",
+    'A' => "shift-a", 'N' => "shift-n",  '-' => "0x0C", '_' => "shift-0x0C", '!' => "shift-0x02",
+    'B' => "shift-b", 'O' => "shift-o",  '=' => "0x0D", '+' => "shift-0x0D", '@' => "shift-0x03",
+    'C' => "shift-c", 'P' => "shift-p",  '[' => "0x1A", '{' => "shift-0x1A", '#' => "shift-0x04",
+    'D' => "shift-d", 'Q' => "shift-q",  ']' => "0x1B", '}' => "shift-0x1B", '$' => "shift-0x05",
+    'E' => "shift-e", 'R' => "shift-r",  ';' => "0x27", ':' => "shift-0x27", '%' => "shift-0x06",
+    'F' => "shift-f", 'S' => "shift-s", '\'' => "0x28", '"' => "shift-0x28", '^' => "shift-0x07",
+    'G' => "shift-g", 'T' => "shift-t",  '`' => "0x29", '~' => "shift-0x29", '&' => "shift-0x08",
+    'H' => "shift-h", 'U' => "shift-u", '\\' => "0x2B", '|' => "shift-0x2B", '*' => "shift-0x09",
+    'I' => "shift-i", 'V' => "shift-v",  ',' => "0x33", '<' => "shift-0x33", '(' => "shift-0x0A",
+    'J' => "shift-j", 'W' => "shift-w",  '.' => "0x34", '>' => "shift-0x34", ')' => "shift-0x0B",
+    'K' => "shift-k", 'X' => "shift-x",  '/' => "0x35", '?' => "shift-0x35",
+    'L' => "shift-l", 'Y' => "shift-y",  ' ' => "spc",
+    'M' => "shift-m", 'Z' => "shift-z", "\n" => "ret",
 );
 
 

From 7868cb8ad4196df59879c1c9b98ac17e41d07782 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 19 May 2017 22:27:33 +0900
Subject: [PATCH 172/206] common-updater-script: fix error handling

diffutils is required for cmp command
---
 pkgs/common-updater/scripts.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix
index cb7f23f7480..b260c67ca7c 100644
--- a/pkgs/common-updater/scripts.nix
+++ b/pkgs/common-updater/scripts.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, coreutils, gawk, gnused, nix }:
+{ stdenv, makeWrapper, coreutils, gawk, gnused, diffutils, nix }:
 
 stdenv.mkDerivation {
   name = "common-updater-scripts";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     cp ${./scripts}/* $out/bin
 
     for f in $out/bin/*; do
-      wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk gnused nix ]}
+      wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk gnused nix diffutils ]}
     done
   '';
 }

From f28f96b235cf22280cfb405c98fe798b1d4ba77f Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 19 May 2017 17:19:54 +0200
Subject: [PATCH 173/206] idea.gogland: 171.3780.106 -> 171.4424.55

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/applications/editors/jetbrains/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 663ee4c9bd0..338b6e9ac5d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -134,7 +134,7 @@ let
           platform and ReSharper. Rider supports .NET Core,
           .NET Framework and Mono based projects. This lets you
           develop a wide array of applications including .NET desktop
-          apps, services and libraries, Unity games, ASP.NET and 
+          apps, services and libraries, Unity games, ASP.NET and
           ASP.NET Core web applications.
         '';
         maintainers = [ maintainers.miltador ];
@@ -209,12 +209,12 @@ in
 
   gogland = buildGogland rec {
     name = "gogland-${version}";
-    version = "171.3780.106";
+    version = "171.4424.55";
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "cbe84d07fdec6425d8ac63b0ecd5e04148299c1c0c6d05751523aaaa9360110b";
+      sha256 = "0l5pn2wj541v1xc58bpipkl483zrhwjr37grkwiwx2j4iygrikq7";
     };
     wmClass = "jetbrains-gogland";
   };

From a3696aa09087dc704f4e130ec711547054000106 Mon Sep 17 00:00:00 2001
From: Stefan Lau <stefan.lau@holidaycheck.com>
Date: Fri, 19 May 2017 14:42:36 +0200
Subject: [PATCH 174/206] networkmanager_fortisslvpn: init at 1.2.4

---
 .../services/networking/networkmanager.nix    |  5 ++-
 .../services/x11/desktop-managers/gnome3.nix  |  2 +-
 pkgs/desktops/gnome-3/3.22/default.nix        |  4 +++
 .../network-manager/fortisslvpn.nix           | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 5 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/networking/network-manager/fortisslvpn.nix

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 0c12b2c1dfd..876dbe1524e 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -124,7 +124,7 @@ in {
         type = types.attrsOf types.package;
         default = { inherit networkmanager modemmanager wpa_supplicant
                             networkmanager_openvpn networkmanager_vpnc
-                            networkmanager_openconnect
+                            networkmanager_openconnect networkmanager_fortisslvpn
                             networkmanager_pptp networkmanager_l2tp; };
         internal = true;
       };
@@ -222,6 +222,9 @@ in {
       { source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
         target = "NetworkManager/VPN/nm-openconnect-service.name";
       }
+      { source = "${networkmanager_fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
+        target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
+      }
       { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
         target = "NetworkManager/VPN/nm-pptp-service.name";
       }
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index dc9ed8acfe4..5f99c2bcf1f 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -186,7 +186,7 @@ in {
     networking.networkmanager.basePackages =
       { inherit (pkgs) networkmanager modemmanager wpa_supplicant;
         inherit (gnome3) networkmanager_openvpn networkmanager_vpnc
-                         networkmanager_openconnect networkmanager_pptp
+                         networkmanager_openconnect networkmanager_fortisslvpn networkmanager_pptp
                          networkmanager_l2tp; };
 
     # Needed for themes and backgrounds
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix
index c6b2f1a76f5..d9b26d6aee3 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/default.nix
@@ -212,6 +212,10 @@ let
     inherit gnome3;
   };
 
+  networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override {
+    inherit gnome3;
+  };
+
   networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
     inherit gnome3;
   };
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix
new file mode 100644
index 00000000000..864af033a39
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig,
+networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }:
+
+stdenv.mkDerivation rec {
+  name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
+  pname   = "NetworkManager-fortisslvpn";
+  major   = "1.2";
+  version = "${major}.4";
+
+  src = fetchurl {
+    url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
+    sha256 = "0wsbj5lvf9l1w8k5nmaqnzmldilh482bn4z4k8a3wnm62xfxgscr";
+  };
+
+  buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ]
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf gnome3.networkmanagerapplet ];
+
+  nativeBuildInputs = [ automake autoconf intltool pkgconfig ];
+
+  configureFlags = [
+    "${if withGnome then "--with-gnome" else "--without-gnome"}"
+    "--disable-static"
+    "--localstatedir=/tmp"
+  ];
+
+  preConfigure = ''
+     substituteInPlace "src/nm-fortisslvpn-service.c" \
+       --replace "/bin/openfortivpn" "${openfortivpn}/bin/openfortivpn"
+  '';
+
+  meta = {
+    description = "NetworkManager's FortiSSL plugin";
+    inherit (networkmanager.meta) maintainers platforms;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efe4e47f990..34209524504 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3192,6 +3192,8 @@ with pkgs;
 
   networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };
 
+  networkmanager_fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { };
+
   networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { };
 
   networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { };

From d0d30df4468507fcd87321ffa1b06257c8dfb098 Mon Sep 17 00:00:00 2001
From: Michael Lieberman <mlieberman85@gmail.com>
Date: Wed, 17 May 2017 20:38:48 -0400
Subject: [PATCH 175/206] confluent-kafka: init at 0.9.4

Disabled tests for python 3 since the 0.9.4 release has failing tests
when run under python 3.
---
 .../confluent-kafka/default.nix               | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/confluent-kafka/default.nix

diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
new file mode 100644
index 00000000000..bd5d8b7dca6
--- /dev/null
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  version = "0.9.4";
+  pname = "confluent-kafka";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1v8apw9f8l01ql42jg1sfqv41yxvcbxn1a3ar01y0ni428swq6wk";
+  };
+
+  buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ;
+
+  # Tests fail for python3 under this pypi release
+  doCheck = if isPy3k then false else true;
+
+  meta = with stdenv.lib; {
+    description = "Confluent's Apache Kafka client for Python";
+    homepage = "https://github.com/confluentinc/confluent-kafka-python";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ mlieberman85 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1516ccaa94f..f604081536c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4071,6 +4071,8 @@ in {
     };
   };
 
+  confluent-kafka = callPackage ../development/python-modules/confluent-kafka {};
+
 
   construct = buildPythonPackage rec {
     name = "construct-${version}";

From 31e32f28099ff6b3a40bebb6af1da24d08e65373 Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Fri, 19 May 2017 08:36:54 +0000
Subject: [PATCH 176/206] perlPackages.NetPatricia and perlPackages.NetCIDRLite
 (new)

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c1114fd049a..e36d7212521 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9838,6 +9838,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  NetCIDRLite = buildPerlPackage rec {
+    name = "Net-CIDR-Lite-0.21";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DO/DOUGW/${name}.tar.gz";
+      sha256 = "cfa125e8a2aef9259bc3a44e07cbdfb7894b64d22e7c0cee92aee2f5c7915093";
+    };
+    meta = {
+      description = "Perl extension for merging IPv4 or IPv6 CIDR addresses";
+      license = "unknown";
+    };
+  };
+
   NetCoverArtArchive = buildPerlPackage {
     name = "Net-CoverArtArchive-1.02";
     src = fetchurl {
@@ -9970,6 +9982,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  NetPatricia = buildPerlPackage rec {
+    name = "Net-Patricia-1.22";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GR/GRUBER/${name}.tar.gz";
+      sha256 = "70835a926e1c5a8d0324c72fffee82eeb7ec6c141dee04fd446820b64f71c552";
+    };
+    propagatedBuildInputs = [ NetCIDRLite Socket6 ];
+    meta = {
+      license = "unknown";
+    };
+  };
+
   NetPing = buildPerlPackage {
     name = "Net-Ping-2.41";
     src = fetchurl {

From 0fbc6630a31b6188a750a0b6f8f703a366f23b6c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 19 May 2017 20:32:45 +0200
Subject: [PATCH 177/206] perl-Socket6: 0.25 -> 0.28

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e36d7212521..95a0f67573e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11690,13 +11690,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   Socket6 = buildPerlPackage rec {
-    name = "Socket6-0.25";
+    name = "Socket6-0.28";
     src = fetchurl {
       url = "mirror://cpan/authors/id/U/UM/UMEMOTO/${name}.tar.gz";
-      sha256 = "1ads4k4vvq6pnxkdw0s8gaj03w4h9snxyw7zyikfzd20fy76yx6s";
+      sha256 = "bfd49ab99f3197c99285fed4683c4edc06277c1e4453f593e694d7bff0974586";
     };
     setOutputFlags = false;
     buildInputs = [ pkgs.which ];
+    meta = {
+      description = "IPv6 related part of the C socket.h defines and structure manipulators";
+      license = stdenv.lib.licenses.bsd3;
+    };
   };
 
   SoftwareLicense = buildPerlPackage rec {

From b71b7ee62234dbf1863e9595bfeed961e951e491 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 19 May 2017 15:38:01 -0400
Subject: [PATCH 178/206] fetchFromGitHub: Allow private repos, hosted githubs

---
 pkgs/build-support/fetchurl/default.nix | 16 +++++++++++++++-
 pkgs/top-level/all-packages.nix         | 23 +++++++++++++++++++----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index fea06e22ab4..5811950bf05 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -59,6 +59,13 @@ in
 
 , recursiveHash ? false
 
+, # Shell code to build a netrc file for BASIC auth
+  netrcPhase ? null
+
+, # Impure env vars (http://nixos.org/nix/manual/#sec-advanced-attributes)
+  # needed for netrcPhase
+  netrcImpureEnvVars ? []
+
 , # Shell code executed after the file has been fetched
   # successfully. This can do things like check or transform the file.
   postFetch ? ""
@@ -118,11 +125,18 @@ else stdenv.mkDerivation {
 
   outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
 
-  inherit curlOpts showURLs mirrorsFile impureEnvVars postFetch downloadToTemp executable;
+  inherit curlOpts showURLs mirrorsFile postFetch downloadToTemp executable;
+
+  impureEnvVars = impureEnvVars ++ netrcImpureEnvVars;
 
   # Doing the download on a remote machine just duplicates network
   # traffic, so don't do that.
   preferLocalBuild = true;
 
+  postHook = if netrcPhase == null then null else ''
+    ${netrcPhase}
+    curlOpts="$curlOpts --netrc-file $PWD/netrc"
+  '';
+
   inherit meta;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9157573d1e8..cc97682b52c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -185,12 +185,14 @@ with pkgs;
 
   fetchFromGitHub = {
     owner, repo, rev, name ? "${repo}-${rev}-src",
-    fetchSubmodules ? false,
+    fetchSubmodules ? false, private ? false,
+    githubBase ? "github.com", varPrefix ? null,
     ... # For hash agility
-  }@args:
+  }@args: assert private -> !fetchSubmodules;
   let
-    baseUrl = "https://github.com/${owner}/${repo}";
-    passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" ];
+    baseUrl = "https://${githubBase}/${owner}/${repo}";
+    passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ];
+    varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_";
   in if fetchSubmodules then
     fetchgit ({
       inherit name rev fetchSubmodules;
@@ -203,6 +205,19 @@ with pkgs;
       inherit name;
       url = "${baseUrl}/archive/${rev}.tar.gz";
       meta.homepage = "${baseUrl}/";
+    } // lib.optionalAttrs private {
+      netrcPhase = ''
+        if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then
+          echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2
+          exit 1
+        fi
+        cat > netrc <<EOF
+        machine ${githubBase}
+                login ''$${varBase}USERNAME
+                password ''$${varBase}PASSWORD
+        EOF
+      '';
+      netrcImpureEnvVars = [ "${varBase}USERNAME" "${varBase}PASSWORD" ];
     } // passthruAttrs) // { inherit rev; };
 
   fetchFromBitbucket = {

From 2f455390a575dbf7484db456a21553fb71094cd4 Mon Sep 17 00:00:00 2001
From: spamntaters <smurra28@uncc.edu>
Date: Fri, 19 May 2017 19:48:28 -0400
Subject: [PATCH 179/206] Opera: 44.0.2510.857 -> 45.0.2552.812

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

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 2863ee876e7..270089b9936 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -37,7 +37,7 @@
 let
 
   mirror = https://get.geo.opera.com/pub/opera/desktop;
-  version = "44.0.2510.857";
+  version = "45.0.2552.812";
 
   rpath = stdenv.lib.makeLibraryPath [
 
@@ -91,12 +91,12 @@ in stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
-        sha256 = "1589phaxbzmsr70afzqkrlm4fy4nwf2c0gn4rbv2ah2bq62bcp36";
+        sha256 = "0qhh7wwj3v8adz7ppjkpmfc04rxfjjhnnkawfvghlv77sjgnyml2";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
-        sha256 = "1fah9pm42ljdcdqgxjikb03c8393smhh3g2rbkhrvmjwknba05ym";
+        sha256 = "0xf1j8abk8f0kbjarsk1y1yna1zwrn0qc4fi1swjsxf5rx027fir";
       }
     else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
 

From 58c17c75baa3e9fbad72cf9d306542189edc24da Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 19 May 2017 20:48:31 -0300
Subject: [PATCH 180/206] elementary-icon-theme: 4.0.3 -> 4.1.0

---
 pkgs/data/icons/elementary-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix
index 76460bd7acf..d1fa3654070 100644
--- a/pkgs/data/icons/elementary-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-icon-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.3";
+  version = "4.1.0";
 
   package-name = "elementary-icon-theme";
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz";
-    sha256 = "0i3cp0wiy4g6d6symyfv3hvmw97109lfakd4qyphabbqllc9xlxb";
+    sha256 = "08pkk4299dj442dby15lwxwz7bax5d3828v1f81mbll084k7vssm";
   };
 
   dontBuild = true;

From 28e05a0dfd89bdb70dcdde6f2df4342f02a0c26e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 20 May 2017 12:13:59 +0800
Subject: [PATCH 181/206] keybase-gui: 1.0.18 -> 1.0.23

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

diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix
index b1d8181da65..636b955ddfc 100644
--- a/pkgs/tools/security/keybase-gui/default.nix
+++ b/pkgs/tools/security/keybase-gui/default.nix
@@ -36,10 +36,10 @@ let
 in
 stdenv.mkDerivation rec {
   name = "keybase-gui-${version}";
-  version = "1.0.18-20170209170023.17b641d";
+  version = "1.0.23-20170519175207.d6c5e9e";
   src = fetchurl {
     url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb";
-    sha256 = "01mr6hyzs208g3ankl4swikna66n85xzn7ig4k7p6hxmnnvplgb3";
+    sha256 = "14nylwpd64ngx1kdb4pk2laghslx9872fb2a9jgkbgbgnan5nkmm";
   };
   phases = ["unpackPhase" "installPhase" "fixupPhase"];
   unpackPhase = ''

From 029125b973e4c44b20e288d43dfb9a46b18e3ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 20 May 2017 06:58:42 +0100
Subject: [PATCH 182/206] postgresql: add man output

the doc output is not installed by default (where manpages where
included). This leads to manpages not present when enabling postgresql
service. fixes #25928
---
 pkgs/servers/sql/postgresql/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 50101fc5ce8..2362ee84329 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -11,7 +11,7 @@ let
       inherit sha256;
     };
 
-    outputs = [ "out" "lib" "doc" ];
+    outputs = [ "out" "lib" "doc" "man" ];
     setOutputFlags = false; # $out retains configureFlags :-/
 
     buildInputs =

From d89aaca61130c82c700fe3a9c0e75f878e3e31bd Mon Sep 17 00:00:00 2001
From: Protean Security <info@proteansec.com>
Date: Sat, 20 May 2017 08:51:36 +0200
Subject: [PATCH 183/206] tcpreplay: init at 4.2.5 (#25891)

* tcpreplay: init at 4.2.5

* fix the license meta info

* tcpreplay: use bsd3 license from lib.licenses
---
 pkgs/tools/networking/tcpreplay/default.nix | 31 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/networking/tcpreplay/default.nix

diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix
new file mode 100644
index 00000000000..236faa067ad
--- /dev/null
+++ b/pkgs/tools/networking/tcpreplay/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, libpcap, tcpdump }:
+
+stdenv.mkDerivation rec {
+  name = "tcpreplay-${version}";
+  version = "4.2.5";
+
+  src = fetchurl {
+    url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz";
+    sha256 = "1mw9r97blczm70rjf7p83sd1fxpzdzfvsbnjsc0m3nz16jz2c44l";
+  };
+
+  buildInputs = [ libpcap ];
+
+  configureFlags = [
+    "--disable-local-libopts"
+    "--disable-libopts-install"
+    "--enable-dynamic-link"
+    "--enable-shared"
+    "--enable-tcpreplay-edit"
+    "--with-libpcap=${libpcap}"
+    "--with-tcpdump=${tcpdump}/bin"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A suite of utilities for editing and replaying network traffic";
+    homepage = http://tcpreplay.appneta.com/;
+    license = with licenses; [ bsd3 gpl3 ];
+    maintainers = with maintainers; [ eleanor ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc97682b52c..f5673e26065 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4235,6 +4235,8 @@ with pkgs;
 
   tcpkali = callPackage ../applications/networking/tcpkali { };
 
+  tcpreplay = callPackage ../tools/networking/tcpreplay { };
+
   teamviewer = callPackage ../applications/networking/remote/teamviewer {
     stdenv = stdenv_32bit;
   };

From f76ce5983d9413568b260c2187d8278a76de6689 Mon Sep 17 00:00:00 2001
From: Unai Zalakain <unai@gisa-elkartea.org>
Date: Sat, 20 May 2017 09:19:40 +0200
Subject: [PATCH 184/206] rarfile: 2.6 -> 3.0 (#25885)

* rarfile: 2.6 -> 3.0

* rarfile: enable tests
---
 .../python-modules/rarfile/default.nix        | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 14 +--------
 2 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/python-modules/rarfile/default.nix

diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix
new file mode 100644
index 00000000000..7231da9d3d0
--- /dev/null
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, nose, unrar, glibcLocales }:
+
+buildPythonPackage rec {
+  name = "rarfile-${version}";
+  version = "3.0";
+
+  src = fetchFromGitHub {
+    owner = "markokr";
+    repo = "rarfile";
+    rev = "rarfile_3_0";
+    sha256 = "07yliz6p1bxzhipnrgz133gl8laic35gl4rqfay7f1vc384ch7sn";
+  };
+  buildInputs = [ pytest nose glibcLocales ];
+
+  prePatch = ''
+    substituteInPlace rarfile.py \
+      --replace 'UNRAR_TOOL = "unrar"' "UNRAR_TOOL = \"${unrar}/bin/unrar\""
+  '';
+  LC_ALL = "en_US.UTF-8";
+  checkPhase = ''
+    py.test test -k "not test_printdir"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "RAR archive reader for Python";
+    homepage = https://github.com/markokr/rarfile;
+    license = licenses.isc;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 96b5db7ee04..50587c0004c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2619,19 +2619,7 @@ in {
 
   };
 
-  rarfile = self.buildPythonPackage rec {
-    name = "rarfile-2.6";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/rarfile/rarfile-2.6.tar.gz";
-      sha256 = "326700c5450cfb367f612e918866ea27551bac02f4656f340003c88873fa1a56";
-    };
-
-    meta = {
-      description = "rarfile - RAR archive reader for Python";
-      homepage = https://github.com/markokr/rarfile;
-    };
-  };
+  rarfile = callPackage ../development/python-modules/rarfile {};
 
   proboscis = buildPythonPackage rec {
     name = "proboscis-1.2.6.0";

From 72589c9d30cba3e6b4a2652a477950a0d32f9529 Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin@protonmail.com>
Date: Sat, 20 May 2017 09:52:11 +0200
Subject: [PATCH 185/206] Typora: init at 0.9.29 (#25899)

* Typora: init at 0.9.29

* typora: adapt description
---
 pkgs/applications/editors/typora/default.nix | 89 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 91 insertions(+)
 create mode 100644 pkgs/applications/editors/typora/default.nix

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
new file mode 100644
index 00000000000..442a2e2224e
--- /dev/null
+++ b/pkgs/applications/editors/typora/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, atk, cairo
+, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev }:
+
+stdenv.mkDerivation rec {
+  name = "typora-${version}";
+  version = "0.9.29";
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
+        sha256 = "1d7a02ee603be871d6f8c25b5c11069267ec11644a4f513635c0769ce46a44a7";
+      }
+    else
+      fetchurl {
+        url = "https://www.typora.io/linux/typora_${version}_i386.deb";
+        sha256 = "79834b0ccd2257c030aec850ebc81fe115f46891b482f1ffa41fcc19c5f29659";
+      }
+    ;
+
+    rpath = stdenv.lib.makeLibraryPath [
+      alsaLib
+      gnome2.GConf
+      gnome2.gtk
+      gnome2.gdk_pixbuf
+      gnome2.pango
+      expat
+      atk
+      nspr
+      nss
+      stdenv.cc.cc
+      glib
+      cairo
+      cups
+      dbus
+      udev
+      fontconfig
+      freetype
+      xorg.libX11
+      xorg.libXi
+      xorg.libXext
+      xorg.libXtst
+      xorg.libXfixes
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXrender
+      xorg.libXrandr
+      xorg.libXcomposite
+      xorg.libxcb
+      xorg.libXScrnSaver
+  ];
+
+
+  buildInputs = [ dpkg makeWrapper ];
+
+  unpackPhase = "true";
+  installPhase = ''
+    mkdir -p $out
+    dpkg -x $src $out
+    cp -av $out/usr/* $out
+    rm $out/bin/typora
+
+    # Otherwise it looks "suspicious"
+    chmod -R g-w $out
+  '';
+
+  postFixup = ''
+     patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "$out/share/typora:${rpath}" "$out/share/typora/Typora"
+
+    ln -s "$out/share/typora/Typora" "$out/bin/typora"
+
+    # Fix the desktop link
+    substituteInPlace $out/share/applications/typora.desktop \
+      --replace /usr/bin/ $out/bin/ \
+      --replace /usr/share/ $out/share/
+
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A minimal Markdown reading & writing app";
+    homepage = "https://typora.io";
+    license = licenses.free;
+    maintainers = with stdenv.lib.maintainers; [ jensbin ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5673e26065..2e4d64ff01c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15062,6 +15062,8 @@ with pkgs;
     inherit (gnome3) defaultIconTheme;
   };
 
+  typora = callPackage ../applications/editors/typora { };
+
   librep = callPackage ../development/libraries/librep { };
 
   rep-gtk = callPackage ../development/libraries/rep-gtk { };

From 1541140473058135867660bee66393eac081198b Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Fri, 12 May 2017 22:01:25 +0200
Subject: [PATCH 186/206] emby service: allow changing data directory

---
 nixos/modules/services/misc/emby.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix
index 9f290ed70c9..e295f0f930e 100644
--- a/nixos/modules/services/misc/emby.nix
+++ b/nixos/modules/services/misc/emby.nix
@@ -22,6 +22,12 @@ in
         default = "emby";
         description = "Group under which emby runs.";
       };
+
+      dataDir = mkOption {
+        type = types.path;
+        default = "/var/lib/emby/ProgramData-Server";
+        description = "Location where Emby stores its data.";
+      };
     };
   };
 
@@ -31,10 +37,10 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       preStart = ''
-        test -d /var/lib/emby/ProgramData-Server || {
-          echo "Creating initial Emby data directory in /var/lib/emby/ProgramData-Server"
-          mkdir -p /var/lib/emby/ProgramData-Server
-          chown -R ${cfg.user}:${cfg.group} /var/lib/emby/ProgramData-Server
+        test -d ${cfg.dataDir} || {
+          echo "Creating initial Emby data directory in ${cfg.dataDir}"
+          mkdir -p ${cfg.dataDir}
+          chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
           }
       '';
 

From 9d86b49f2af32ca358d0b70d12ab9264ce55bb90 Mon Sep 17 00:00:00 2001
From: risicle <github@humanleg.org.uk>
Date: Sat, 20 May 2017 10:30:10 +0100
Subject: [PATCH 187/206] python metaphone: init at 0.6 (#25868)

* metaphone: init at 0.6

* metaphone: add self as maintainer
---
 lib/maintainers.nix                           |  1 +
 .../python-modules/metaphone/default.nix      | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/metaphone/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 81a605323c1..33a0760fad1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -452,6 +452,7 @@
   rht = "rht <rhtbot@protonmail.com>";
   rick68 = "Wei-Ming Yang <rick68@gmail.com>";
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
+  ris = "Robert Scott <code@humanleg.org.uk>";
   rlupton20 = "Richard Lupton <richard.lupton@gmail.com>";
   rnhmjoj = "Michele Guerini Rocco <micheleguerinirocco@me.com>";
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
diff --git a/pkgs/development/python-modules/metaphone/default.nix b/pkgs/development/python-modules/metaphone/default.nix
new file mode 100644
index 00000000000..b72789369f2
--- /dev/null
+++ b/pkgs/development/python-modules/metaphone/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchPypi, nose }:
+
+buildPythonPackage rec {
+  pname = "Metaphone";
+  version = "0.6";
+  name  = "metaphone-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09ysaczwh2rlsqq9j5fz7m4pq2fs0axp5vvivrpfrdvclvffl2xd";
+  };
+
+  disabled = isPy3k;
+
+  buildInputs = [ nose ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/oubiwann/metaphone;
+    description = "A Python implementation of the metaphone and double metaphone algorithms";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ris ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 50587c0004c..1f09cf5c367 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14022,6 +14022,8 @@ in {
     };
   };
 
+  metaphone = callPackage ../development/python-modules/metaphone { };
+
   mezzanine = buildPythonPackage rec {
     version = "3.1.10";
     name = "mezzanine-${version}";

From 486a073d21f8cfdbb1592e55c7cca0479a6c2cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 20 May 2017 10:40:08 +0100
Subject: [PATCH 188/206] mynewt-newt: disable darwin

---
 pkgs/tools/package-management/mynewt-newt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix
index 3b37f57d039..1b8c1b2f640 100644
--- a/pkgs/tools/package-management/mynewt-newt/default.nix
+++ b/pkgs/tools/package-management/mynewt-newt/default.nix
@@ -24,6 +24,6 @@ buildGoPackage rec {
     '';
     license = licenses.asl20;
     maintainers = with maintainers; [ pjones ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }

From c3cbbd09a049fae58e394cae375dbd3d09f62cae Mon Sep 17 00:00:00 2001
From: Unai Zalakain <unai@gisa-elkartea.org>
Date: Thu, 18 May 2017 01:17:31 +0200
Subject: [PATCH 189/206] metar: init at 20161013.1

---
 lib/maintainers.nix                      |  1 +
 pkgs/applications/misc/metar/default.nix | 30 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/misc/metar/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 33a0760fad1..c2643d67348 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -587,6 +587,7 @@
   yurrriq = "Eric Bailey <eric@ericb.me>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
   zagy = "Christian Zagrodnick <cz@flyingcircus.io>";
+  zalakain = "Unai Zalakain <contact@unaizalakain.info>";
   zauberpony = "Elmar Athmer <elmar@athmer.org>";
   zef = "Zef Hemel <zef@zef.me>";
   zimbatm = "zimbatm <zimbatm@zimbatm.com>";
diff --git a/pkgs/applications/misc/metar/default.nix b/pkgs/applications/misc/metar/default.nix
new file mode 100644
index 00000000000..ca4f91533ec
--- /dev/null
+++ b/pkgs/applications/misc/metar/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, curl }:
+
+stdenv.mkDerivation {
+  name = "metar-20161013.1";
+
+  src = fetchgit {
+    url = "https://github.com/keesL/metar.git";
+    rev = "20e9ca69faea330f6c2493b6829131c24cb55147";
+    sha256 = "1fgrlnpasqf1ihh9y6zy6mzzybqx0lxvh7gmv03rjdb55dr42dxj";
+  };
+
+  buildInputs = [ curl ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/keesL/metar;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.zalakain ];
+    description = "Downloads weather reports and optionally decodes them";
+    longDescription = ''
+      METAR reports are meteorogical weather reports for aviation. Metar is a small
+      program which downloads weather reports for user-specified stations and
+      optionally decodes them into a human-readable format.
+
+      Currently, metar supports decoding date/time, wind, visibility, cloud layers,
+      temperature, air pressure and weather phenomena, such as rain, fog, etc. Also,
+      more work in the area of clouds need to be done, as support for Cumulus or
+      Cumulunimbus is not yet decoded.
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0cc99f39641..ae836bd8fee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3020,6 +3020,8 @@ with pkgs;
 
   metamorphose2 = callPackage ../applications/misc/metamorphose2 { };
 
+  metar = callPackage ../applications/misc/metar { };
+
   mfcuk = callPackage ../tools/security/mfcuk { };
 
   mfoc = callPackage ../tools/security/mfoc { };

From 2944ca8f6a966ce119a5678e964300afc9a358ce Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 20 May 2017 13:04:44 +0200
Subject: [PATCH 190/206] coturn: 4.5.0.3 -> 4.5.0.6

fixes build with openssl 1.1
---
 pkgs/servers/coturn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index ab14ee92a24..8df584435a2 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -4,13 +4,13 @@ let inherit (stdenv.lib) optional; in
 
 stdenv.mkDerivation rec {
   name = "coturn-${version}";
-  version = "4.5.0.3";
+  version = "4.5.0.6";
 
   src = fetchFromGitHub {
     owner = "coturn";
     repo = "coturn";
     rev = "${version}";
-    sha256 = "1xr4dp3p16m4rq9mdsprs6s50rnif6hk38xx9siyykgfjnwr6i9g";
+    sha256 = "084c3zgwmmz4s6211i5jbkzsn13703lsg7vhc2cpacazq4sgsrhb";
   };
 
   buildInputs = [ openssl libevent ];

From d0ffb23442802b7d810abb0b987c6f160c6aaef3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 20 May 2017 12:38:52 +0200
Subject: [PATCH 191/206] php70: 7.0.16 -> 7.0.19

fixes build with openssl 1.1
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 96ea21e0205..dc1df2dd48a 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -329,8 +329,8 @@ in {
   };
 
   php70 = generic {
-    version = "7.0.16";
-    sha256 = "1awp6l5bs7qkvak9hgn1qbwkn6303mprslmgcfjyq3ywfmszbic3";
+    version = "7.0.19";
+    sha256 = "0nbxgx5fkj1bcach97a3169kwic7jbd4b435n7v25v1aq2pw0fhg";
   };
 
   php71 = generic {

From 8952d75b0cfe86b6c91279384ebc3068c42c7563 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 7 May 2017 18:38:22 +0200
Subject: [PATCH 192/206] duo-unix: 1.9.19 -> 1.9.20

fixes build with openssl 1.1
---
 pkgs/tools/security/duo-unix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix
index 05ce60a0508..729f85a73fc 100644
--- a/pkgs/tools/security/duo-unix/default.nix
+++ b/pkgs/tools/security/duo-unix/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "duo-unix-${version}";
-  version = "1.9.19";
+  version = "1.9.20";
 
   src = fetchurl {
     url    = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz";
-    sha256 = "02hvayknj0kvdik4mqm9j9isqzxk0f992i9v274s27891xqgj8rd";
+    sha256 = "0zxrpdbgi8k8jbqg5yxjv3b0lz9kpk89pglwb3lqlvzscbxdv5qj";
   };
 
   buildInputs = [ pam openssl zlib ];

From ff5b5ef553ade6c59cd95ff5d8d4c80714e21de9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 7 May 2017 18:36:24 +0200
Subject: [PATCH 193/206] dmg2img: 1.6.5 -> 1.6.7

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

diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix
index 9ab9478e543..df084579b79 100644
--- a/pkgs/tools/misc/dmg2img/default.nix
+++ b/pkgs/tools/misc/dmg2img/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "dmg2img-1.6.5";
+  name = "dmg2img-1.6.7";
 
   src = fetchurl {
     url = "http://vu1tur.eu.org/tools/${name}.tar.gz";
-    sha256 = "021ka05vq7lsdngsglmv93r2j0vfakrkx964xslzhaybwp5ic2j0";
+    sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2";
   };
 
   buildInputs = [zlib bzip2 openssl];
@@ -17,5 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.unix;
+    description = "An Apple's compressed dmg to standard (hfsplus) image disk file convert tool.";
+    license = stdenv.lib.licenses.gpl3;
   };
 }

From c9f3893451103c52e70566a5d043ab5e35014e6c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 7 May 2017 18:30:44 +0200
Subject: [PATCH 194/206] despotify: remove

broken and doesn't build with openssl 1.1
---
 .../libraries/despotify/default.nix           | 36 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 38 deletions(-)
 delete mode 100644 pkgs/development/libraries/despotify/default.nix

diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix
deleted file mode 100644
index 43c8d18eb88..00000000000
--- a/pkgs/development/libraries/despotify/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  stdenv, fetchsvn, openssl, zlib, libvorbis, libpulseaudio, gstreamer, libao,
-  libtool, ncurses, glibc
-}:
-
-stdenv.mkDerivation rec {
-
-  name = "despotify-svn521";
-
-  src = fetchsvn {
-    url = "http://svn.code.sf.net/p/despotify/code";
-    rev = "521";
-    sha256 = "1vc453bv5ngkvaqkq7z5bj6x28m4kik59153jikcfah3k4qmxw21";
-  };
-
-  buildInputs = [
-    openssl zlib libvorbis libpulseaudio gstreamer libao libtool ncurses glibc
-  ];
-
-  configurePhase = "cd src";
-
-  installPhase = "make LDCONFIG=true INSTALL_PREFIX=$out install";
-
-  meta = {
-    description = "Open source Spotify client and library";
-    longDescription = ''
-      despotify is a open source implementation of the Spotify API.  This
-      package provides both a library and a few already quite useful,
-      proof-of-concept clients.
-    '';
-    homepage = "http://despotify.se";
-    license = stdenv.lib.licenses.bsd2;
-    platforms = stdenv.lib.platforms.linux;
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae836bd8fee..f4f8c6649a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1529,8 +1529,6 @@ with pkgs;
 
   desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { };
 
-  despotify = callPackage ../development/libraries/despotify { };
-
   dfc  = callPackage ../tools/system/dfc { };
 
   dev86 = callPackage ../development/compilers/dev86 { };

From 330048e40cd50d478c99d7ce044cd7fc999c8423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= <val@codejam.info>
Date: Sat, 20 May 2017 07:33:28 -0400
Subject: [PATCH 195/206] timelapse-deflicker: init at 142acd1 (#25904)

* timelapse-deflicker: init at 142acd1

* timelapse-deflicker: nitpicks

* Add myself as a maintainer
---
 lib/maintainers.nix                           |  1 +
 .../graphics/timelapse-deflicker/default.nix  | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/perl-packages.nix              | 13 ++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/graphics/timelapse-deflicker/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c2643d67348..59675697978 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -563,6 +563,7 @@
   vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
   vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>";
   vmchale = "Vanessa McHale <tmchale@wisc.edu>";
+  valeriangalliat = "Valérian Galliat <val@codejam.info>";
   volhovm = "Mikhail Volkhov <volhovm.cs@gmail.com>";
   volth = "Jaroslavas Pocepko <jaroslavas@volth.com>";
   vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/applications/graphics/timelapse-deflicker/default.nix
new file mode 100644
index 00000000000..b4ddb143685
--- /dev/null
+++ b/pkgs/applications/graphics/timelapse-deflicker/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }:
+
+stdenv.mkDerivation rec {
+  name = "timelapse-deflicker-${version}";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "cyberang3l";
+    repo = "timelapse-deflicker";
+    rev = "v${version}";
+    sha256 = "0bbfnrdycrpyz7rqrql5ib9qszny7z5xpqp65c1mxqd2876gv960";
+  };
+
+  installPhase = ''
+    install -m755 -D timelapse-deflicker.pl $out/bin/timelapse-deflicker
+    wrapProgram $out/bin/timelapse-deflicker --set PERL5LIB $PERL5LIB
+  '';
+
+  buildInputs = with perlPackages; [
+    makeWrapper perl
+    PerlMagick TermProgressBar ImageExifTool
+    FileType ClassMethodMaker
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Simple script to deflicker images taken for timelapses";
+    homepage = https://github.com/cyberang3l/timelapse-deflicker;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ valeriangalliat ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4f8c6649a8..e0354c93984 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4266,6 +4266,8 @@ with pkgs;
 
   timemachine = callPackage ../applications/audio/timemachine { };
 
+  timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { };
+
   timetrap = callPackage ../applications/office/timetrap { };
 
   tinc = callPackage ../tools/networking/tinc { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 95a0f67573e..4874d5d01a2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5535,6 +5535,19 @@ let self = _self // overrides; _self = with self; {
 
   FileTemp = null;
 
+  FileType = buildPerlPackage {
+    name = "File-Type-0.22";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz;
+      sha256 = "0hfkaafp6wb0nw19x47wc6wc9mwlw8s2rxiii3ylvzapxxgxjp6k";
+    };
+    meta = {
+      description = "File::Type uses magic numbers (typically at the start of a file) to determine the MIME type of that file.";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      platforms = with stdenv.lib.platforms; linux ++ darwin;
+    };
+  };
+
   FileSlurp = buildPerlPackage {
     name = "File-Slurp-9999.19";
     # WARNING: check on next update if deprecation warning is gone

From b447f624c35660db50cd8202563557b089efad38 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 20 May 2017 14:24:03 +0200
Subject: [PATCH 196/206] bind: 9.10.4-P6 -> 9.10.5

---
 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 350e3be929d..8ac9280b874 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -3,14 +3,14 @@
 
 assert enableSeccomp -> libseccomp != null;
 
-let version = "9.10.4-P6"; in
+let version = "9.10.5"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0rgffdm0h6dks0np4h9q4kd8nyb3azrdxw2skqnjzd8ws78vzpx1";
+    sha256 = "03ibhzy9577w78kgh6ynl90a2hlbnz0krygffm820hjf2cp8ss3i";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From b21540c4a668ebe34e1868c21e7dd8cc653fdabd Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 20 May 2017 08:34:33 -0400
Subject: [PATCH 197/206] coq: Add emacs buffer setup

---
 .../science/logic/coq/default.nix             | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index bc9ba049cd2..9faa9d8feb8 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -26,9 +26,7 @@ let
     substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
     substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
   '' else "";
-in
-
-stdenv.mkDerivation {
+self = stdenv.mkDerivation {
   name = "coq-${version}";
 
   inherit coq-version;
@@ -36,6 +34,19 @@ stdenv.mkDerivation {
   inherit (ocamlPackages) ocaml;
   passthru = {
     inherit (ocamlPackages) findlib;
+    emacsBufferSetup = pkgs: ''
+      ; Propagate coq paths to children
+      (inherit-local-permanent coq-prog-name "${self}/bin/coqtop")
+      (inherit-local-permanent coq-dependency-analyzer "${self}/bin/coqdep")
+      (inherit-local-permanent coq-compiler "${self}/bin/coqc")
+      ; If the coq-library path was already set, re-set it based on our current coq
+      (when (fboundp 'get-coq-library-directory)
+        (inherit-local-permanent coq-library-directory (get-coq-library-directory))
+        (coq-prog-args))
+      (mapc (lambda (arg)
+        (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib"))
+          (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${stdenv.lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)}))
+    '';
   };
 
   src = fetchurl {
@@ -93,4 +104,4 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
     platforms = platforms.unix;
   };
-}
+}; in self

From e46ca1b95f4d91791c180346c8f78e1496b83499 Mon Sep 17 00:00:00 2001
From: marcnnn <marcnnn@users.noreply.github.com>
Date: Sat, 20 May 2017 15:00:39 +0200
Subject: [PATCH 198/206] cvc4: 1.5pre-smtcomp2016 -> unstable-2017-05-18
 (#25808)

* cvc4: 1.5pre-smtcomp2016 -> 1.5pre-20170514

* cvc4: use stable url

upstream delete their tarballs
---
 .../applications/science/logic/cvc4/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix
index 91ee4e41899..acde7f6ae43 100644
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/pkgs/applications/science/logic/cvc4/default.nix
@@ -1,15 +1,18 @@
-{ stdenv, fetchurl, cln, gmp, swig, pkgconfig, readline, libantlr3c, boost, jdk, autoreconfHook, python2 }:
+{ stdenv, fetchFromGitHub, cln, gmp, swig, pkgconfig, readline, libantlr3c,
+boost, jdk, autoreconfHook, python2, antlr3_4 }:
 
 stdenv.mkDerivation rec {
-  name = "cvc4-${version}";
-  version = "1.5pre-smtcomp2016";
+  name = "cvc4-unstable-${version}";
+  version = "2017-05-18";
 
-  src = fetchurl {
-    url = "http://cvc4.cs.nyu.edu/builds/src/cvc4-${version}.tar.gz";
-    sha256 = "15wz0plfc9q8acrwq1ljgsgqmh8pyz5alzv5xpchvv9w76lvj2zf";
+  src = fetchFromGitHub {
+    owner = "CVC4";
+    repo = "CVC4";
+    rev = "d77107cc56b0a089364c3d1512813701c155ea93";
+    sha256 = "085bjrrm33rl5pwqx13af9sgni9cfbg70wag6lm08jj41ws411xs";
   };
 
-  buildInputs = [ gmp cln pkgconfig readline swig libantlr3c boost jdk autoreconfHook python2 ];
+  buildInputs = [ gmp cln pkgconfig readline swig libantlr3c antlr3_4 boost jdk autoreconfHook python2 ];
   configureFlags = [
     "--enable-language-bindings=c,c++,java"
     "--enable-gpl"

From 877f95f12b438850ee112784f763e04cab48e85a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 20 May 2017 09:02:36 -0400
Subject: [PATCH 199/206] nix-buffer: 3.0.0 -> 3.0.1

---
 pkgs/applications/editors/emacs-modes/melpa-generated.nix   | 6 +++---
 .../editors/emacs-modes/melpa-stable-generated.nix          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index faf73def6db..99d08e87f67 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -47126,12 +47126,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "20170305.1601";
+        version = "20170520.553";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "89d30002eddcc33c5c74dcc871a97aee0228d403";
-          sha256 = "0pz1p8mdk988x4k41qi3j8rf6g33gj6lx4dm9sgfyzgzi9ixyma8";
+          rev = "749f48b510d0fd47dac67850f4089119fbff142a";
+          sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 83d9a0b899c..8ac454a5047 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -23319,12 +23319,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "3.0.0";
+        version = "3.0.1";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "89d30002eddcc33c5c74dcc871a97aee0228d403";
-          sha256 = "0pz1p8mdk988x4k41qi3j8rf6g33gj6lx4dm9sgfyzgzi9ixyma8";
+          rev = "749f48b510d0fd47dac67850f4089119fbff142a";
+          sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";

From cb19bc8a452a593c004a8aafb5114f30ed11ba04 Mon Sep 17 00:00:00 2001
From: Miguel Madrid <mimadrid@users.noreply.github.com>
Date: Sat, 20 May 2017 15:04:33 +0200
Subject: [PATCH 200/206] brotli: 0.5.2 -> 0.6.0 (#25812)

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

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index 111d4125684..c900cfa79f7 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "brotli-${version}";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "brotli";
     rev = "v" + version;
-    sha256 = "0wjypkzhbv30x30j2z8ba45r6nm4k98hsa4i42kqx03vzarsr2l4";
+    sha256 = "1wapq5hzflbmrcqgz92iv79rm893bskh03kvqgnn33dzbz3slavs";
   };
 
   buildInputs = [ cmake ];

From 357f193c9d86a75699dbf0a8b46a0126ca1c7939 Mon Sep 17 00:00:00 2001
From: Stefan Lau <stefan.lau@holidaycheck.com>
Date: Mon, 15 May 2017 13:55:30 +0200
Subject: [PATCH 201/206] chromedriver: 2.25 -> 2.29

---
 .../tools/selenium/chromedriver/default.nix   | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 66e3901c33e..48b9e206eaf 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -3,14 +3,14 @@
 , libXi, libXrender, libXext, lib
 }:
 let
-  spec = if stdenv.system == "i686-linux" then { system="linux32"; sha256="5d267a8d59f18f1134966e312997b75976f8d816318b5b79b8357a3ac2c022da"; }
-    else if stdenv.system == "x86_64-linux" then { system="linux64"; sha256="d011749e76305b5591b5500897939b33fac460d705d9815b8c03c53b0e1ecc7c"; }
-    else if stdenv.system == "x86_64-darwin" then { system="mac64"; sha256="e95fb36ab85264e16c51d58dd9766624eca6b6339569da0460088f4c788c67ad"; }
+  spec = if stdenv.system == "i686-linux" then { system="linux32"; sha256="70845d81304c5f5f0b7f65274216e613e867e621676a09790c8aa8ef81ea9766"; }
+    else if stdenv.system == "x86_64-linux" then { system="linux64"; sha256="bb2cf08f2c213f061d6fbca9658fc44a367c1ba7e40b3ee1e3ae437be0f901c2"; }
+    else if stdenv.system == "x86_64-darwin" then { system="mac64"; sha256="6c30bba7693ec2d9af7cd9a54729e10aeae85c0953c816d9c4a40a1a72fd8be0"; }
     else abort "missing chromedriver binary for ${stdenv.system}";
 in
 stdenv.mkDerivation rec {
   name = "chromedriver-${version}";
-  version = "2.25";
+  version = "2.29";
 
   src = fetchurl {
     url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";
@@ -21,12 +21,19 @@ stdenv.mkDerivation rec {
 
   unpackPhase = "unzip $src";
 
+  libs = stdenv.lib.makeLibraryPath [
+    stdenv.cc.cc.lib
+    cairo fontconfig freetype
+    gdk_pixbuf glib gtk2 gconf
+    libX11 nspr nss pango libXrender
+    gconf libXext libXi
+  ];
+
   installPhase = ''
-    mkdir -p $out/bin
-    mv chromedriver $out/bin
-    ${lib.optionalString (!stdenv.isDarwin) "patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver"}
-    ${lib.optionalString (!stdenv.isDarwin) ''wrapProgram "$out/bin/chromedriver" \
-      --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype gdk_pixbuf glib gtk2 libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH"''}
+    install -m755 -D chromedriver $out/bin/chromedriver
+  '' + lib.optionalString (!stdenv.isDarwin) ''
+    patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
+    wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}:\$LD_LIBRARY_PATH"
   '';
 
   meta = with stdenv.lib; {

From 34bdf451c32aff3d0f0f3ad69b1097616d6f5c04 Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Mon, 1 May 2017 21:45:27 -0400
Subject: [PATCH 202/206] lxpanel: init at 0.9.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: break overlong lines.]
---
 pkgs/desktops/lxde/core/lxpanel/default.nix | 28 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 +++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/desktops/lxde/core/lxpanel/default.nix

diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
new file mode 100644
index 00000000000..a05905547fd
--- /dev/null
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, gettext, m4, intltool, libxmlxx, keybinder
+, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk_pixbuf
+, menu-cache, lxmenu-data, wirelesstools
+, supportAlsa ? false, alsaLib
+}:
+
+stdenv.mkDerivation rec {
+  name = "lxpanel-0.9.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/lxde/${name}.tar.xz";
+    sha256 = "1ccgv7jgl3y865cpb6w7baaz7468fxncm83bqxlwyni5bwhglb1l";
+  };
+
+  nativeBuildInputs = [ pkgconfig gettext m4 intltool libxmlxx ];
+  buildInputs = [
+    keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk_pixbuf
+    menu-cache lxmenu-data m4 wirelesstools
+  ] ++ stdenv.lib.optional supportAlsa alsaLib;
+
+  meta = {
+    description = "Lightweight X11 desktop panel for LXDE";
+    homepage = "http://lxde.org/";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.ryneeverett ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0354c93984..d1496eed5d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6001,6 +6001,10 @@ with pkgs;
 
   lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
 
+  lxpanel = callPackage ../desktops/lxde/core/lxpanel {
+    gtk2 = gtk2-x11;
+  };
+
   kona = callPackage ../development/interpreters/kona {};
 
   lolcode = callPackage ../development/interpreters/lolcode { };

From 9694567ac9aeafe597dc470407ce47a24f34a9b3 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Fri, 12 May 2017 23:59:31 +0200
Subject: [PATCH 203/206] pythonPackages.pika-pool: init at 0.1.3

fixes #25750
---
 .../python-modules/pika-pool/default.nix      | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/pika-pool/default.nix

diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix
new file mode 100644
index 00000000000..93933c43523
--- /dev/null
+++ b/pkgs/development/python-modules/pika-pool/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pika
+}:
+
+buildPythonPackage rec {
+  pname = "pika-pool";
+  version = "0.1.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f3985888cc2788cdbd293a68a8b5702a9c955db6f7b8b551aeac91e7f32da397";
+  };
+
+  # Tests require database connections
+  doCheck = false;
+
+  propagatedBuildInputs = [ pika ];
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/bninja/pika-pool";
+    license = licenses.bsdOriginal;
+    description = "Pools for pikas.";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9a94d14ec3a..16ec795f31b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18350,6 +18350,8 @@ in {
     };
   };
 
+  pika-pool = callPackage ../development/python-modules/pika-pool { };
+
   platformio =  buildPythonPackage rec {
     name = "platformio-${version}";
     version="2.10.3";

From 3a084a80e74cf40aa1daa7eeca21be12eff647d3 Mon Sep 17 00:00:00 2001
From: David Waern <david.waern@gmail.com>
Date: Thu, 9 Mar 2017 11:05:52 +0100
Subject: [PATCH 204/206] samsung-unified-linux-drive: Fix sane driver by
 patching rpaths

fixes #25779
---
 pkgs/misc/cups/drivers/samsung/default.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix
index 26bd771e023..556c408012d 100644
--- a/pkgs/misc/cups/drivers/samsung/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glibc, cups, libusb, ghostscript }:
+{ stdenv, fetchurl, glibc, cups, libusb, libxml2, ghostscript }:
 
 let
 
@@ -18,10 +18,9 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     cups
     libusb
+    libxml2
   ];
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
   installPhase = ''
 
     mkdir -p $out/bin
@@ -69,16 +68,15 @@ in stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
+    for bin in "$out/bin/"*; do
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin"
+      patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin"
+    done
 
-  for bin in $out/bin/*; do
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin"
-    patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin"
-  done
-
-  patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so"
-
-  ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
+    patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so"
+    patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1"
 
+    ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
   '';
 
   # all binaries are already stripped

From 874b81b31f6526f4f082514e05e71123fb9b1c61 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 20 May 2017 15:38:01 +0200
Subject: [PATCH 205/206] treewide:
 s,enableParallelBuild(s),enableParallelBuilding,g

---
 pkgs/applications/science/math/singular/default.nix | 2 +-
 pkgs/applications/video/kodi/default.nix            | 2 +-
 pkgs/applications/virtualization/lkl/default.nix    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 9cd72c2fd50..3fe8b542995 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  enableParallelBuild = true;
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "A CAS for polynomial computations";
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 10656af4ef4..649dad0bb57 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -114,7 +114,7 @@ in stdenv.mkDerivation rec {
       sed -i '/TestWebServer.cpp/d'  xbmc/network/test/{Makefile,CMakeLists.txt}
     '';
 
-    enableParallelBuild = true;
+    enableParallelBuilding = true;
 
     doCheck = true;
 
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index 398c269d074..134df59159b 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = "-C tools/lkl";
 
-  enableParallelBuilds = true;
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead";

From 92964a2ea88c2a563f90588231a5b9e606940513 Mon Sep 17 00:00:00 2001
From: leenaars <leenaars@users.noreply.github.com>
Date: Sat, 20 May 2017 18:23:55 +0200
Subject: [PATCH 206/206] srcml: init at 0.9.5 (#25395)

---
 .../version-management/srcml/default.nix      | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/version-management/srcml/default.nix

diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix
new file mode 100644
index 00000000000..059c4fc344c
--- /dev/null
+++ b/pkgs/applications/version-management/srcml/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "0.9.5_beta";
+  name = "srcml-${version}";
+
+  src = fetchurl {
+    url = "http://www.sdml.cs.kent.edu/lmcrs/srcML-${version}-src.tar.gz";
+    sha256 = "13pswdi75qjsw7z75lz7l3yjsvb58drihla2mwj0f9wfahaj3pam";
+  };
+
+  prePatch = ''
+    patchShebangs .
+    substituteInPlace CMake/install.cmake --replace /usr/local $out
+    '';
+
+  nativeBuildInputs = [ cmake antlr ];
+  buildInputs = [ libxml2 libxslt boost libarchive python ];
+
+  meta = {
+    description = "Infrastructure for exploration, analysis, and manipulation of source code";
+    homepage = "http://www.srcml.org";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ leenaars ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1496eed5d6..4595aab7e93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4120,6 +4120,8 @@ with pkgs;
 
   squashfsTools = callPackage ../tools/filesystems/squashfs { };
 
+  srcml = callPackage ../applications/version-management/srcml { };
+
   sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { };
 
   sshuttle = callPackage ../tools/security/sshuttle { };